Quellcode durchsuchen

修改IM模块资源名称

Pq vor 2 Jahren
Ursprung
Commit
2d6da91c3b
40 geänderte Dateien mit 27 neuen und 34 gelöschten Zeilen
  1. 1 1
      chatModule/src/main/java/com/cooleshow/chatmodule/adapter/AddPhotoListAdapter.java
  2. 3 3
      chatModule/src/main/java/com/cooleshow/chatmodule/adapter/ContactRoomListAdapter.java
  3. 1 2
      chatModule/src/main/java/com/cooleshow/chatmodule/message/holder/TUIChatShareLiveMessageHolder.java
  4. 4 8
      chatModule/src/main/java/com/cooleshow/chatmodule/message/holder/TUIChatShareMusicMessageHolder.java
  5. 2 4
      chatModule/src/main/java/com/cooleshow/chatmodule/utils/helper/ChatGroupHelper.java
  6. 2 2
      chatModule/src/main/java/com/cooleshow/chatmodule/utils/helper/IMThemManager.java
  7. 0 0
      chatModule/src/main/res/drawable-xhdpi/tc_ic_teacher_screen.png
  8. 0 0
      chatModule/src/main/res/drawable-xhdpi/tc_icon_group_admin_tag2.png
  9. 0 0
      chatModule/src/main/res/drawable-xhdpi/tc_icon_group_course.png
  10. 0 0
      chatModule/src/main/res/drawable-xhdpi/tc_icon_group_fans.png
  11. 0 0
      chatModule/src/main/res/drawable-xhdpi/tc_icon_teacher_default_head.png
  12. 0 0
      chatModule/src/main/res/drawable-xxhdpi/tc_ic_already_on_popu.9.png
  13. 0 0
      chatModule/src/main/res/drawable-xxhdpi/tc_ic_notice_read.png
  14. 0 0
      chatModule/src/main/res/drawable-xxhdpi/tc_ic_notice_setting.png
  15. 0 0
      chatModule/src/main/res/drawable-xxhdpi/tc_ic_teacher_screen.png
  16. 0 0
      chatModule/src/main/res/drawable-xxhdpi/tc_ic_update_photo.png
  17. 0 0
      chatModule/src/main/res/drawable-xxhdpi/tc_icon_group_admin_tag2.png
  18. 0 0
      chatModule/src/main/res/drawable-xxhdpi/tc_icon_group_course.png
  19. 0 0
      chatModule/src/main/res/drawable-xxhdpi/tc_icon_group_fans.png
  20. 0 0
      chatModule/src/main/res/drawable-xxhdpi/tc_icon_score_demand.png
  21. 0 0
      chatModule/src/main/res/drawable-xxhdpi/tc_icon_score_free.png
  22. 0 0
      chatModule/src/main/res/drawable-xxhdpi/tc_icon_score_vip.png
  23. 0 0
      chatModule/src/main/res/drawable-xxhdpi/tc_icon_teacher_default_head.png
  24. 0 0
      chatModule/src/main/res/drawable-xxhdpi/tc_rc_ic_message_bubble_left_.9.png
  25. 0 0
      chatModule/src/main/res/drawable-xxhdpi/tc_rc_ic_message_bubble_right_.9.png
  26. 0 0
      chatModule/src/main/res/drawable/tc_bg_search_gray_5dp_shape.xml
  27. 0 0
      chatModule/src/main/res/drawable/tc_shape_1cacf1_18dp.xml
  28. 0 0
      chatModule/src/main/res/drawable/tc_shape_im_teacher_tag_bg.xml
  29. 0 0
      chatModule/src/main/res/drawable/tc_shape_live_msg_tag.xml
  30. 0 0
      chatModule/src/main/res/drawable/tc_switch_selector.xml
  31. 1 1
      chatModule/src/main/res/layout/rc_chat_share_live.xml
  32. 2 2
      chatModule/src/main/res/layout/rc_chat_share_music.xml
  33. 1 1
      chatModule/src/main/res/layout/tc_activity_chat_group_setting.xml
  34. 2 2
      chatModule/src/main/res/layout/tc_activity_group_member.xml
  35. 1 1
      chatModule/src/main/res/layout/tc_fragment_contact_list_layout.xml
  36. 1 1
      chatModule/src/main/res/layout/tc_fragment_contact_room_list.xml
  37. 2 2
      chatModule/src/main/res/layout/tc_group_member_list_item.xml
  38. 2 2
      chatModule/src/main/res/layout/tc_notice_list_item.xml
  39. 1 1
      chatModule/src/main/res/layout/tc_notice_on_popu.xml
  40. 1 1
      chatModule/src/main/res/layout/tc_photo_list_item.xml

+ 1 - 1
chatModule/src/main/java/com/cooleshow/chatmodule/adapter/AddPhotoListAdapter.java

@@ -26,7 +26,7 @@ public class AddPhotoListAdapter extends BaseQuickAdapter<LocalMedia, BaseViewHo
     protected void convert(BaseViewHolder helper, LocalMedia item) {
         ImageView ivIcon = helper.getView(R.id.iv_icon);
         if (item.getPath().equals("123")){
-            ivIcon.setImageResource(R.drawable.ic_update_photo);
+            ivIcon.setImageResource(R.drawable.tc_ic_update_photo);
         }else{
             GlideUtils.INSTANCE.loadImage(getContext(), item.getPath(), ivIcon);
         }

+ 3 - 3
chatModule/src/main/java/com/cooleshow/chatmodule/adapter/ContactRoomListAdapter.java

@@ -38,15 +38,15 @@ public class ContactRoomListAdapter extends BaseQuickAdapter<ContactRoomListBean
         if (TextUtils.equals(contactListBean.getType(), GroupConstants.GROUP_TYPE_CLASS)) {
             tv_group_tag.setText(getContext().getString(R.string.group_type_class_str));
             tv_group_tag.setBackgroundResource(com.cooleshow.base.R.drawable.shape_ff8057_4dp);
-            iv_icon.setImageResource(R.drawable.icon_group_fans);
+            iv_icon.setImageResource(R.drawable.tc_icon_group_fans);
         } else if (TextUtils.equals(contactListBean.getType(), GroupConstants.GROUP_TYPE_OTHER)) {
             tv_group_tag.setText(getContext().getString(R.string.group_type_other_str));
             tv_group_tag.setBackgroundResource(com.cooleshow.base.R.drawable.shape_64a9ff_4dp);
-            iv_icon.setImageResource(R.drawable.icon_group_course);
+            iv_icon.setImageResource(R.drawable.tc_icon_group_course);
         } else {
             tv_group_tag.setText(getContext().getString(R.string.group_type_class_str));
             tv_group_tag.setBackgroundResource(com.cooleshow.base.R.drawable.shape_ff8057_4dp);
-            GlideUtils.INSTANCE.loadImage(getContext(), contactListBean.getImg(), iv_icon, R.drawable.icon_group_fans);
+            GlideUtils.INSTANCE.loadImage(getContext(), contactListBean.getImg(), iv_icon, R.drawable.tc_icon_group_fans);
         }
     }
 }

+ 1 - 2
chatModule/src/main/java/com/cooleshow/chatmodule/message/holder/TUIChatShareLiveMessageHolder.java

@@ -1,7 +1,6 @@
 package com.cooleshow.chatmodule.message.holder;
 
 import android.text.TextUtils;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -34,7 +33,7 @@ public class TUIChatShareLiveMessageHolder extends MessageContentHolder {
             TUIChatShareLiveMessageBean liveMessage = (TUIChatShareLiveMessageBean) msg;
             //头像
             ImageView iv_avatar = itemView.findViewById(R.id.iv_avatar);
-            GlideUtils.INSTANCE.loadImage(itemView.getContext(), liveMessage.getTeacherAvatar(), iv_avatar, R.drawable.icon_teacher_default_head);
+            GlideUtils.INSTANCE.loadImage(itemView.getContext(), liveMessage.getTeacherAvatar(), iv_avatar, R.drawable.tc_icon_teacher_default_head);
             //名称提示
             String name = "老师";
             if (!TextUtils.isEmpty(liveMessage.getTeacherName())) {

+ 4 - 8
chatModule/src/main/java/com/cooleshow/chatmodule/message/holder/TUIChatShareMusicMessageHolder.java

@@ -5,14 +5,10 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.cooleshow.base.common.BaseApplication;
-import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.helper.WebStartHelper;
 import com.cooleshow.chatmodule.R;
 import com.cooleshow.chatmodule.adapter.ItemMarkAdapter;
-import com.cooleshow.chatmodule.message.bean.TUIChatShareLiveMessageBean;
 import com.cooleshow.chatmodule.message.bean.TUIChatShareMusicMessageBean;
 import com.tencent.qcloud.tuikit.timcommon.bean.TUIMessageBean;
 import com.tencent.qcloud.tuikit.timcommon.classicui.widget.message.MessageContentHolder;
@@ -49,18 +45,18 @@ public class TUIChatShareMusicMessageHolder extends MessageContentHolder {
 
             switch (shareMusicMessage.getChargeType()) {
                 case "FREE":
-                    im_state.setBackgroundResource(R.drawable.icon_score_free);
+                    im_state.setBackgroundResource(R.drawable.tc_icon_score_free);
                     break;
                 case "VIP":
-                    im_state.setBackgroundResource(R.drawable.icon_score_vip);
+                    im_state.setBackgroundResource(R.drawable.tc_icon_score_vip);
                     break;
                 case "CHARGE":
-                    im_state.setBackgroundResource(R.drawable.icon_score_demand);
+                    im_state.setBackgroundResource(R.drawable.tc_icon_score_demand);
                     break;
             }
             tv_name.setText(shareMusicMessage.getSongName());
             tv_author_name.setText(shareMusicMessage.getSongAuth());
-            GlideUtils.INSTANCE.loadImage(itemView.getContext(), shareMusicMessage.getTeacherAvatar(), im_header, R.drawable.icon_teacher_default_head);
+            GlideUtils.INSTANCE.loadImage(itemView.getContext(), shareMusicMessage.getTeacherAvatar(), im_header, R.drawable.tc_icon_teacher_default_head);
             tv_teacher_name.setText(shareMusicMessage.getTeacherName());
             if (!TextUtils.isEmpty(shareMusicMessage.getMusicTagNames())) {
                 rv_mark.setVisibility(View.VISIBLE);

+ 2 - 4
chatModule/src/main/java/com/cooleshow/chatmodule/utils/helper/ChatGroupHelper.java

@@ -1,7 +1,5 @@
 package com.cooleshow.chatmodule.utils.helper;
 
-import android.text.TextUtils;
-
 import com.cooleshow.chatmodule.R;
 
 
@@ -10,7 +8,7 @@ import com.cooleshow.chatmodule.R;
  */
 public class ChatGroupHelper {
     public static int getChatGroupAvatar(String groupType) {
-        return R.drawable.icon_group_fans;
+        return R.drawable.tc_icon_group_fans;
 //        if (TextUtils.equals(groupType, GroupType.GROUP_TYPE_CLASS)) {
 //            return R.drawable.icon_group_fans;
 //        } else if (TextUtils.equals(groupType, GroupType.GROUP_TYPE_OTHER)) {
@@ -28,6 +26,6 @@ public class ChatGroupHelper {
 //        } else {
 //            return R.drawable.icon_group_course;
 //        }
-        return R.drawable.icon_group_fans;
+        return R.drawable.tc_icon_group_fans;
     }
 }

+ 2 - 2
chatModule/src/main/java/com/cooleshow/chatmodule/utils/helper/IMThemManager.java

@@ -26,8 +26,8 @@ public class IMThemManager {
     public void init(Context context){
         MessageProperties instance = MessageProperties.getInstance();
         instance.setAvatarRadius(ScreenUtil.dip2px(20));
-        instance.setRightBubble(context.getResources().getDrawable(R.drawable.rc_ic_message_bubble_right_));
-        instance.setLeftBubble(context.getResources().getDrawable(R.drawable.rc_ic_message_bubble_left_));
+        instance.setRightBubble(context.getResources().getDrawable(R.drawable.tc_rc_ic_message_bubble_right_));
+        instance.setLeftBubble(context.getResources().getDrawable(R.drawable.tc_rc_ic_message_bubble_left_));
 
         //禁用群聊合并展示九宫格头像
         TUIConfig.setEnableGroupGridAvatar(false);

+ 0 - 0
chatModule/src/main/res/drawable-xhdpi/ic_teacher_screen.png → chatModule/src/main/res/drawable-xhdpi/tc_ic_teacher_screen.png


+ 0 - 0
chatModule/src/main/res/drawable-xhdpi/icon_group_admin_tag2.png → chatModule/src/main/res/drawable-xhdpi/tc_icon_group_admin_tag2.png


+ 0 - 0
chatModule/src/main/res/drawable-xhdpi/icon_group_course.png → chatModule/src/main/res/drawable-xhdpi/tc_icon_group_course.png


+ 0 - 0
chatModule/src/main/res/drawable-xhdpi/icon_group_fans.png → chatModule/src/main/res/drawable-xhdpi/tc_icon_group_fans.png


+ 0 - 0
chatModule/src/main/res/drawable-xhdpi/icon_teacher_default_head.png → chatModule/src/main/res/drawable-xhdpi/tc_icon_teacher_default_head.png


+ 0 - 0
chatModule/src/main/res/drawable-xxhdpi/ic_already_on_popu.9.png → chatModule/src/main/res/drawable-xxhdpi/tc_ic_already_on_popu.9.png


+ 0 - 0
chatModule/src/main/res/drawable-xxhdpi/ic_notice_read.png → chatModule/src/main/res/drawable-xxhdpi/tc_ic_notice_read.png


+ 0 - 0
chatModule/src/main/res/drawable-xxhdpi/ic_notice_setting.png → chatModule/src/main/res/drawable-xxhdpi/tc_ic_notice_setting.png


+ 0 - 0
chatModule/src/main/res/drawable-xxhdpi/ic_teacher_screen.png → chatModule/src/main/res/drawable-xxhdpi/tc_ic_teacher_screen.png


+ 0 - 0
chatModule/src/main/res/drawable-xxhdpi/ic_update_photo.png → chatModule/src/main/res/drawable-xxhdpi/tc_ic_update_photo.png


+ 0 - 0
chatModule/src/main/res/drawable-xxhdpi/icon_group_admin_tag2.png → chatModule/src/main/res/drawable-xxhdpi/tc_icon_group_admin_tag2.png


+ 0 - 0
chatModule/src/main/res/drawable-xxhdpi/icon_group_course.png → chatModule/src/main/res/drawable-xxhdpi/tc_icon_group_course.png


+ 0 - 0
chatModule/src/main/res/drawable-xxhdpi/icon_group_fans.png → chatModule/src/main/res/drawable-xxhdpi/tc_icon_group_fans.png


+ 0 - 0
chatModule/src/main/res/drawable-xxhdpi/icon_score_demand.png → chatModule/src/main/res/drawable-xxhdpi/tc_icon_score_demand.png


+ 0 - 0
chatModule/src/main/res/drawable-xxhdpi/icon_score_free.png → chatModule/src/main/res/drawable-xxhdpi/tc_icon_score_free.png


+ 0 - 0
chatModule/src/main/res/drawable-xxhdpi/icon_score_vip.png → chatModule/src/main/res/drawable-xxhdpi/tc_icon_score_vip.png


+ 0 - 0
chatModule/src/main/res/drawable-xxhdpi/icon_teacher_default_head.png → chatModule/src/main/res/drawable-xxhdpi/tc_icon_teacher_default_head.png


+ 0 - 0
chatModule/src/main/res/drawable-xxhdpi/rc_ic_message_bubble_left_.9.png → chatModule/src/main/res/drawable-xxhdpi/tc_rc_ic_message_bubble_left_.9.png


+ 0 - 0
chatModule/src/main/res/drawable-xxhdpi/rc_ic_message_bubble_right_.9.png → chatModule/src/main/res/drawable-xxhdpi/tc_rc_ic_message_bubble_right_.9.png


+ 0 - 0
chatModule/src/main/res/drawable/bg_search_gray_5dp_shape.xml → chatModule/src/main/res/drawable/tc_bg_search_gray_5dp_shape.xml


+ 0 - 0
chatModule/src/main/res/drawable/shape_1cacf1_18dp.xml → chatModule/src/main/res/drawable/tc_shape_1cacf1_18dp.xml


+ 0 - 0
chatModule/src/main/res/drawable/shape_im_teacher_tag_bg.xml → chatModule/src/main/res/drawable/tc_shape_im_teacher_tag_bg.xml


+ 0 - 0
chatModule/src/main/res/drawable/shape_live_msg_tag.xml → chatModule/src/main/res/drawable/tc_shape_live_msg_tag.xml


+ 0 - 0
chatModule/src/main/res/drawable/switch_selector.xml → chatModule/src/main/res/drawable/tc_switch_selector.xml


+ 1 - 1
chatModule/src/main/res/layout/rc_chat_share_live.xml

@@ -34,7 +34,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/shape_live_msg_tag"
+            android:background="@drawable/tc_shape_live_msg_tag"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
             android:text="直播中"

+ 2 - 2
chatModule/src/main/res/layout/rc_chat_share_music.xml

@@ -49,7 +49,7 @@
             android:layout_width="@dimen/dp_55"
             android:layout_height="@dimen/dp_22"
             android:layout_marginRight="12dp"
-            android:background="@drawable/icon_score_demand"
+            android:background="@drawable/tc_icon_score_demand"
             app:layout_constraintBottom_toBottomOf="@+id/im_music_mark"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="@+id/im_music_mark" />
@@ -72,7 +72,7 @@
             android:layout_marginLeft="14dp"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="10dp"
-            android:src="@drawable/icon_teacher_default_head"
+            android:src="@drawable/tc_icon_teacher_default_head"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="@+id/view_line"
             app:layout_constraintTop_toBottomOf="@+id/view_line"

+ 1 - 1
chatModule/src/main/res/layout/tc_activity_chat_group_setting.xml

@@ -249,7 +249,7 @@
                 android:background="@color/white"
                 android:button="@null"
                 android:checked="false"
-                android:drawableEnd="@drawable/switch_selector"
+                android:drawableEnd="@drawable/tc_switch_selector"
                 android:paddingStart="@dimen/dp_13"
                 android:paddingEnd="@dimen/dp_15"
                 android:text="消息接收但不提醒"

+ 2 - 2
chatModule/src/main/res/layout/tc_activity_group_member.xml

@@ -15,7 +15,7 @@
         android:layout_marginStart="@dimen/dp_21"
         android:layout_marginTop="@dimen/dp_20"
         android:layout_marginEnd="@dimen/dp_21"
-        android:background="@drawable/bg_search_gray_5dp_shape"
+        android:background="@drawable/tc_bg_search_gray_5dp_shape"
         android:gravity="center_vertical"
         android:hint="搜索"
         android:imeOptions="actionSearch"
@@ -94,7 +94,7 @@
         android:layout_width="@dimen/dp_58"
         android:layout_height="@dimen/dp_58"
         android:layout_marginTop="@dimen/dp_54"
-        android:background="@drawable/ic_teacher_screen"
+        android:background="@drawable/tc_ic_teacher_screen"
         android:gravity="center"
         android:paddingStart="8dp"
         android:paddingBottom="@dimen/dp_3"

+ 1 - 1
chatModule/src/main/res/layout/tc_fragment_contact_list_layout.xml

@@ -143,7 +143,7 @@
         android:layout_width="@dimen/dp_58"
         android:layout_height="@dimen/dp_58"
         android:layout_marginTop="@dimen/dp_54"
-        android:background="@drawable/ic_teacher_screen"
+        android:background="@drawable/tc_ic_teacher_screen"
         android:gravity="center"
         android:paddingStart="8dp"
         android:paddingBottom="@dimen/dp_3"

+ 1 - 1
chatModule/src/main/res/layout/tc_fragment_contact_room_list.xml

@@ -111,7 +111,7 @@
         android:layout_width="@dimen/dp_58"
         android:layout_height="@dimen/dp_58"
         android:layout_marginTop="@dimen/dp_54"
-        android:background="@drawable/ic_teacher_screen"
+        android:background="@drawable/tc_ic_teacher_screen"
         android:gravity="center"
         android:paddingStart="8dp"
         android:paddingBottom="@dimen/dp_3"

+ 2 - 2
chatModule/src/main/res/layout/tc_group_member_list_item.xml

@@ -21,7 +21,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:background="@drawable/shape_im_teacher_tag_bg"
+        android:background="@drawable/tc_shape_im_teacher_tag_bg"
         android:gravity="center"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@+id/iv_icon"
@@ -49,7 +49,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
         android:visibility="gone"
-        android:src="@drawable/icon_group_admin_tag2"
+        android:src="@drawable/tc_icon_group_admin_tag2"
         app:layout_constraintBottom_toBottomOf="@+id/iv_icon"
         app:layout_constraintLeft_toRightOf="@+id/iv_icon"
         app:layout_constraintTop_toTopOf="@+id/iv_icon" />

+ 2 - 2
chatModule/src/main/res/layout/tc_notice_list_item.xml

@@ -66,7 +66,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp_12"
         android:padding="@dimen/dp_15"
-        android:src="@drawable/ic_notice_setting"
+        android:src="@drawable/tc_ic_notice_setting"
         android:visibility="visible"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -107,7 +107,7 @@
         android:layout_marginTop="@dimen/dp_20"
         android:layout_marginEnd="@dimen/dp_15"
         android:layout_marginBottom="@dimen/dp_18"
-        android:drawableStart="@drawable/ic_notice_read"
+        android:drawableStart="@drawable/tc_ic_notice_read"
         android:drawablePadding="@dimen/dp_5"
         android:text=""
         android:textColor="#4B6F6C"

+ 1 - 1
chatModule/src/main/res/layout/tc_notice_on_popu.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="100dp"
     android:layout_height="wrap_content"
-    android:background="@drawable/ic_already_on_popu"
+    android:background="@drawable/tc_ic_already_on_popu"
     android:orientation="vertical">
 
     <androidx.recyclerview.widget.RecyclerView

+ 1 - 1
chatModule/src/main/res/layout/tc_photo_list_item.xml

@@ -11,5 +11,5 @@
         android:layout_height="85dp"
         android:layout_gravity="center"
         android:orientation="vertical"
-        android:src="@drawable/ic_update_photo" />
+        android:src="@drawable/tc_ic_update_photo" />
 </FrameLayout>