修改部分UI样式问题

BaseLibrary/src/main/res/drawable/shape_2dc7aa_1dp.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/color_2dc7aa"/>
+    <size android:width="1.5dp"/>
+</shape>

BaseLibrary/src/main/res/values/colors.xml

@@ -196,5 +196,6 @@
     <color name="color_33000000">#33000000</color>
     <color name="color_66000000">#66000000</color>
     <color name="color_ff5a56">#FF5A56</color>
+    <color name="color_f8f8f8">#f8f8f8</color>
 
 </resources>

TUIKit/TIMCommon/timcommon/src/main/java/com/tencent/qcloud/tuikit/timcommon/component/MessageProperties.java

@@ -1,6 +1,7 @@
 package com.tencent.qcloud.tuikit.timcommon.component;
 
 import android.graphics.drawable.Drawable;
+import android.widget.EditText;
 
 import com.tencent.qcloud.tuikit.timcommon.interfaces.IMessageProperties;
 import com.tencent.qcloud.tuikit.timcommon.util.ScreenUtil;
@@ -246,4 +247,18 @@ public class MessageProperties implements IMessageProperties {
     public void setMainStyleColor(int mainStyleColor) {
         this.mainStyleColor = mainStyleColor;
     }
+
+    public void setEditStyle(int colorRes, EditText editText) {
+        Drawable textCursorDrawable = null;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
+            textCursorDrawable = editText.getTextCursorDrawable();
+            if (textCursorDrawable != null) {
+                if (colorRes != -1) {
+                    textCursorDrawable.setTint(colorRes);
+                } else {
+                    textCursorDrawable.setTintList(null);
+                }
+            }
+        }
+    }
 }

TUIKit/TUISearch/tuisearch/src/main/java/com/tencent/qcloud/tuikit/tuisearch/classicui/page/SearchMainActivity.java

@@ -93,6 +93,7 @@ public class SearchMainActivity extends BaseLightActivity {
             mIvSearch.setImageResource(searchIconRes);
         }
         int mainStyleColor = MessageProperties.getInstance().getMainStyleColor();
+        MessageProperties.getInstance().setEditStyle(mainStyleColor,mEdtSearch);
         if (mainStyleColor != -1) {
             mCancleView.setTextColor(mainStyleColor);
         }
@@ -116,6 +117,7 @@ public class SearchMainActivity extends BaseLightActivity {
         setListener();
     }
 
+
     public void initPresenter() {
         presenter = new SearchMainPresenter();
         presenter.setGroupAdapter(mGroupRcSearchAdapter);

TUIKit/TUISearch/tuisearch/src/main/java/com/tencent/qcloud/tuikit/tuisearch/classicui/page/SearchMoreListActivity.java

@@ -78,6 +78,7 @@ public class SearchMoreListActivity extends BaseLightActivity {
             mIvSearch.setImageResource(searchIconRes);
         }
         int mainStyleColor = MessageProperties.getInstance().getMainStyleColor();
+        MessageProperties.getInstance().setEditStyle(mainStyleColor,mEdtSearch);
         if (mainStyleColor != -1) {
             mCancleView.setTextColor(mainStyleColor);
         }

TUIKit/TUISearch/tuisearch/src/main/java/com/tencent/qcloud/tuikit/tuisearch/classicui/page/SearchMoreMsgListActivity.java

@@ -74,6 +74,7 @@ public class SearchMoreMsgListActivity extends BaseLightActivity {
             mIvSearch.setImageResource(searchIconRes);
         }
         int mainStyleColor = MessageProperties.getInstance().getMainStyleColor();
+        MessageProperties.getInstance().setEditStyle(mainStyleColor,mEdtSearch);
         if (mainStyleColor != -1) {
             mCancleView.setTextColor(mainStyleColor);
         }

TUIKit/TUISearch/tuisearch/src/main/res/drawable/shape_2dc7aa_1dp.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/color_2dc7aa"/>
+    <size android:width="1.5dp"/>
+</shape>

TUIKit/TUISearch/tuisearch/src/main/res/layout/search_main_activity.xml

@@ -28,6 +28,7 @@
             android:layout_marginBottom="12dp"
             android:background="@drawable/shape_f6f6f6_18dp"
             android:hint="搜索"
+            android:textCursorDrawable="@drawable/shape_2dc7aa_1dp"
             android:maxLines="1"
             android:gravity="center_vertical"
             android:paddingStart="40dp"

chatModule/src/main/java/com/cooleshow/chatmodule/ui/ChatFragment.java

@@ -58,6 +58,7 @@ public class ChatFragment extends BaseFragment<TcFragmentChatLayoutBinding> impl
 
     private void setViewStyles() {
         IMThemManager.getInstance().setTabViewStyles(mViewBinding.tabLayout);
+        IMThemManager.getInstance().setTopBgStyles(mViewBinding.ivTopBg);
     }
 
     private void initListener() {

chatModule/src/main/java/com/cooleshow/chatmodule/ui/ContactPersonListFragment.java

@@ -80,6 +80,8 @@ public class ContactPersonListFragment extends BaseMVPFragment<TcFragmentContact
         }
         IMThemManager.getInstance().setSearchIconStyles(mViewBinding.ivSearchIcon);
         IMThemManager.getInstance().setSearchButtonStyles(mViewBinding.tvSearch);
+        IMThemManager.getInstance().setEditStyle(mViewBinding.etTargetName);
+
         mViewBinding.etTargetName.setHint("请输入联系人名称");
         CustomIndexBarDataHelperImpl indexBarDataHelper = new CustomIndexBarDataHelperImpl();
         mViewBinding.livLetters.setDataHelper(indexBarDataHelper);

chatModule/src/main/java/com/cooleshow/chatmodule/ui/ContactRoomListFragment.java

@@ -66,6 +66,8 @@ public class ContactRoomListFragment extends BaseMVPFragment<TcFragmentContactRo
         }
         IMThemManager.getInstance().setSearchIconStyles(mViewBinding.ivSearchIcon);
         IMThemManager.getInstance().setSearchButtonStyles(mViewBinding.tvSearch);
+        IMThemManager.getInstance().setEditStyle(mViewBinding.etTargetName);
+
         mViewBinding.etTargetName.setHint("请输入群聊名称");
         mViewBinding.tvSearch.setOnClickListener(this);
         mListAdapter = new ContactRoomListAdapter();

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

@@ -8,6 +8,7 @@ import android.graphics.drawable.GradientDrawable;
 import android.graphics.drawable.LayerDrawable;
 import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TableLayout;
 import android.widget.TextView;
@@ -41,6 +42,7 @@ public class IMThemManager {
     private int searchBtBackgroundRes = -1;
     private int checkBtDrawableRes = -1;
     private int mainButtonBackgroundRes = -1;
+    private int chatTopViewBackgroundRes = -1;
 
 
     private IMThemManager() {
@@ -94,6 +96,17 @@ public class IMThemManager {
         }
     }
 
+    public void setTopBgStyles(ImageView ivTopBg) {
+        if (ivTopBg == null) {
+            return;
+        }
+        if (chatTopViewBackgroundRes != -1) {
+            ivTopBg.setImageResource(chatTopViewBackgroundRes);
+        } else {
+            ivTopBg.setImageDrawable(null);
+        }
+    }
+
     public void setSearchIconStyles(ImageView imageView) {
         if (imageView == null) {
             return;
@@ -124,6 +137,20 @@ public class IMThemManager {
         }
     }
 
+    public void setEditStyle(EditText editText) {
+        Drawable textCursorDrawable = null;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
+            textCursorDrawable = editText.getTextCursorDrawable();
+            if (textCursorDrawable != null) {
+                if (mainStyleColor != -1) {
+                    textCursorDrawable.setTint(mainStyleColor);
+                } else {
+                    textCursorDrawable.setTintList(null);
+                }
+            }
+        }
+    }
+
     public void setEmptyDrawable(Drawable emptyDrawable) {
         MessageProperties instance = MessageProperties.getInstance();
         instance.setConversationListEmptyDrawable(emptyDrawable);
@@ -152,6 +179,10 @@ public class IMThemManager {
         this.mainButtonBackgroundRes = mainButtonBackgroundRes;
     }
 
+    public void setChatTopViewBackgroundRes(int chatTopViewBackgroundRes) {
+        this.chatTopViewBackgroundRes = chatTopViewBackgroundRes;
+    }
+
     public void resetStyleValue() {
         this.tabIndicatorDrawable = null;
         setMainStyleColor(-1);
@@ -159,6 +190,7 @@ public class IMThemManager {
         this.searchBtBackgroundRes = -1;
         this.checkBtDrawableRes = -1;
         this.mainButtonBackgroundRes = -1;
+        this.chatTopViewBackgroundRes = -1;
         setEmptyDrawable(null);
     }
 }

chatModule/src/main/res/layout/tc_fragment_chat_layout.xml

@@ -11,6 +11,14 @@
         app:layout_constraintBottom_toTopOf="@+id/viewPager"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <ImageView
+        android:id="@+id/iv_top_bg"
+        android:adjustViewBounds="true"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
     <View
         android:id="@+id/view_status_bar"
         android:layout_width="match_parent"

chatModule/src/main/res/layout/tc_fragment_contact_list_layout.xml

@@ -60,6 +60,7 @@
         android:hint="请输入学员名称"
         android:maxLines="1"
         android:paddingStart="8dp"
+        android:textCursorDrawable="@drawable/shape_2dc7aa_1dp"
         android:textColor="@color/color_999999"
         android:textSize="@dimen/sp_13"
         app:layout_constraintBottom_toBottomOf="@+id/view_search_bg"

chatModule/src/main/res/layout/tc_fragment_contact_room_list.xml

@@ -30,6 +30,7 @@
     <com.cooleshow.base.widgets.ClearEditText
         android:id="@+id/et_target_name"
         android:layout_width="0dp"
+        android:textCursorDrawable="@drawable/shape_2dc7aa_1dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="5dp"
         android:background="@null"

institution/src/main/java/com/cooleshow/institution/stu/ui/main/MainActivity.java

@@ -107,6 +107,7 @@ public class MainActivity extends BaseMVPActivity<ActivityInstitutionMainLayoutB
         IMThemManager.getInstance().setSearchIconRes(R.drawable.jg_icon_search);
         IMThemManager.getInstance().setCheckBtDrawableRes(R.drawable.jg_switch_selector);
         IMThemManager.getInstance().setMainButtonBackgroundRes(R.drawable.shape_fe2451_39dp);
+        IMThemManager.getInstance().setChatTopViewBackgroundRes(R.drawable.jg_bg_chat_top);
     }
 
     public void onTabClick(View view) {

institution/src/main/res/layout/activity_institution_main_layout.xml

@@ -46,7 +46,7 @@
             android:drawablePadding="3dp"
             android:gravity="center"
             android:includeFontPadding="false"
-            android:text="聊天"
+            android:text="通讯"
             android:textColor="@color/selector_aaaaaa_to_ff497b"
             android:textSize="@dimen/sp_10"
             app:layout_constraintRight_toLeftOf="@+id/tv_mine"

institution/src/main/res/layout/fg_card_anim_layout.xml

@@ -28,7 +28,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:background="@drawable/shape_66000000_12dp"
-        app:layout_constraintDimensionRatio="w,296:571"
+        app:layout_constraintDimensionRatio="h,296:571"
         app:layout_constraintBottom_toBottomOf="@+id/view_live_anim"
         app:layout_constraintLeft_toLeftOf="@+id/view_live_anim"
         app:layout_constraintRight_toRightOf="@+id/view_live_anim"
@@ -62,6 +62,7 @@
     <androidx.constraintlayout.widget.Group
         android:id="@+id/group_unlock"
         android:visibility="gone"
+        tools:visibility="visible"
         app:constraint_referenced_ids="iv_lock,tv_lock_tip,view_unlock"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>

institution/src/main/res/layout/fg_home_card_layout.xml

@@ -43,7 +43,7 @@
         android:id="@+id/tv_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="2dp"
+        android:layout_marginStart="3dp"
         android:includeFontPadding="false"
         android:textColor="@color/white"
         android:textSize="@dimen/sp_16"
@@ -68,7 +68,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
-        android:src="@drawable/jg_icon_search"
+        android:src="@drawable/jg_icon_search2"
         app:layout_constraintBottom_toBottomOf="@+id/view_search_bg"
         app:layout_constraintLeft_toLeftOf="@+id/view_search_bg"
         app:layout_constraintTop_toTopOf="@+id/view_search_bg" />

institution/src/main/res/layout/fg_home_music_layout.xml

@@ -45,7 +45,7 @@
         android:id="@+id/tv_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="2dp"
+        android:layout_marginStart="3dp"
         android:includeFontPadding="false"
         android:textColor="@color/color_131415"
         android:textSize="@dimen/sp_16"

student/src/main/res/values/styles.xml

@@ -5,7 +5,7 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:windowBackground">@color/color_f6f8f9</item>
+        <item name="android:windowBackground">@color/color_f8f8f8</item>
     </style>
 
     <style name="SplashTheme" parent="AppTheme">

teacher/src/main/res/values/styles.xml

@@ -5,7 +5,7 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:windowBackground">@color/color_f6f8f9</item>
+        <item name="android:windowBackground">@color/color_f8f8f8</item>
     </style>
 
     <style name="SplashTheme" parent="AppTheme">