斗鱼API（capi.douyucdn.cn）替换为Max+（api.maxjia.com）

452MJ · Sep 19, 2016 · 3c76744 · 3c76744
1 parent fe3dfe9
commit 3c76744
Show file tree

Hide file tree

Showing 28 changed files with 430 additions and 1,547 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/com/c9mj/platform/MyApplication.java b/app/src/main/java/com/c9mj/platform/MyApplication.java
@@ -2,6 +2,7 @@
 
 import android.app.Application;
 
+import com.c9mj.platform.util.ToastUtil;
 import com.squareup.leakcanary.LeakCanary;
 
 /**
@@ -14,5 +15,6 @@ public class MyApplication extends Application{
     public void onCreate() {
         super.onCreate();
         LeakCanary.install(this);
+        ToastUtil.init(getApplicationContext());
     }
 }
diff --git a/...latform/live/adapter/LiveRoomAdapter.java → ...latform/live/adapter/LiveListAdapter.java b/...latform/live/adapter/LiveRoomAdapter.java → ...latform/live/adapter/LiveListAdapter.java
@@ -4,7 +4,7 @@
 
 import com.bumptech.glide.Glide;
 import com.c9mj.platform.R;
-import com.c9mj.platform.live.bean.LiveRoomItemBean;
+import com.c9mj.platform.live.bean.LiveListItemBean;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 
@@ -15,24 +15,24 @@
  * date: 2016/9/12
  * 直播房间列表的Adapter
  */
-public class LiveRoomAdapter extends BaseQuickAdapter<LiveRoomItemBean>{
-    public LiveRoomAdapter(List<LiveRoomItemBean> data) {
-        super(R.layout.item_live_layout, data);
+public class LiveListAdapter extends BaseQuickAdapter<LiveListItemBean>{
+    public LiveListAdapter(List<LiveListItemBean> data) {
+        super(R.layout.item_live_list_layout, data);
     }
 
     @Override
-    protected void convert(BaseViewHolder viewHolder, LiveRoomItemBean bean) {
-        viewHolder.setText(R.id.live_tv_roomname, bean.getRoom_name())//房间名称
-                .setText(R.id.live_tv_nickname, bean.getNickname())//主播昵称
-                .setText(R.id.live_tv_online, String.valueOf(bean.getOnline()))//在线人数
+    protected void convert(BaseViewHolder viewHolder, LiveListItemBean bean) {
+        viewHolder.setText(R.id.live_tv_roomname, bean.getLive_title())//房间名称
+                .setText(R.id.live_tv_nickname, bean.getLive_nickname())//主播昵称
+                .setText(R.id.live_tv_online, String.valueOf(bean.getLive_online()))//在线人数
                 .setOnClickListener(R.id.live_cardview, new OnItemChildClickListener());//添加子Item点击监听，在UI中实现回调接口
         Glide.with(mContext)//直播房间截图
-                .load(bean.getRoom_src())
+                .load(bean.getLive_img())
                 .crossFade()
                 .centerCrop()
                 .into((ImageView) viewHolder.getView(R.id.live_iv_roomsrc));
         Glide.with(mContext)//主播头像
-                .load(bean.getAvatar_mid())
+                .load(bean.getLive_userimg())
                 .crossFade()
                 .centerCrop()
                 .into((ImageView) viewHolder.getView(R.id.live_iv_avatar));

diff --git a/app/src/main/java/com/c9mj/platform/live/api/LiveAPI.java b/app/src/main/java/com/c9mj/platform/live/api/LiveAPI.java
@@ -2,13 +2,11 @@
 
 
 import com.c9mj.platform.live.bean.LiveBaseBean;
-import com.c9mj.platform.live.bean.LiveIndicatorBean;
-import com.c9mj.platform.live.bean.LiveRoomItemBean;
+import com.c9mj.platform.live.bean.LiveListItemBean;
 
 import java.util.List;
 
 import retrofit2.http.GET;
-import retrofit2.http.Path;
 import retrofit2.http.Query;
 import rx.Observable;
 
@@ -18,63 +16,26 @@
  */
 public interface LiveAPI {
 
-    public static final String CLIENT_SYS = "client_sys";
     public static final int LIMIT = 20;
-
-    /**
-     * 请求顶部栏目标题
-     * @return
-     */
-    @GET("/api/v1/getColumnList?client_sys=android")
-    Observable<LiveBaseBean<List<LiveIndicatorBean>>> getColumnList();
-
-    /**
-     * 请求全部直播
-     * @param offset 分页偏移量
-     * @return
-     */
-    @GET("/api/v1/live")
-    Observable<LiveBaseBean<List<LiveRoomItemBean>>> getAllLiveList(
+    public static final String MAX_ID = "0";
+    public static final String IMEI = "123456789101234";
+    public static final String OS_TYPE = "Android";
+    public static final String OS_VERSION = "5.1.1";
+    public static final String VERSION = "3.6.6";
+    public static final String LANG = "zh-cn";
+
+    //请求获取不同游戏的直播列表
+    @GET("/api/live/list/")
+    Observable<LiveBaseBean<List<LiveListItemBean>>> getLiveList(
             @Query("offset") int offset,
             @Query("limit") int limit,
-            @Query("client_sys") String client_sys
+            @Query("game_type") String game_type,
+            @Query("max_id") String max_id,
+            @Query("imei") String imei,
+            @Query("os_type") String os_type,
+            @Query("os_version") String os_version,
+            @Query("version") String version,
+            @Query("lang") String lang
     );
 
-    /**
-     * 根据cate_id请求不同分类节目的直播
-     * @param cate_id
-     * @param offset
-     * @param limit
-     * @param client_sys
-     * @return
-     */
-    @GET("/api/v1/getColumnRoom/{cate_id}")
-    Observable<LiveBaseBean<List<LiveRoomItemBean>>> getColumnLiveList(
-            @Path("cate_id") String cate_id,
-            @Query("offset") int offset,
-            @Query("limit") int limit,
-            @Query("client_sys") String client_sys
-    );
-
-    /**
-     * 请求直播间信息
-     * @param room_id
-     * @param aid
-     * @param client_sys
-     * @param ne
-     * @param support_pwd
-     * @param time
-     * @param auth
-     * @return
-     */
-    @GET("/api/v1/room/{room_id}")
-    Observable<LiveBaseBean<List<LiveRoomItemBean>>> getRoomInfo(
-            @Path("room_id") String room_id,
-            @Query("aid") String aid,
-            @Query("client_sys") String client_sys,
-            @Query("ne") String ne,
-            @Query("support_pwd") String support_pwd,
-            @Query("time") String time,
-            @Query("auth") String auth
-    );
 }
diff --git a/app/src/main/java/com/c9mj/platform/live/bean/LiveBaseBean.java b/app/src/main/java/com/c9mj/platform/live/bean/LiveBaseBean.java
@@ -7,27 +7,36 @@
 public class LiveBaseBean<T> {
 
     /**
-     * error : 0
+     * status : 0
      * message : 成功
-     * data : {}
+     * result : {}
      */
 
-    private int error;
-    private T data;
+    private String status;
+    private String msg;
+    private T result;
 
-    public int getError() {
-        return error;
+    public String getStatus() {
+        return status;
     }
 
-    public void setError(int error) {
-        this.error = error;
+    public void setStatus(String status) {
+        this.status = status;
     }
 
-    public T getData() {
-        return data;
+    public String getMsg() {
+        return msg;
     }
 
-    public void setData(T data) {
-        this.data = data;
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public T getResult() {
+        return result;
+    }
+
+    public void setResult(T result) {
+        this.result = result;
     }
 }
diff --git a/app/src/main/java/com/c9mj/platform/live/bean/LiveIndicatorBean.java b/app/src/main/java/com/c9mj/platform/live/bean/LiveIndicatorBean.java