Merge branch 'master' into dev_room_chat

# Conflicts:
#	live/src/main/java/com/yunbao/live/activity/PDLIiveChatActivity.java
#	main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java

common/src/main/java/com/yunbao/common/bean/VipModel.java

@@ -10,6 +10,9 @@ public class VipModel extends BaseModel {
     @SerializedName("type")
     private String type = "";
 
+    @SerializedName("admin_id")
+    private String adminId;
+
     public String getType() {
         return type;
     }
@@ -18,4 +21,13 @@ public class VipModel extends BaseModel {
         this.type = type;
         return this;
     }
+
+    public String getAdminId() {
+        return adminId;
+    }
+
+    public VipModel setAdminId(String adminId) {
+        this.adminId = adminId;
+        return this;
+    }
 }

common/src/main/java/com/yunbao/common/http/PDLiveApi.java

@@ -14,6 +14,7 @@ import com.yunbao.common.bean.NobleTrumpetModel;
 import com.yunbao.common.bean.SearchModel;
 import com.yunbao.common.bean.SetAttentsModel;
 import com.yunbao.common.bean.SlideInBannerModel;
+import com.yunbao.common.bean.VipModel;
 
 import java.util.List;
 
@@ -189,7 +190,6 @@ public interface PDLiveApi {
 
     /**
      * 获取推送关注的开关和关注列表
-     *
      */
     @GET("/api/public/?service=Tx.offlineMsgSwitchDetail")
     Observable<ResponseModel<MsgSwitchDetailModel>> getMsgSwitchDetail();
@@ -198,18 +198,31 @@ public interface PDLiveApi {
      * 推送关注的开关设置
      */
     @GET("/api/public/?service=Tx.setMsgMasterSwitch")
-    Observable<ResponseModel<BaseModel>> setMsgMasterSwitch(@Query("status") String status,@Query("type") String type);
+    Observable<ResponseModel<BaseModel>> setMsgMasterSwitch(@Query("status") String status, @Query("type") String type);
 
     /**
-     *开播推送设置开关
+     * 开播推送设置开关
      */
     @GET("/api/public/?service=Tx.setBeginShowMsgSwitch")
-    Observable<ResponseModel<List<BaseModel>>> setBeginShowMsgSwitch(@Query("status") String status,@Query("isAll") String isAll,@Query("liveuid") String liveuid);
+    Observable<ResponseModel<List<BaseModel>>> setBeginShowMsgSwitch(@Query("status") String status, @Query("isAll") String isAll, @Query("liveuid") String liveuid);
 
     /**
      * 小时榜接口
+     *
      * @param liveuid 直播间id
      */
     @GET("/api/public/?service=Live.getHourChartRank")
-    Observable<ResponseModel<List<HourRank>>> getHourChartRank(@Query("liveuid")String liveuid);
+    Observable<ResponseModel<List<HourRank>>> getHourChartRank(@Query("liveuid") String liveuid);
+
+    /**
+     * 清除系统消息的未读数
+     */
+    @GET("/api/public/?service=Message.setMessageReadAll")
+    Observable<ResponseModel<List<String>>> setMessageReadAll();
+
+    /**
+     * 获取当前用户指导员ID
+     */
+    @GET("/api/public/?service=User.getUserInstructor")
+    Observable<ResponseModel<List<VipModel>>> getUserInstructor();
 }

common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java

@@ -7,6 +7,7 @@ import com.yunbao.common.bean.BaseModel;
 import com.yunbao.common.bean.LiveInfoModel;
 import com.yunbao.common.bean.NobleTrumpetModel;
 import com.yunbao.common.bean.SetAttentsModel;
+import com.yunbao.common.bean.VipModel;
 import com.yunbao.common.http.API;
 import com.yunbao.common.http.base.HttpCallback;
 
@@ -153,4 +154,39 @@ public class LiveNetManager {
                         callback.onError(throwable.getMessage());
                 }).isDisposed();
     }
+
+    /**
+     * 清除系统消息的未读数
+     */
+    public void setMessageReadAll(HttpCallback<String> callback) {
+        API.get().pdLiveApi(mContext).setMessageReadAll()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(listResponseModel -> {
+                    if (callback != null)
+                        callback.onSuccess(null);
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        if (callback != null)
+                            callback.onError(throwable.getMessage());
+                    }
+                }).isDisposed();
+    }
+
+    /**
+     * 获取当前用户指导员ID
+     */
+    public void getUserInstructor(HttpCallback<List<VipModel>> callback) {
+        API.get().pdLiveApi(mContext).getUserInstructor()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(listResponseModel -> {
+                    if (callback != null)
+                        callback.onSuccess(listResponseModel.getData().getInfo());
+                }, throwable -> {
+                    if (callback != null)
+                        callback.onError(throwable.getMessage());
+                }).isDisposed();
+    }
 }

common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java

@@ -32,9 +32,9 @@ import static com.yunbao.common.CommonAppContext.isReady;
  */
 public class RongcloudIMManager {
     //融云开发者平台注册app唯一识别符
-    public static final String RONG_IM_KEY = "uwd1c0sxu1p71";
+//    public static final String RONG_IM_KEY = "uwd1c0sxu1p71";
     //测试环境
-//    public static final String RONG_IM_KEY = "pvxdm17jpd3hr";
+    public static final String RONG_IM_KEY = "pvxdm17jpd3hr";
 
     private static final String CLASSNAME = "RongcloudIMManager";