修改群设置部分bug逻辑

rong_im/common_im_ui/src/main/java/com/common/im/adapter/GroupMemberAdapter.java

@@ -27,7 +27,7 @@ public class GroupMemberAdapter extends BaseQuickAdapter<GroupMemberBean, BaseVi
 
     public GroupMemberAdapter(List<GroupMemberBean> data) {
         super(R.layout.group_member_list_item, data);
-        currentId = UserHelper.getUserId();
+        currentId = UserHelper.getImUserId();
     }
 
 

rong_im/common_im_ui/src/main/java/com/common/im/bean/GroupMemberBean.java

@@ -34,6 +34,7 @@ public class GroupMemberBean  extends BaseIndexPinyinBean implements Serializabl
     private String roleType;
     private String updateTime;
     private String userId;
+    private String imUserId;
 
     public String getAvatar() {
         return avatar;
@@ -100,11 +101,11 @@ public class GroupMemberBean  extends BaseIndexPinyinBean implements Serializabl
     }
 
     public String getUserId() {
-        return userId;
+        return imUserId;
     }
 
     public void setUserId(String userId) {
-        this.userId = userId;
+        this.imUserId = userId;
     }
 
     @Override

rong_im/common_im_ui/src/main/java/com/common/im/bean/RongIMUserInfo.java

@@ -23,6 +23,15 @@ public class RongIMUserInfo {
     private String updateTime;
     private String userId;
     private String extra;
+    private String imFriendId;
+
+    public String getImFriendId() {
+        return imFriendId;
+    }
+
+    public void setImFriendId(String imFriendId) {
+        this.imFriendId = imFriendId;
+    }
 
     public String getRoleType() {
         return roleType;
@@ -57,11 +66,11 @@ public class RongIMUserInfo {
     }
 
     public String getFriendId() {
-        return friendId;
+        return getImFriendId();
     }
 
     public void setFriendId(String friendId) {
-        this.friendId = friendId;
+        this.imFriendId = friendId;
     }
 
     public String getFriendNickname() {

rong_im/common_im_ui/src/main/java/com/common/im/ui/activity/ChatGroupSettingActivity.java

@@ -37,6 +37,7 @@ import com.cooleshow.base.utils.JumpUtils;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.widgets.dialog.CommonDialog;
+import com.cooleshow.usercenter.helper.UserHelper;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -66,6 +67,9 @@ public class ChatGroupSettingActivity extends BaseMVPActivity<ActivityChatGroupS
                     .navigation();
         } else if (view.getId() == R.id.tv_group_name_remarks) {
             //设置群名称
+            if (!BaseApplication.Companion.isTeacherClient()) {
+                return;
+            }
             ARouter.getInstance().build(RouterPath.ChatCenter.CHAT_GROUP_SET_REMARK)
                     .withString("targetId", targetId)
                     .withString("remarks", tv_group_name_remarks.getText().toString().trim())
@@ -185,6 +189,10 @@ public class ChatGroupSettingActivity extends BaseMVPActivity<ActivityChatGroupS
             @Override
             public void onItemClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
                 GroupMemberBean groupMemberBean = (GroupMemberBean) adapter.getItem(position);
+                String imUserId = UserHelper.getImUserId();
+                if (TextUtils.equals(groupMemberBean.getUserId(), imUserId)) {
+                    return;
+                }
                 RongIM.getInstance().startPrivateChat(ChatGroupSettingActivity.this, groupMemberBean.getUserId() + "", data.get(position).getNickname());
 
             }
@@ -224,7 +232,9 @@ public class ChatGroupSettingActivity extends BaseMVPActivity<ActivityChatGroupS
         super.onResume();
         presenter.queryGroupDetail(targetId);
         presenter.queryGroupMembers(targetId);
-        presenter.groupApplyList(targetId);
+        if (BaseApplication.Companion.isTeacherClient()) {
+            presenter.groupApplyList(targetId);
+        }
     }
 
     @Override

rong_im/common_im_ui/src/main/java/com/common/im/ui/activity/GroupMemberActivity.java

@@ -1,6 +1,7 @@
 package com.common.im.ui.activity;
 
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -23,6 +24,7 @@ import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.widgets.DensityUtil;
+import com.cooleshow.usercenter.helper.UserHelper;
 import com.mcxtzhang.indexlib.IndexBar.widget.IndexBar;
 import com.mcxtzhang.indexlib.suspension.SuspensionDecoration;
 
@@ -89,8 +91,11 @@ public class GroupMemberActivity extends BaseMVPActivity<ActivityGroupMemberBind
             @Override
             public void onItemClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
                 GroupMemberBean item = (GroupMemberBean) adapter.getItem(position);
+                String imUserId = UserHelper.getImUserId();
+                if (TextUtils.equals(item.getUserId(), imUserId)) {
+                    return;
+                }
                 RongIM.getInstance().startPrivateChat(GroupMemberActivity.this, item.getUserId() + "", item.getNickname());
-
             }
         });