修复部分ID问题

live_teaching/src/main/java/com/daya/live_teaching/ui/fragmnet/WhiteBoardFragment.java

@@ -251,7 +251,7 @@ public class WhiteBoardFragment extends BaseFragment<FragmentWhiteBoardBinding>
                 whiteSdkRoomInfo.setUuid(whiteCreateBean.getUuid());
                 whiteSdkRoomInfo.setRoomToken(whiteCreateBean.getRoomToken());
                 showLoading();
-                roomParams = new RoomParams(whiteSdkRoomInfo.getUuid(), whiteSdkRoomInfo.getRoomToken(), UserHelper.getUserId());
+                roomParams = new RoomParams(whiteSdkRoomInfo.getUuid(), whiteSdkRoomInfo.getRoomToken(), UserHelper.getImUserId());
                 UserInfo userInfo = classViewModel.getUserInfo().getValue();
                 if (userInfo != null && userInfo.getRole() == Role.STUDENT) {
                     roomParams.setWritable(false);

rong_im/kit/src/main/java/io/rong/imkit/RongIM.java

@@ -988,7 +988,7 @@ public class RongIM {
         String userAvatar = UserHelper.getUserAvatar();
         String userName = UserHelper.getUserName();
         if (!TextUtils.equals(userAvatar, avatar) || !TextUtils.equals(userName, nickName)) {
-            String userId = UserHelper.getUserId();
+            String userId = UserHelper.getImUserId();
             RongUserInfoManager.getInstance().refreshUserInfoCache(new UserInfo(userId, userName, Uri.parse(avatar)));
         }
     }

rong_im/kit/src/main/java/io/rong/imkit/conversation/ConversationFragmentSEC.java

@@ -213,7 +213,7 @@ public class ConversationFragmentSEC extends ConversationFragment {
                                         for (int p = 0; p < historyMessage.size(); p++) {
                                             if (uid.equals(historyMessage.get(p).getUId())) {
                                                 if (historyMessage.get(p).getExpansion() != null) {
-                                                    String localUserid= UserHelper.getUserId();
+                                                    String localUserid= UserHelper.getImUserId();
                                                     if (!historyMessage.get(p).getExpansion().containsKey(localUserid)) {
                                                         String extra = historyMessage.get(p).getContent().getExtra();
                                                         String msgUid = historyMessage.get(p).getUId();
@@ -280,7 +280,7 @@ public class ConversationFragmentSEC extends ConversationFragment {
             for (int i = 0; i < uiMessages.size(); i++) {
                 if ("DY:NoticeMsg".equals(uiMessages.get(i).getObjectName())) {
                     if (uiMessages.get(i).getExpansion() != null) {
-                        String localUserid= UserHelper.getUserId();
+                        String localUserid= UserHelper.getImUserId();
                         if (!uiMessages.get(i).getExpansion().containsKey(localUserid)) {
 
                             String context = uiMessages.get(i).getMessage().getContent().getExtra();

rong_im/live/src/main/java/com/rong/io/live/manager/RCChatRoomMessageManager.java

@@ -70,7 +70,7 @@ public class RCChatRoomMessageManager {
                                        Function1 onSuccess,
                                        Function2 onError) {
         //设置用户信息
-        messageContent.setUserInfo(new UserInfo(UserHelper.getUserId(),UserHelper.getUserName(),null));
+        messageContent.setUserInfo(new UserInfo(UserHelper.getImUserId(),UserHelper.getUserName(),null));
         Message message = Message.obtain(roomId, Conversation.ConversationType.CHATROOM, messageContent);
         RongIMClient.getInstance().sendMessage(message, null, null, new IRongCallback.ISendMessageCallback() {
             @Override

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

@@ -1365,7 +1365,7 @@ public class LiveRoomActivity extends BaseMVPActivity<ActivityLiveroomLayoutBind
             responseMessage.setType(LiveRoomMsgConstants.MIC_RESPONSE_DISAGREE);
             responseMessage.setTeacherId(mRoomInfoBean.speakerId);
             responseMessage.setTeacherName(mRoomInfoBean.speakerName);
-            responseMessage.setAudienceId(UserHelper.getUserId());
+            responseMessage.setAudienceId(UserHelper.getImUserId());
             responseMessage.setAudienceName(UserHelper.getUserName());
             Message message = Message.obtain(userId, Conversation.ConversationType.CHATROOM, responseMessage);
             message.setObjectName(LiveRoomMsgConstants.TAG_CHAT_ROOM_SEAT_RESPONSE);

teacher/src/main/java/com/cooleshow/teacher/adapter/LiveRoomMessageAdapter.java

@@ -80,13 +80,13 @@ public class LiveRoomMessageAdapter 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;
             }
         }

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

@@ -350,7 +350,7 @@ public class LiveRoomPresenter extends BasePresenter<LiveRoomContract.LiveRoomVi
             if (param instanceof User) {
                 User user = (User) param;
                 RCUserSeatResponseMessage rcUserSeatResponseMessage = new RCUserSeatResponseMessage();
-                rcUserSeatResponseMessage.setTeacherId(UserHelper.getUserId());
+                rcUserSeatResponseMessage.setTeacherId(UserHelper.getImUserId());
                 rcUserSeatResponseMessage.setTeacherName(UserHelper.getUserName());
                 rcUserSeatResponseMessage.setAudienceId(user.getUserId());
                 rcUserSeatResponseMessage.setAudienceName(user.getUserName());
@@ -365,7 +365,7 @@ public class LiveRoomPresenter extends BasePresenter<LiveRoomContract.LiveRoomVi
             if (param instanceof User) {
                 User user = (User) param;
                 RCUserSeatApplyMessage seatApplyMessage = new RCUserSeatApplyMessage();
-                seatApplyMessage.setTeacherId(UserHelper.getUserId());
+                seatApplyMessage.setTeacherId(UserHelper.getImUserId());
                 seatApplyMessage.setTeacherName(UserHelper.getUserName());
                 seatApplyMessage.setAudienceId(user.getUserId());
                 seatApplyMessage.setAudienceName(user.getUserName());
@@ -379,7 +379,7 @@ public class LiveRoomPresenter extends BasePresenter<LiveRoomContract.LiveRoomVi
             //切换连麦模式
             boolean isEnable = (boolean) params[0];
             RCUserSeatsCtrlMessage rcUserSeatsCtrlMessage = new RCUserSeatsCtrlMessage();
-            rcUserSeatsCtrlMessage.setUserId(UserHelper.getUserId());
+            rcUserSeatsCtrlMessage.setUserId(UserHelper.getImUserId());
             rcUserSeatsCtrlMessage.setUserName(UserHelper.getUserName());
             rcUserSeatsCtrlMessage.setSeatBan(isEnable);
             sendMessage(rcUserSeatsCtrlMessage, false);