Browse Source

修复bug

Pq 3 years ago
parent
commit
16c152116a

+ 4 - 4
rong_im/common_im_ui/src/main/java/com/common/im/adapter/ContactRoomListAdapter.java

@@ -26,17 +26,17 @@ public class ContactRoomListAdapter extends BaseQuickAdapter<ContactRoomListBean
     protected void convert(@NonNull BaseViewHolder holder, ContactRoomListBean contactListBean) {
         holder.setText(R.id.tv_name, contactListBean.getName());
         ImageView iv_icon = holder.getView(R.id.iv_icon);
-        ImageView im_group_mark=holder.getView(R.id.im_group_mark);
+        ImageView im_group_mark = holder.getView(R.id.im_group_mark);
 
         if (contactListBean.getType().equals("FAN")) {
             im_group_mark.setBackgroundResource(R.drawable.icon_group_mark_fans);
-            iv_icon.setImageResource(R.drawable.icon_group_fans);
+            iv_icon.setImageResource(io.rong.imkit.R.drawable.icon_group_fans);
         } else if (contactListBean.getType().equals("COURSE")) {
             im_group_mark.setBackgroundResource(R.drawable.icon_group_mark_course);
-            iv_icon.setImageResource(R.drawable.icon_group_course);
+            iv_icon.setImageResource(io.rong.imkit.R.drawable.icon_group_course);
         } else {
             im_group_mark.setBackgroundResource(R.drawable.icon_group_mark_fans);
-            GlideUtils.INSTANCE.loadImage(getContext(), contactListBean.getImg(), iv_icon, R.drawable.icon_group_fans);
+            GlideUtils.INSTANCE.loadImage(getContext(), contactListBean.getImg(), iv_icon, io.rong.imkit.R.drawable.icon_group_fans);
         }
     }
 }

+ 2 - 1
rong_im/kit/src/main/java/io/rong/imkit/conversationlist/provider/BaseConversationProvider.java

@@ -18,6 +18,7 @@ import io.rong.imkit.R;
 import io.rong.imkit.config.RongConfigCenter;
 import io.rong.imkit.conversationlist.model.BaseUiConversation;
 import io.rong.imkit.utils.RongDateUtils;
+import io.rong.imkit.utils.helper.ChatGroupHelper;
 import io.rong.imkit.widget.adapter.IViewProvider;
 import io.rong.imkit.widget.adapter.IViewProviderListener;
 import io.rong.imkit.widget.adapter.ViewHolder;
@@ -51,7 +52,7 @@ public class BaseConversationProvider implements IViewProvider<BaseUiConversatio
                 drawableId = R.drawable.rc_default_portrait_stu;
             }
             if (uiConversation.mCore.getConversationType().equals(Conversation.ConversationType.GROUP)) {
-                drawableId = R.drawable.rc_default_group_portrait;
+                drawableId = ChatGroupHelper.getChatGroupAvatarFromId(uiConversation.mCore.getTargetId());
             } else if (uiConversation.mCore.getConversationType().equals(Conversation.ConversationType.SYSTEM)) {
                 drawableId = R.drawable.rc_default_system_portrait_stu;
             } else if (uiConversation.mCore.getConversationType().equals(Conversation.ConversationType.CHATROOM)) {

+ 32 - 0
rong_im/kit/src/main/java/io/rong/imkit/utils/helper/ChatGroupHelper.java

@@ -0,0 +1,32 @@
+package io.rong.imkit.utils.helper;
+
+import android.text.TextUtils;
+
+import com.cooleshow.base.utils.GlideUtils;
+
+import io.rong.imkit.R;
+
+/**
+ * Author by pq, Date on 2022/7/10.
+ */
+public class ChatGroupHelper {
+    public static int getChatGroupAvatar(String groupType) {
+        if (TextUtils.equals(groupType, "FAN")) {
+            return R.drawable.icon_group_fans;
+        } else if (TextUtils.equals(groupType, "COURSE")) {
+            return R.drawable.icon_group_course;
+        } else {
+            return R.drawable.icon_group_course;
+        }
+    }
+
+    public static int getChatGroupAvatarFromId(String conversationId) {
+        if (conversationId.contains("FAN")) {
+            return R.drawable.icon_group_fans;
+        } else if (conversationId.contains("COURSE")) {
+            return R.drawable.icon_group_course;
+        } else {
+            return R.drawable.icon_group_course;
+        }
+    }
+}

+ 0 - 0
rong_im/common_im_ui/src/main/res/drawable-xhdpi/icon_group_course.png → rong_im/kit/src/main/res/drawable-xhdpi/icon_group_course.png


+ 0 - 0
rong_im/common_im_ui/src/main/res/drawable-xhdpi/icon_group_fans.png → rong_im/kit/src/main/res/drawable-xhdpi/icon_group_fans.png


+ 0 - 0
rong_im/common_im_ui/src/main/res/drawable-xxhdpi/icon_group_course.png → rong_im/kit/src/main/res/drawable-xxhdpi/icon_group_course.png


+ 0 - 0
rong_im/common_im_ui/src/main/res/drawable-xxhdpi/icon_group_fans.png → rong_im/kit/src/main/res/drawable-xxhdpi/icon_group_fans.png


+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/course/PianoRoomCourseDetailActivity.java

@@ -241,7 +241,7 @@ public class PianoRoomCourseDetailActivity extends BaseMVPActivity<ActivityPiano
         if (mInfoBean == null) {
             return;
         }
-        if (TextUtils.equals(mInfoBean.courseStatus, CourseConstants.COURSE_FILTER_HAS_NOT_STARTED)) {
+        if (!TextUtils.equals(mInfoBean.courseStatus, CourseConstants.COURSE_FILTER_COMPLETED)) {
             ToastUtil.getInstance().showShort("课程结束之后才可以布置作业哦~");
             return;
         }