修改直播间userId问题

rong_im/live/src/main/java/com/rong/io/live/widget/LiveRoomMicIconView.java

@@ -51,7 +51,7 @@ public class LiveRoomMicIconView extends LinearLayout {
         setOrientation(HORIZONTAL);
         setGravity(Gravity.CENTER_VERTICAL);
         mMicUserInfos = new ArrayList<>();
-        mCurrentUserId = UserHelper.getUserId();
+        mCurrentUserId = UserHelper.getImUserId();
         mCurrentUserName = UserHelper.getUserName();
         mCurrentUserAvatar = UserHelper.getUserAvatar();
     }

student/src/main/java/com/cooleshow/student/bean/FriendInfoBean.java

@@ -5,6 +5,6 @@ package com.cooleshow.student.bean;
  */
 public class FriendInfoBean {
     public String friendAvatar;
-    public String friendId;
     public String friendNickname;
+    public String imFriendId;
 }

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

@@ -863,7 +863,7 @@ public class LiveRoomActivity extends BaseMVPActivity<ActivityLiveroomLayoutBind
         }
         if (presenter != null) {
             TextMessage textMessage = TextMessage.obtain(message);
-            UserInfo userInfo = new UserInfo(mUserId, UserHelper.getUserName(), null);
+            UserInfo userInfo = new UserInfo(mImUserId, UserHelper.getUserName(), null);
             textMessage.setUserInfo(userInfo);
             presenter.sendMessage(textMessage);
         }
@@ -1522,8 +1522,8 @@ public class LiveRoomActivity extends BaseMVPActivity<ActivityLiveroomLayoutBind
     @Override
     public void onExitSeatMicSuccess() {
         updateMicIcon(LiveRoomMsgConstants.MIC_STATUS_NORMAL);
-        if (!TextUtils.isEmpty(mUserId)) {
-            notifyMicContainerDel(mUserId);
+        if (!TextUtils.isEmpty(mImUserId)) {
+            notifyMicContainerDel(mImUserId);
         }
         if (presenter != null) {
             presenter.handleAction(LiveRoomMsgConstants.ACTION_SEND_DOWN_SEAT_MIC);
@@ -1605,7 +1605,7 @@ public class LiveRoomActivity extends BaseMVPActivity<ActivityLiveroomLayoutBind
         if (isFinishing() || isDestroyed()) {
             return;
         }
-        if (TextUtils.equals(message.getSenderUserId(), mUserId)) {
+        if (TextUtils.equals(message.getSenderUserId(), mImUserId)) {
             return;
         }
         if (addLikeMessage != null) {
@@ -1629,7 +1629,7 @@ public class LiveRoomActivity extends BaseMVPActivity<ActivityLiveroomLayoutBind
             return;
         }
         if (mLlMicContainer != null && friendInfoBean != null) {
-            mLlMicContainer.updateTargetUserInfo(new UserInfo(friendInfoBean.friendId, friendInfoBean.friendNickname, Uri.parse(friendInfoBean.friendAvatar)));
+            mLlMicContainer.updateTargetUserInfo(new UserInfo(friendInfoBean.imFriendId, friendInfoBean.friendNickname, Uri.parse(friendInfoBean.friendAvatar)));
         }
     }
 

teacher/src/main/java/com/cooleshow/teacher/ui/live/TeacherLiveRoomActivity.java

@@ -150,6 +150,7 @@ public class TeacherLiveRoomActivity extends BaseMVPActivity<ActivityTeacherLive
     private boolean isNeedRefresh = false;//是否需要重新刷新房间信息
     private LiveRoomInfoBean mRoomInfoBean;
     private String mUserId;
+    private String mImUserId;
     private InputBarDialog mInputBarDialog;
     private int currentLiveMode = LiveConfig.LIVE_MODE_PREVIEW;//默认是预览模式
     private int currentLiveStatus = LiveConfig.LIVE_STATUS_NORMAL;
@@ -324,6 +325,7 @@ public class TeacherLiveRoomActivity extends BaseMVPActivity<ActivityTeacherLive
             return;
         }
         mUserId = UserHelper.getUserId();
+        mImUserId = UserHelper.getImUserId();
         mHandler.post(new Runnable() {
             @Override
             public void run() {
@@ -1170,7 +1172,7 @@ public class TeacherLiveRoomActivity extends BaseMVPActivity<ActivityTeacherLive
      * @return
      */
     private boolean isOwn(String targetId) {
-        return TextUtils.equals(targetId, mUserId);
+        return TextUtils.equals(targetId, mImUserId);
     }
 
     private void refresh() {
@@ -1244,7 +1246,7 @@ public class TeacherLiveRoomActivity extends BaseMVPActivity<ActivityTeacherLive
                     if (audioInputStream.getMediaType() == RCRTCMediaType.AUDIO) {
                         //音频流判断显示上麦用户
                         String userId = audioInputStream.getUserId();
-                        if (TextUtils.equals(mUserId, userId)) {
+                        if (TextUtils.equals(mImUserId, userId)) {
                             continue;
                         }
                         if (mRoomInfoBean != null) {
@@ -1483,7 +1485,7 @@ public class TeacherLiveRoomActivity extends BaseMVPActivity<ActivityTeacherLive
     private void sendTextMessage(String message) {
         if (presenter != null) {
             TextMessage textMessage = TextMessage.obtain(message);
-            UserInfo userInfo = new UserInfo(mUserId, UserHelper.getUserName(), null);
+            UserInfo userInfo = new UserInfo(mImUserId, UserHelper.getUserName(), null);
             textMessage.setUserInfo(userInfo);
             presenter.sendMessage(textMessage);
         }