修改聊天联系人列表部分逻辑

rong_im/common_im_ui/src/main/java/com/common/im/presenter/ChatGroupSettingPresenter.java

@@ -10,6 +10,7 @@ import com.common.im.bean.GroupMemberBean;
 import com.common.im.bean.MusicSheetListBean;
 import com.common.im.bean.RongIMGroupInfo;
 import com.common.im.contract.ChatGroupSettingContract;
+import com.cooleshow.base.common.BaseApplication;
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
@@ -90,7 +91,7 @@ public class ChatGroupSettingPresenter extends BasePresenter<ChatGroupSettingCon
         } catch (JSONException e) {
             e.printStackTrace();
         }
-        if ("com.cooleshow.student".equals(context.getPackageName())) {
+        if (!BaseApplication.Companion.isTeacherClient()) {
             addSubscribe(create(IMApi.class).queryStuGroupMembers(RequestBodyUtil.convertToRequestBodyJson(jsonObject.toString())), new BaseObserver<List<GroupMemberBean>>(getView()) {
                 @Override
                 protected void onSuccess(List<GroupMemberBean> data) {
@@ -130,7 +131,7 @@ public class ChatGroupSettingPresenter extends BasePresenter<ChatGroupSettingCon
     //查询群详情
     public void queryGroupDetail(Context context, String groupId) {
         String tempGroupId = groupId.replace("S", "").replace("s", "").replace("I", "").replace("i", "");
-        if ("com.cooleshow.student".equals(context.getPackageName())) {
+        if (!BaseApplication.Companion.isTeacherClient()) {
             addSubscribe(create(IMApi.class).queryStuGroupDetail(tempGroupId), new BaseObserver<RongIMGroupInfo>() {
                 @Override
                 protected void onSuccess(RongIMGroupInfo data) {

rong_im/common_im_ui/src/main/java/com/common/im/presenter/ContactListPresenter.java

@@ -6,6 +6,7 @@ import com.common.im.api.IMApi;
 import com.common.im.bean.ContactListBean;
 import com.common.im.contract.ContactListFragmentContract;
 import com.common.im.contract.MessageFragmentContract;
+import com.cooleshow.base.common.BaseApplication;
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
@@ -29,7 +30,7 @@ public class ContactListPresenter extends BasePresenter<ContactListFragmentContr
         } catch (JSONException e) {
             e.printStackTrace();
         }
-        if ("com.cooleshow.student".equals(context.getPackageName())) {
+        if (!BaseApplication.Companion.isTeacherClient()) {
             addSubscribe(create(IMApi.class).queryStuFriendList(RequestBodyUtil.convertToRequestBodyJson(jsonObject.toString())), new BaseObserver<List<ContactListBean>>(getView()) {
                 @Override
                 protected void onSuccess(List<ContactListBean> data) {

rong_im/common_im_ui/src/main/java/com/common/im/presenter/ContactRoomListPresenter.java

@@ -6,6 +6,7 @@ import com.common.im.api.IMApi;
 import com.common.im.bean.ContactListBean;
 import com.common.im.bean.ContactRoomListBean;
 import com.common.im.contract.ContactRoomListFragmentContract;
+import com.cooleshow.base.common.BaseApplication;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
@@ -31,7 +32,7 @@ public class ContactRoomListPresenter extends BasePresenter<ContactRoomListFragm
         } catch (JSONException e) {
             e.printStackTrace();
         }
-        if ("com.cooleshow.student".equals(context.getPackageName())) {
+        if (!BaseApplication.Companion.isTeacherClient()) {
             addSubscribe(create(IMApi.class).queryStuGroupList(RequestBodyUtil.convertToRequestBodyJson(jsonObject.toString())), new BaseObserver<List<ContactRoomListBean>>(getView()) {
                 @Override
                 protected void onSuccess(List<ContactRoomListBean> data) {

rong_im/common_im_ui/src/main/java/com/common/im/presenter/MessagePresenter.java

@@ -9,6 +9,7 @@ import com.common.im.api.IMApi;
 import com.common.im.contract.MessageFragmentContract;
 import com.common.im.bean.RongIMGroupInfo;
 import com.common.im.bean.RongIMUserInfo;
+import com.cooleshow.base.common.BaseApplication;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 
@@ -22,7 +23,7 @@ public class MessagePresenter extends BasePresenter<MessageFragmentContract.Mess
 
     public void queryFriendDetail(Context context,String userId) {
         //根据用户编号获取用户基本信息
-        if ("com.cooleshow.student".equals(context.getPackageName())) {
+        if (!BaseApplication.Companion.isTeacherClient()) {
             addSubscribe(create(IMApi.class).queryStuFriendDetail(userId), new BaseObserver<RongIMUserInfo>(getView()) {
                 @Override
                 protected void onSuccess(RongIMUserInfo data) {
@@ -48,7 +49,7 @@ public class MessagePresenter extends BasePresenter<MessageFragmentContract.Mess
     //查询群详情
     public void queryGroupDetail(Context context, String groupId) {
         String tempGroupId = groupId.replace("S", "").replace("s", "").replace("I", "").replace("i", "");
-        if ("com.cooleshow.student".equals(context.getPackageName())) {
+        if (!BaseApplication.Companion.isTeacherClient()) {
             addSubscribe(create(IMApi.class).queryStuGroupDetail(tempGroupId), new BaseObserver<RongIMGroupInfo>() {
                 @Override
                 protected void onSuccess(RongIMGroupInfo data) {

rong_im/common_im_ui/src/main/java/com/common/im/ui/MessageFragment.java

@@ -18,6 +18,7 @@ import com.common.im_ui.R;
 import com.common.im_ui.databinding.FragmentMessageLayoutBinding;
 import com.common.im.bean.RongIMGroupInfo;
 import com.common.im.bean.RongIMUserInfo;
+import com.cooleshow.base.common.BaseApplication;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.utils.Utils;
 import com.cooleshow.base.ui.fragment.BaseMVPFragment;
@@ -50,7 +51,7 @@ public class MessageFragment extends BaseMVPFragment<FragmentMessageLayoutBindin
     @Override
     protected void initView(View rootView) {
         Utils.setHeadView(mViewBinding.viewStatusBar, requireContext(), 0);
-        if ("com.cooleshow.student".equals(getContext().getPackageName())) {
+        if (!BaseApplication.Companion.isTeacherClient()) {
             mViewBinding.imCreateGroup.setVisibility(View.GONE);
         }else{
             mViewBinding.imCreateGroup.setVisibility(View.VISIBLE);

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

@@ -26,6 +26,7 @@ import com.common.im.contract.ChatGroupSettingContract;
 import com.common.im_ui.R;
 import com.common.im.presenter.ChatGroupSettingPresenter;
 import com.common.im_ui.databinding.ActivityChatGroupSettingBinding;
+import com.cooleshow.base.common.BaseApplication;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.GlideUtils;
@@ -203,7 +204,7 @@ public class ChatGroupSettingActivity extends BaseMVPActivity<ActivityChatGroupS
     @Override
     public void onQueryGroupDetail(RongIMGroupInfo data) {
         if (null != data) {
-            if ("com.cooleshow.student".equals(getPackageName())) {
+            if (!BaseApplication.Companion.isTeacherClient()) {
                 GlideUtils.INSTANCE.loadImage(this, data.getImg(), iv_portrait, R.drawable.rc_default_group_portrait_stu);
             } else {
                 if (TextUtils.isEmpty(data.getType()) || (!data.getType().equals("VIP") && !data.getType().equals("COMM"))) {

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

@@ -14,6 +14,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.load.resource.bitmap.CircleCrop;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.BitmapImageViewTarget;
+import com.cooleshow.base.common.BaseApplication;
 
 import io.rong.imlib.model.Conversation;
 import io.rong.imlib.model.Message;
@@ -100,7 +101,7 @@ public class GlideKitImageEngine implements KitImageEngine {
     @Override
     public void loadConversationListPortrait(@NonNull Context context, @NonNull String url, @NonNull ImageView imageView, Conversation conversation) {
         @DrawableRes int resourceId = R.drawable.rc_default_portrait;
-        if ("com.cooleshow.student".equals(context.getPackageName())) {
+        if (!BaseApplication.Companion.isTeacherClient()) {
             resourceId = R.drawable.rc_default_portrait_stu;
         }
 
@@ -126,7 +127,7 @@ public class GlideKitImageEngine implements KitImageEngine {
     @Override
     public void loadConversationPortrait(@NonNull Context context, @NonNull String url, @NonNull ImageView imageView, Message message) {
         @DrawableRes int resourceId = R.drawable.rc_default_portrait;
-        if ("com.cooleshow.student".equals(context.getPackageName())) {
+        if (!BaseApplication.Companion.isTeacherClient()) {
             resourceId = R.drawable.rc_default_portrait_stu;
         }
         switch (message.getConversationType()) {

rong_im/kit/src/main/java/io/rong/imkit/activity/ForwardSelectConversationActivity.java

@@ -21,6 +21,7 @@ import androidx.lifecycle.Observer;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.resource.bitmap.CircleCrop;
 import com.bumptech.glide.request.RequestOptions;
+import com.cooleshow.base.common.BaseApplication;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -290,7 +291,7 @@ public class ForwardSelectConversationActivity extends RongBaseNoActionbarActivi
             Conversation conversation = allMembers.get(position);
             holder.checkbox.setSelected(selectedMember.contains(conversation));
             @DrawableRes int resourceId = R.drawable.rc_default_portrait;
-            if ("com.cooleshow.student".equals(activity.getPackageName())) {
+            if (!BaseApplication.Companion.isTeacherClient()) {
                 resourceId = R.drawable.rc_default_portrait_stu;
             }
             Glide.with(IMCenter.getInstance().getContext()).load(conversation.getPortraitUrl())

rong_im/kit/src/main/java/io/rong/imkit/conversationlist/model/GatheredConversation.java

@@ -8,6 +8,8 @@ import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
 
+import com.cooleshow.base.common.BaseApplication;
+
 import java.util.List;
 
 import io.rong.imkit.R;
@@ -144,7 +146,7 @@ public class GatheredConversation extends BaseUiConversation {
         Uri uri = RongConfigCenter.gatheredConversationConfig().getGatherConversationPortrait(type);
 
         if (uri == null) {
-            if ("com.cooleshow.student".equals(context.getPackageName())) {
+            if (!BaseApplication.Companion.isTeacherClient()) {
                 uri = RongUtils.getUriFromDrawableRes(mContext, R.drawable.rc_default_portrait_stu);
             } else {
                 uri = RongUtils.getUriFromDrawableRes(mContext, R.drawable.rc_default_portrait);

rong_im/kit/src/main/java/io/rong/imkit/conversationlist/provider/BaseConversationProvider.java

@@ -10,6 +10,8 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.cooleshow.base.common.BaseApplication;
+
 import java.util.List;
 
 import io.rong.imkit.R;
@@ -45,7 +47,7 @@ public class BaseConversationProvider implements IViewProvider<BaseUiConversatio
             RongConfigCenter.featureConfig().getKitImageEngine().loadConversationListPortrait(holder.getContext(), uiConversation.mCore.getPortraitUrl(), holder.<ImageView>getView(R.id.rc_conversation_portrait), uiConversation.mCore);
         } else {
             int drawableId = R.drawable.rc_default_portrait;
-            if ("com.cooleshow.student".equals(holder.getContext().getPackageName())) {
+            if (!BaseApplication.Companion.isTeacherClient()) {
                 drawableId = R.drawable.rc_default_portrait_stu;
             }
             if (uiConversation.mCore.getConversationType().equals(Conversation.ConversationType.GROUP)) {

rong_im/kit/src/main/java/io/rong/imkit/feature/mention/MentionMemberSelectActivity.java

@@ -25,6 +25,7 @@ import androidx.annotation.DrawableRes;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.resource.bitmap.CircleCrop;
 import com.bumptech.glide.request.RequestOptions;
+import com.cooleshow.base.common.BaseApplication;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -261,7 +262,7 @@ public class MentionMemberSelectActivity extends RongBaseNoActionbarActivity {
             if (userInfo != null) {
                 viewHolder.name.setText(userInfo.getName());
                 @DrawableRes int resourceId = R.drawable.rc_default_portrait;
-                if ("com.cooleshow.student".equals(parent.getContext().getPackageName())) {
+                if (!BaseApplication.Companion.isTeacherClient()) {
                     resourceId = R.drawable.rc_default_portrait_stu;
                 }
                 Glide.with(IMCenter.getInstance().getContext()).load(userInfo.getPortraitUri())