处理学生端imUserId问题

student/src/main/java/com/cooleshow/student/adapter/MessageAdapter.java

@@ -80,13 +80,13 @@ public class MessageAdapter extends RecyclerView.Adapter {
         }
         if (message.getContent() instanceof RCUserSeatResponseMessage) {
             RCUserSeatResponseMessage responseMessage = (RCUserSeatResponseMessage) message.getContent();
-            if (!TextUtils.equals(responseMessage.getAudienceId(), UserHelper.getUserId())) {
+            if (!TextUtils.equals(responseMessage.getAudienceId(), UserHelper.getImUserId())) {
                 return;
             }
         }
         if (message.getContent() instanceof RCUserSeatApplyMessage) {
             RCUserSeatApplyMessage applyMessage = (RCUserSeatApplyMessage) message.getContent();
-            if (!TextUtils.equals(applyMessage.getAudienceId(), UserHelper.getUserId())) {
+            if (!TextUtils.equals(applyMessage.getAudienceId(), UserHelper.getImUserId())) {
                 return;
             }
         }

student/src/main/java/com/cooleshow/student/presenter/live/LiveRoomPresenter.java

@@ -356,7 +356,7 @@ public class LiveRoomPresenter extends BasePresenter<LiveRoomContract.view> impl
             case LiveRoomMsgConstants.ACTION_SEND_LEAVE_ROOM:
                 //退出直播间消息
                 RCUserLeaveRoomMessage rcUserLeaveRoomMessage = new RCUserLeaveRoomMessage();
-                rcUserLeaveRoomMessage.setUserId(UserHelper.getUserId());
+                rcUserLeaveRoomMessage.setUserId(UserHelper.getImUserId());
                 rcUserLeaveRoomMessage.setUserName(UserHelper.getUserName());
                 sendMessage(rcUserLeaveRoomMessage, false);
                 break;
@@ -368,7 +368,7 @@ public class LiveRoomPresenter extends BasePresenter<LiveRoomContract.view> impl
                     rcUserSeatApplyMessage.setTeacherId(currentRoomInfo.speakerId);
                     rcUserSeatApplyMessage.setTeacherName(currentRoomInfo.speakerName);
                 }
-                rcUserSeatApplyMessage.setAudienceId(UserHelper.getUserId());
+                rcUserSeatApplyMessage.setAudienceId(UserHelper.getImUserId());
                 rcUserSeatApplyMessage.setAudienceName(UserHelper.getUserName());
                 rcUserSeatApplyMessage.setAudienceAvatar(UserHelper.getUserAvatar());
                 sendMessage(rcUserSeatApplyMessage, true);
@@ -381,14 +381,14 @@ public class LiveRoomPresenter extends BasePresenter<LiveRoomContract.view> impl
                     cancelApplyMessage.setTeacherId(currentRoomInfo.speakerId);
                     cancelApplyMessage.setTeacherName(currentRoomInfo.speakerName);
                 }
-                cancelApplyMessage.setAudienceId(UserHelper.getUserId());
+                cancelApplyMessage.setAudienceId(UserHelper.getImUserId());
                 cancelApplyMessage.setAudienceName(UserHelper.getUserName());
                 sendMessage(cancelApplyMessage, true);
                 break;
             case LiveRoomMsgConstants.ACTION_SEND_DOWN_SEAT_MIC:
                 //观众下麦消息
                 RCUserMicLeaveMessage rcUserMicLeaveMessage = new RCUserMicLeaveMessage();
-                rcUserMicLeaveMessage.setAudienceId(UserHelper.getUserId());
+                rcUserMicLeaveMessage.setAudienceId(UserHelper.getImUserId());
                 rcUserMicLeaveMessage.setAudienceName(UserHelper.getUserName());
                 sendMessage(rcUserMicLeaveMessage, false);
                 break;
@@ -400,7 +400,7 @@ public class LiveRoomPresenter extends BasePresenter<LiveRoomContract.view> impl
                     rcUserSeatResponseMessage.setTeacherId(currentRoomInfo.speakerId);
                     rcUserSeatResponseMessage.setTeacherName(currentRoomInfo.speakerName);
                 }
-                rcUserSeatResponseMessage.setAudienceId(UserHelper.getUserId());
+                rcUserSeatResponseMessage.setAudienceId(UserHelper.getImUserId());
                 rcUserSeatResponseMessage.setAudienceName(UserHelper.getUserName());
                 sendMessage(rcUserSeatResponseMessage, true);
                 break;
@@ -412,14 +412,14 @@ public class LiveRoomPresenter extends BasePresenter<LiveRoomContract.view> impl
                     disAgreeSeatResponseMessage.setTeacherId(currentRoomInfo.speakerId);
                     disAgreeSeatResponseMessage.setTeacherName(currentRoomInfo.speakerName);
                 }
-                disAgreeSeatResponseMessage.setAudienceId(UserHelper.getUserId());
+                disAgreeSeatResponseMessage.setAudienceId(UserHelper.getImUserId());
                 disAgreeSeatResponseMessage.setAudienceName(UserHelper.getUserName());
                 sendMessage(disAgreeSeatResponseMessage, true);
                 break;
             case LiveRoomMsgConstants.ACTION_SEND_ON_SNAP_UP:
                 //发送正在抢购消息
                 RCOnSnappingUpMessage rcOnSnappingUpMessage = new RCOnSnappingUpMessage();
-                rcOnSnappingUpMessage.setUserId(UserHelper.getUserId());
+                rcOnSnappingUpMessage.setUserId(UserHelper.getImUserId());
                 rcOnSnappingUpMessage.setUserName(UserHelper.getUserName());
                 sendMessage(rcOnSnappingUpMessage, true);
                 break;
@@ -836,7 +836,7 @@ public class LiveRoomPresenter extends BasePresenter<LiveRoomContract.view> impl
                                 if (rcUserSeatResponseMessage == null || TextUtils.isEmpty(rcUserSeatResponseMessage.getAudienceId())) {
                                     return;
                                 }
-                                if (TextUtils.equals(rcUserSeatResponseMessage.getAudienceId(), UserHelper.getUserId())) {
+                                if (TextUtils.equals(rcUserSeatResponseMessage.getAudienceId(), UserHelper.getImUserId())) {
                                     getView().seatResponse(rcUserSeatResponseMessage);
                                 }
                                 return;

student/src/main/java/com/cooleshow/student/ui/live/LiveRoomActivity.java

@@ -191,6 +191,7 @@ public class LiveRoomActivity extends BaseMVPActivity<ActivityLiveroomLayoutBind
     private String createRoomId = "";
     private static final String ROOMID_KEY = "roomid_key";
     private String mUserId;
+    private String mImUserId;
     private boolean connectStatusIsPaused = false;
     private boolean isNeedRefresh = false;//是否需要重新刷新房间信息
     private boolean liveIsFinish = false;//直播间是否已结束
@@ -372,6 +373,7 @@ public class LiveRoomActivity extends BaseMVPActivity<ActivityLiveroomLayoutBind
             }
         });
         mUserId = UserHelper.getUserId();
+        mImUserId = UserHelper.getImUserId();
         mMessageAdapter = new MessageAdapter(this);
         mLinearLayoutManager = new LinearLayoutManager(this, RecyclerView.VERTICAL, false);
         mRecyclerMsg.setLayoutManager(mLinearLayoutManager);
@@ -1358,7 +1360,7 @@ public class LiveRoomActivity extends BaseMVPActivity<ActivityLiveroomLayoutBind
      */
     private void buildResponseMessage() {
         if (mRoomInfoBean != null) {
-            String userId = UserHelper.getUserId();
+            String userId = UserHelper.getImUserId();
             RCUserSeatResponseMessage responseMessage = new RCUserSeatResponseMessage();
             responseMessage.setType(LiveRoomMsgConstants.MIC_RESPONSE_DISAGREE);
             responseMessage.setTeacherId(mRoomInfoBean.speakerId);
@@ -1661,7 +1663,7 @@ public class LiveRoomActivity extends BaseMVPActivity<ActivityLiveroomLayoutBind
     }
 
     private boolean isOwn(String targetUserId) {
-        return TextUtils.equals(mUserId, targetUserId);
+        return TextUtils.equals(mImUserId, targetUserId);
     }
 
     private void showInviteSeatDialog() {

usercenter/src/main/java/com/cooleshow/usercenter/bean/UserInfo.java

@@ -58,4 +58,5 @@ public class UserInfo {
     public boolean superAdmin;
     public String id;
     public String realName;
+    public String imUserId;
 }

usercenter/src/main/java/com/cooleshow/usercenter/helper/UserHelper.java

@@ -18,6 +18,7 @@ import com.cooleshow.usercenter.bean.UserLoginInfo;
 public class UserHelper {
     public static final String USER_TOKEN_KEY = "user_token";
     public static final String USER_ID = "user_id";
+    public static final String IM_USER_ID = "im_user_id";
     public static final String USERNAME = "username";
     public static final String USER_IM_TOKEN = "imToken";
     public static final String USER_PHONE = "phone";
@@ -113,6 +114,8 @@ public class UserHelper {
         }
         //userId
         SPUtils.getInstance().put(USER_ID, userInfo.id);
+        //imUserId
+        SPUtils.getInstance().put(IM_USER_ID, userInfo.imUserId);
         //昵称
         SPUtils.getInstance().put(USERNAME, userInfo.username);
         //imtoken
@@ -128,6 +131,10 @@ public class UserHelper {
         return SPUtils.getInstance().getString(USER_ID);
     }
 
+    public static String getImUserId() {
+        return SPUtils.getInstance().getString(IM_USER_ID);
+    }
+
     public static String getUserName() {
         return SPUtils.getInstance().getString(USERNAME);
     }
@@ -169,6 +176,8 @@ public class UserHelper {
     public static void clearUserInfo() {
         //userId
         SPUtils.getInstance().put(USER_ID, "");
+        //IMuserId
+        SPUtils.getInstance().put(IM_USER_ID, "");
         //token
         SPUtils.getInstance().put(USER_TOKEN_KEY, "");
         //昵称