修改部分样式问题

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

@@ -4,6 +4,6 @@
        android:shape="rectangle">
     <stroke
         android:width="@dimen/dp_1"
-        android:color="@color/color_fa6400"/>
+        android:color="#FE2451"/>
     <corners android:radius="@dimen/dp_45"/>
 </shape>

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

@@ -507,4 +507,9 @@
         <item name="klx_img_check">@drawable/icon_img_check</item>
         <item name="klx_main_bt_background">@drawable/shape_fe2451_39dp</item>
     </style>
+
+    <style name="MyEditText" parent="Theme.AppCompat.Light">
+        <item name="colorControlNormal">?attr/klx_main_color</item>
+        <item name="colorControlActivated">?attr/klx_main_color</item>
+    </style>
 </resources>

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

@@ -14,6 +14,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.listener.OnItemClickListener;
+import com.cooleshow.base.constanst.StyleConfig;
 import com.cooleshow.base.constanst.UploadConstants;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
@@ -66,6 +67,7 @@ public class ImAppealActivity extends BaseMVPActivity<TcActivityImAppealBinding,
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        StyleConfig.setTheme(this);
         super.onCreate(savedInstanceState);
         QMUIStatusBarHelper.setStatusBarLightMode(this);
     }

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

@@ -36,6 +36,7 @@
                 android:layout_marginStart="@dimen/dp_13"
                 android:layout_marginTop="@dimen/dp_12"
                 android:layout_marginEnd="@dimen/dp_13"
+                android:theme="@style/MyEditText"
                 android:textCursorDrawable="@drawable/shape_2dc7aa_1dp"
                 android:background="@drawable/bg_gray_line_shape_5dp"
                 android:gravity="left|top"

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

@@ -32,7 +32,7 @@
     <View
         android:id="@+id/view_search_bg"
         android:layout_width="0dp"
-        android:layout_height="35dp"
+        android:layout_height="34dp"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="14dp"
         android:background="@drawable/bg_white_18dp"
@@ -60,6 +60,8 @@
         android:hint="请输入学员名称"
         android:maxLines="1"
         android:paddingStart="8dp"
+        android:includeFontPadding="false"
+        android:theme="@style/MyEditText"
         android:textCursorDrawable="@drawable/shape_2dc7aa_1dp"
         android:textColor="@color/color_999999"
         android:textSize="@dimen/sp_14"
@@ -72,12 +74,13 @@
         android:id="@+id/tv_search"
         android:layout_width="56dp"
         android:layout_height="28dp"
-        android:layout_marginEnd="4dp"
+        android:layout_marginEnd="3dp"
         android:background="@drawable/shape_1ecdac_18dp"
         android:gravity="center"
         android:text="搜索"
         android:textColor="@color/white"
         android:textSize="@dimen/sp_14"
+        android:includeFontPadding="false"
         app:layout_constraintBottom_toBottomOf="@+id/view_search_bg"
         app:layout_constraintRight_toRightOf="@+id/view_search_bg"
         app:layout_constraintTop_toTopOf="@+id/view_search_bg" />
@@ -145,8 +148,6 @@
         android:layout_marginTop="@dimen/dp_54"
         android:background="@drawable/tc_ic_teacher_screen"
         android:gravity="center"
-        android:paddingStart="8dp"
-        android:paddingBottom="@dimen/dp_3"
         android:text="A"
         android:textColor="@color/white"
         android:textSize="@dimen/dp_45"

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

@@ -9,7 +9,7 @@
     <View
         android:id="@+id/view_search_bg"
         android:layout_width="match_parent"
-        android:layout_height="35dp"
+        android:layout_height="34dp"
         android:layout_marginStart="14dp"
         android:layout_marginEnd="14dp"
         android:background="@drawable/bg_white_18dp"
@@ -28,6 +28,7 @@
         app:layout_constraintTop_toTopOf="@+id/view_search_bg" />
 
     <com.cooleshow.base.widgets.ClearEditText
+        android:includeFontPadding="false"
         android:id="@+id/et_target_name"
         android:layout_width="0dp"
         android:textCursorDrawable="@drawable/shape_2dc7aa_1dp"
@@ -40,6 +41,7 @@
         android:paddingStart="8dp"
         android:textColor="@color/color_999999"
         android:textSize="@dimen/sp_14"
+        android:theme="@style/MyEditText"
         app:layout_constraintBottom_toBottomOf="@+id/view_search_bg"
         app:layout_constraintLeft_toRightOf="@+id/iv_search_icon"
         app:layout_constraintRight_toLeftOf="@+id/tv_search"
@@ -49,10 +51,11 @@
         android:id="@+id/tv_search"
         android:layout_width="56dp"
         android:layout_height="28dp"
-        android:layout_marginEnd="4dp"
+        android:layout_marginEnd="3dp"
         android:background="@drawable/shape_1ecdac_18dp"
         android:gravity="center"
         android:text="搜索"
+        android:includeFontPadding="false"
         android:textColor="@color/white"
         android:textSize="@dimen/sp_14"
         app:layout_constraintBottom_toBottomOf="@+id/view_search_bg"
@@ -114,8 +117,6 @@
         android:layout_marginTop="@dimen/dp_54"
         android:background="@drawable/tc_ic_teacher_screen"
         android:gravity="center"
-        android:paddingStart="8dp"
-        android:paddingBottom="@dimen/dp_3"
         android:text="A"
         android:textColor="@color/white"
         android:textSize="@dimen/dp_45"

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

@@ -7,7 +7,7 @@
     <View
         android:id="@+id/view_search_bg"
         android:layout_width="match_parent"
-        android:layout_height="36dp"
+        android:layout_height="34dp"
         android:layout_marginStart="14dp"
         android:layout_marginEnd="14dp"
         android:background="@drawable/bg_white_18dp"
@@ -35,6 +35,7 @@
         android:maxLines="1"
         android:paddingStart="8dp"
         android:text="查找聊天记录"
+        android:includeFontPadding="false"
         android:textColor="@color/color_999999"
         android:textSize="@dimen/sp_14"
         app:layout_constraintBottom_toBottomOf="@+id/view_search_bg"
@@ -46,10 +47,11 @@
         android:id="@+id/tv_search"
         android:layout_width="56dp"
         android:layout_height="28dp"
-        android:layout_marginEnd="6dp"
+        android:layout_marginEnd="3dp"
         android:background="@drawable/shape_1ecdac_18dp"
         android:gravity="center"
         android:text="搜索"
+        android:includeFontPadding="false"
         android:textColor="@color/white"
         android:textSize="@dimen/sp_14"
         app:layout_constraintBottom_toBottomOf="@+id/view_search_bg"

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

@@ -4,14 +4,16 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="@dimen/dp_10"
-    android:background="@color/white">
+    android:layout_marginStart="13dp"
+    android:layout_marginEnd="13dp"
+    android:background="@drawable/shape_10dp_white">
 
     <com.cooleshow.base.widgets.QMUIRadiusImageView
         android:id="@+id/iv_portrait"
         android:layout_width="@dimen/dp_60"
         android:layout_height="@dimen/dp_60"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginStart="13dp"
+        android:layout_marginTop="12dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:qmui_corner_radius="5dp" />
@@ -25,8 +27,10 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:text=""
+        android:textStyle="bold"
+        android:includeFontPadding="false"
         android:textColor="@color/black_444"
-        android:textSize="@dimen/dp_18"
+        android:textSize="@dimen/dp_16"
         app:layout_constraintEnd_toStartOf="@id/iv_setting"
         app:layout_constraintStart_toEndOf="@id/iv_portrait"
         app:layout_constraintTop_toTopOf="@id/iv_portrait" />
@@ -36,9 +40,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_11"
-        android:layout_marginTop="@dimen/dp_2"
+        android:layout_marginTop="@dimen/dp_4"
         android:layout_marginEnd="@dimen/dp_15"
         android:text="    "
+        android:includeFontPadding="false"
         android:textColor="@color/color_666666"
         android:textSize="@dimen/dp_14"
         app:layout_constraintStart_toEndOf="@id/iv_portrait"
@@ -47,18 +52,19 @@
     <TextView
         android:id="@+id/tv_roof"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="19dp"
         android:layout_marginStart="@dimen/dp_8"
         android:background="@drawable/bg_orange_line_45_shape"
         android:paddingStart="@dimen/dp_10"
-        android:paddingTop="@dimen/dp_2"
         android:paddingEnd="@dimen/dp_10"
-        android:paddingBottom="@dimen/dp_2"
         android:text="置顶"
-        android:textColor="@color/color_fa6400"
-        android:textSize="@dimen/dp_14"
+        android:gravity="center"
+        android:includeFontPadding="false"
+        android:textColor="@color/color_fe2451"
+        android:textSize="@dimen/dp_12"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_time"
         app:layout_constraintStart_toEndOf="@id/tv_time"
-        app:layout_constraintTop_toBottomOf="@id/tv_name" />
+        app:layout_constraintTop_toTopOf="@id/tv_time" />
 
     <ImageView
         android:id="@+id/iv_setting"
@@ -71,30 +77,40 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <View
+        android:background="@color/color_f2f2f2"
+        android:id="@+id/view_line"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginTop="12dp"
+        app:layout_constraintTop_toBottomOf="@+id/iv_portrait"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"/>
+
     <TextView
         android:id="@+id/tv_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_18"
-        android:layout_marginEnd="@dimen/dp_15"
+        android:layout_marginTop="@dimen/dp_12"
+        android:layout_marginEnd="@dimen/dp_13"
         android:text=""
         android:textColor="@color/black_444"
-        android:textSize="@dimen/dp_18"
+        android:textSize="@dimen/dp_15"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/iv_portrait"
-        app:layout_constraintTop_toBottomOf="@id/iv_portrait" />
+        app:layout_constraintTop_toBottomOf="@id/view_line" />
 
     <TextView
         android:id="@+id/tv_content"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_13"
-        android:layout_marginEnd="@dimen/dp_15"
+        android:layout_marginTop="@dimen/dp_6"
+        android:layout_marginEnd="@dimen/dp_13"
         android:layout_marginBottom="@dimen/dp_15"
         android:text=""
         android:textColor="@color/black_444"
-        android:textSize="@dimen/dp_16"
+        android:textSize="@dimen/dp_14"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/tv_title"

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

@@ -123,6 +123,7 @@
         android:background="@drawable/shape_ff76a6_to_ff3c81_14dp"
         android:gravity="center"
         android:text="搜索"
+        android:includeFontPadding="false"
         android:textSize="@dimen/sp_14"
         android:textColor="@color/white"
         app:layout_constraintBottom_toBottomOf="@+id/iv_search"

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

@@ -39,7 +39,7 @@
                 android:layout_height="@dimen/dp_52"
                 android:gravity="center"
                 android:text="男"
-                android:textColor="@color/color_fe2451"
+                android:textColor="@color/color_333333"
                 android:textSize="@dimen/sp_18"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/view_line1" />
@@ -57,7 +57,7 @@
                 android:layout_height="@dimen/dp_52"
                 android:gravity="center"
                 android:text="女"
-                android:textColor="@color/color_fe2451"
+                android:textColor="@color/color_333333"
                 android:textSize="@dimen/sp_18"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/view_line2" />

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

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="79dp"
     android:paddingStart="12dp"
-    android:paddingEnd="12dp">
+    android:paddingEnd="14dp">
 
 
     <com.cooleshow.base.widgets.QMUIRadiusImageView
@@ -149,7 +149,6 @@
         android:id="@+id/iv_play"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="14dp"
         android:src="@drawable/jg_icon_music_sheet_play"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent"

rong_im/common_im_ui/src/main/res/layout/activity_chat_group_setting.xml

@@ -250,7 +250,7 @@
                 android:drawableEnd="@drawable/switch_selector"
                 android:paddingStart="@dimen/dp_15"
                 android:paddingEnd="@dimen/dp_15"
-                android:text="消息接收但不提醒"
+                android:text="群消息接收但不提醒"
                 android:textColor="@color/color_1a1a1a"
                 android:textSize="@dimen/dp_16" />
 

student/src/main/res/layout/activity_check_modify_phonenum.xml

@@ -25,8 +25,9 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_48"
             android:background="@null"
+            android:theme="@style/MyEditText"
             android:gravity="center_vertical"
-            android:hint="请输当前手机号"
+            android:hint="请输入当前手机号"
             android:inputType="phone"
             android:maxLength="11"
             android:paddingLeft="14dp"
@@ -47,6 +48,7 @@
             app:layout_constraintTop_toBottomOf="@+id/et_phone_num" />
 
         <EditText
+            android:theme="@style/MyEditText"
             android:textCursorDrawable="@drawable/shape_2dc7aa_1dp"
             android:id="@+id/et_password"
             android:layout_width="match_parent"

student/src/main/res/layout/activity_feedback.xml

@@ -27,6 +27,7 @@
             android:gravity="left"
             android:hint="请输入您的反馈意见"
             android:maxLength="500"
+            android:theme="@style/MyEditText"
             android:paddingLeft="12dp"
             android:textCursorDrawable="@drawable/shape_2dc7aa_1dp"
             android:paddingTop="10dp"

student/src/main/res/layout/activity_modify_nickname.xml

@@ -28,6 +28,7 @@
             android:paddingLeft="14dp"
             android:textCursorDrawable="@drawable/shape_2dc7aa_1dp"
             android:paddingRight="30dp"
+            android:theme="@style/MyEditText"
             android:textColor="@color/color_1a1a1a"
             android:textColorHint="@color/color_aaaaaa"
             android:textSize="@dimen/sp_16" />

student/src/main/res/layout/activity_modify_password.xml

@@ -30,6 +30,7 @@
         android:background="@drawable/bg_white_10dp">
 
         <EditText
+            android:theme="@style/MyEditText"
             android:textCursorDrawable="@drawable/shape_2dc7aa_1dp"
             android:id="@+id/et_password"
             android:layout_width="match_parent"
@@ -41,7 +42,7 @@
             android:paddingLeft="14dp"
             android:paddingRight="14dp"
             android:textColor="@color/color_1a1a1a"
-            android:textColorHint="@color/color_999999"
+            android:textColorHint="@color/color_aaaaaa"
             android:textSize="@dimen/sp_16"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -56,6 +57,7 @@
             app:layout_constraintTop_toBottomOf="@+id/et_password" />
 
         <EditText
+            android:theme="@style/MyEditText"
             android:id="@+id/et_auth_code"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_48"
@@ -68,7 +70,7 @@
             android:paddingLeft="14dp"
             android:paddingRight="14dp"
             android:textColor="@color/color_1a1a1a"
-            android:textColorHint="@color/color_999999"
+            android:textColorHint="@color/color_aaaaaa"
             android:textSize="@dimen/sp_16"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/view_line" />

student/src/main/res/layout/activity_modify_phonenum.xml

@@ -20,6 +20,7 @@
         android:background="@drawable/bg_white_10dp">
 
         <EditText
+            android:theme="@style/MyEditText"
             android:textCursorDrawable="@drawable/shape_2dc7aa_1dp"
             android:id="@+id/et_phone_num"
             android:layout_width="match_parent"
@@ -47,6 +48,7 @@
             app:layout_constraintTop_toBottomOf="@+id/et_phone_num" />
 
         <EditText
+            android:theme="@style/MyEditText"
             android:textCursorDrawable="@drawable/shape_2dc7aa_1dp"
             android:id="@+id/et_auth_code"
             android:layout_width="match_parent"

teacher/src/main/java/com/cooleshow/teacher/ui/main/MainActivity.java

@@ -17,6 +17,7 @@ import com.common.im.ui.MessageFragment;
 import com.cooleshow.base.bean.RouteBean;
 import com.cooleshow.base.common.BaseApplication;
 import com.cooleshow.base.constanst.LoginStatusConstants;
+import com.cooleshow.base.constanst.StyleConfig;
 import com.cooleshow.base.event.LoginStatusEvent;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
@@ -116,6 +117,7 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        StyleConfig.setTheme(this);//IM模块是通用的,需要此样设置是适配style修改
         super.onCreate(savedInstanceState);
         QMUIStatusBarHelper.setStatusBarLightMode(this);
         EventBus.getDefault().register(this);

teacher/src/main/res/layout/activity_check_modify_phonenum.xml

@@ -24,7 +24,7 @@
             android:layout_height="@dimen/dp_48"
             android:background="@null"
             android:gravity="center_vertical"
-            android:hint="请输当前手机号"
+            android:hint="请输入当前手机号"
             android:inputType="phone"
             android:paddingLeft="14dp"
             android:paddingRight="14dp"

usercenter/src/main/res/layout/ac_sign_out_account_layout.xml

@@ -224,6 +224,7 @@
         android:inputType="number"
         android:maxLength="6"
         android:maxLines="1"
+        android:theme="@style/MyEditText"
         android:paddingStart="12dp"
         android:textCursorDrawable="@drawable/shape_sign_out_edit_drawable"
         android:textColor="@color/color_333333"