修改学生端部分设置页面样式兼容机构端

BaseLibrary/src/main/java/com/cooleshow/base/constanst/StyleConfig.java

@@ -43,4 +43,13 @@ public class StyleConfig {
         tyar.recycle();
         return drawable;
     }
+
+    public static Drawable getImgCheck(Context context) {
+        TypedArray tyar = context.obtainStyledAttributes(new int[]{
+                R.attr.klx_img_check
+        });
+        Drawable drawable = tyar.getDrawable(0);
+        tyar.recycle();
+        return drawable;
+    }
 }

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

@@ -61,5 +61,7 @@
     </declare-styleable>
 
     <attr name="klx_main_color" format="color" />
+    <attr name="klx_main_color2" format="color" />
     <attr name="klx_main_bt_background" format="reference" />
+    <attr name="klx_img_check" format="reference" />
 </resources>

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

@@ -496,11 +496,15 @@
 
     <style name="Student_NORMAL_STYLE" parent="AppTheme">
         <item name="klx_main_color">@color/color_2dc7aa</item>
+        <item name="klx_main_color2">@color/color_01c0b5</item>
+        <item name="klx_img_check">@drawable/icon_check_select</item>
         <item name="klx_main_bt_background">@drawable/shape_2dc7aa_39dp</item>
     </style>
 
     <style name="Student_OTHER_STYLE" parent="AppTheme">
-        <item name="klx_main_color">#FE2451</item>
+        <item name="klx_main_color">@color/color_fe2451</item>
+        <item name="klx_main_color2">@color/color_fe2451</item>
+        <item name="klx_img_check">@drawable/icon_img_check</item>
         <item name="klx_main_bt_background">@drawable/shape_fe2451_39dp</item>
     </style>
 </resources>

institution/src/main/java/com/cooleshow/institution/stu/ui/setting/PersonalSettingActivity.java

@@ -157,7 +157,7 @@ public class PersonalSettingActivity extends BaseMVPActivity<JgActivityPersonalS
             presenter.submitSetDetail(jsonObject.toString());
         }).setRangDate(startDate, endDate)
                 .setDate(endDate)
-                .setLayoutRes(com.cooleshow.base.R.layout.pickerview_default_layout, new CustomListener() {
+                .setLayoutRes(R.layout.pickerview_default_layout, new CustomListener() {
                     @Override
                     public void customLayout(View v) {
                         //自定义布局中的控件初始化及事件处理

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

@@ -88,7 +88,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="12dp"
-                        android:text="昵称"
+                        android:text="姓名"
                         android:textColor="@color/color_1a1a1a"
                         android:textSize="@dimen/sp_16"
                         app:layout_constraintBottom_toBottomOf="parent"
@@ -176,7 +176,7 @@
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cl_phone"
+                    android:id="@+id/cl_score"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_55"
                     app:layout_constraintLeft_toLeftOf="parent"
@@ -186,7 +186,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="12dp"
-                        android:text="手机号"
+                        android:text="声部"
                         android:textColor="@color/color_1a1a1a"
                         android:textSize="@dimen/sp_16"
                         app:layout_constraintBottom_toBottomOf="parent"
@@ -194,7 +194,7 @@
                         app:layout_constraintTop_toTopOf="parent" />
 
                     <TextView
-                        android:id="@+id/tv_phone"
+                        android:id="@+id/tv_score"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginRight="28dp"
@@ -230,13 +230,13 @@
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_55"
                     app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/cl_phone">
+                    app:layout_constraintTop_toBottomOf="@+id/cl_score">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="12dp"
-                        android:text="出生日期"
+                        android:text="出生年份"
                         android:textColor="@color/color_1a1a1a"
                         android:textSize="@dimen/sp_16"
                         app:layout_constraintBottom_toBottomOf="parent"
@@ -275,7 +275,7 @@
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cl_score"
+                    android:id="@+id/cl_phone"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_55"
                     app:layout_constraintLeft_toLeftOf="parent"
@@ -285,7 +285,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="12dp"
-                        android:text="声部"
+                        android:text="手机号"
                         android:textColor="@color/color_1a1a1a"
                         android:textSize="@dimen/sp_16"
                         app:layout_constraintBottom_toBottomOf="parent"
@@ -293,7 +293,7 @@
                         app:layout_constraintTop_toTopOf="parent" />
 
                     <TextView
-                        android:id="@+id/tv_score"
+                        android:id="@+id/tv_phone"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginRight="28dp"
@@ -323,12 +323,13 @@
                         app:layout_constraintLeft_toLeftOf="parent" />
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
+
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/cl_modify_psd"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_55"
                     app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/cl_score">
+                    app:layout_constraintTop_toBottomOf="@+id/cl_phone">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -341,7 +342,6 @@
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-
                     <ImageView
                         android:layout_width="@dimen/dp_6"
                         android:layout_height="@dimen/dp_11"
@@ -352,6 +352,7 @@
                         app:layout_constraintTop_toTopOf="parent" />
 
                     <View
+                        android:visibility="gone"
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
                         android:layout_marginLeft="11dp"
@@ -364,6 +365,7 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/cl_certification"
+                    android:visibility="gone"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_55"
                     app:layout_constraintLeft_toLeftOf="parent"
@@ -403,11 +405,6 @@
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="10dp"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/cl_certification" />
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <TextView

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

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_white_top_10dp"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp">
+
+
+        <TextView
+            android:id="@+id/tv_cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="17dp"
+            android:text="取消"
+            android:textColor="@color/color_999999"
+            android:textSize="@dimen/dp_16" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text=""
+            android:textColor="@color/color_1a1a1a"
+            android:textSize="18dp" />
+
+        <TextView
+            android:id="@+id/tv_finish"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="17dp"
+            android:padding="8dp"
+            android:text="确定"
+            android:textColor="@color/color_fe2451"
+            android:textSize="@dimen/dp_16" />
+
+    </RelativeLayout>
+
+    <View style="@style/line_style" />
+    <!--此部分需要完整复制过去，删减或者更改ID会导致初始化找不到内容而报空-->
+    <LinearLayout
+        android:id="@+id/timepicker"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_200"
+        android:background="@android:color/white"
+        android:gravity="center"
+        android:minHeight="150dp"
+        android:orientation="horizontal">
+
+        <com.contrarywind.view.WheelView
+            android:id="@+id/year"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
+        <com.contrarywind.view.WheelView
+
+            android:id="@+id/month"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1.1" />
+
+        <com.contrarywind.view.WheelView
+            android:id="@+id/day"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1.1" />
+
+        <com.contrarywind.view.WheelView
+            android:id="@+id/hour"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1.1" />
+
+        <com.contrarywind.view.WheelView
+            android:id="@+id/min"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1.1" />
+
+        <com.contrarywind.view.WheelView
+            android:id="@+id/second"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1.1" />
+    </LinearLayout>
+
+
+</LinearLayout>

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

@@ -39,7 +39,7 @@
                 android:layout_height="@dimen/dp_52"
                 android:gravity="center"
                 android:text="男"
-                android:textColor="@color/color_2dc7aa"
+                android:textColor="@color/color_fe2451"
                 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_2dc7aa"
+                android:textColor="@color/color_fe2451"
                 android:textSize="@dimen/sp_18"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/view_line2" />

student/src/main/java/com/cooleshow/student/adapter/TeachableInstrumentItemAdapter.java

@@ -7,6 +7,7 @@ import android.widget.TextView;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
 import com.cooleshow.base.bean.TeachableInstrumentBean;
+import com.cooleshow.base.constanst.StyleConfig;
 import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.student.R;
@@ -36,7 +37,7 @@ public class TeachableInstrumentItemAdapter extends BaseQuickAdapter<TeachableIn
         TextView tv_name = helper.getView(R.id.tv_name);
         GlideUtils.INSTANCE.loadImage(getContext(), item.img, iv_pic);
         if (item.isSelect) {
-            im_check.setBackgroundResource(R.drawable.icon_check_select);
+            im_check.setImageDrawable(StyleConfig.getImgCheck(getContext()));
         } else {
             im_check.setBackgroundResource(R.drawable.icon_check_normal);
         }

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

@@ -251,7 +251,7 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
     }
 
     private void setStyleConfig() {
-        StyleConfig.isStudentStyle = false;
+        StyleConfig.isStudentStyle = true;
     }
 
     /**

student/src/main/java/com/cooleshow/student/ui/mine/CheckModifyPhoneNumActivity.java

@@ -9,6 +9,7 @@ import androidx.annotation.Nullable;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.cooleshow.base.constanst.StyleConfig;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtil;
@@ -51,6 +52,7 @@ public class CheckModifyPhoneNumActivity extends BaseMVPActivity<ActivityCheckMo
     }
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        StyleConfig.setTheme(this);
         super.onCreate(savedInstanceState);
         StatusBarUtil.setStatusBarDarkTheme(this, true);
     }

student/src/main/java/com/cooleshow/student/ui/mine/ModifyPasswordActivity.java

@@ -13,6 +13,7 @@ import androidx.annotation.Nullable;
 import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.cooleshow.base.constanst.StyleConfig;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtil;
@@ -75,6 +76,7 @@ public class ModifyPasswordActivity extends BaseMVPActivity<ActivityModifyPasswo
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        StyleConfig.setTheme(this);
         super.onCreate(savedInstanceState);
         StatusBarUtil.setStatusBarDarkTheme(this, true);
     }

student/src/main/java/com/cooleshow/student/ui/mine/ModifyPhoneNumActivity.java

@@ -13,6 +13,7 @@ import androidx.annotation.Nullable;
 import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.cooleshow.base.constanst.StyleConfig;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtil;
@@ -77,6 +78,7 @@ public class ModifyPhoneNumActivity extends BaseMVPActivity<ActivityModifyPhonen
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        StyleConfig.setTheme(this);
         super.onCreate(savedInstanceState);
         StatusBarUtil.setStatusBarDarkTheme(this, true);
     }

student/src/main/java/com/cooleshow/student/ui/mine/TeachableInstrumentActivity.java

@@ -12,6 +12,7 @@ import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.bean.TeachableInstrumentBean;
+import com.cooleshow.base.constanst.StyleConfig;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtil;
@@ -109,6 +110,7 @@ public class TeachableInstrumentActivity extends BaseMVPActivity<ActivityTeachab
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        StyleConfig.setTheme(this);
         super.onCreate(savedInstanceState);
         StatusBarUtil.setStatusBarDarkTheme(this, true);
     }

student/src/main/res/drawable/mark_2dc7aa_3radius.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/color_2dc7aa" />
+    <solid android:color="?attr/klx_main_color" />
     <size
         android:width="@dimen/dp_3"
         android:height="@dimen/dp_16" />

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

@@ -71,7 +71,7 @@
         android:layout_marginTop="20dp"
         android:layout_marginRight="28dp"
         android:layout_marginBottom="48dp"
-        android:background="@drawable/shape_course_status_ing"
+        android:background="?attr/klx_main_bt_background"
         android:gravity="center"
         android:text="确定"
         android:textColor="@color/white"

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

@@ -77,7 +77,7 @@
             android:layout_marginRight="12dp"
             android:gravity="center"
             android:text="获取验证码"
-            android:textColor="@color/color_01c0b5"
+            android:textColor="?attr/klx_main_color2"
             android:textSize="@dimen/sp_14"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/view_line" />
@@ -92,7 +92,7 @@
         android:layout_marginTop="20dp"
         android:layout_marginRight="28dp"
         android:layout_marginBottom="48dp"
-        android:background="@drawable/shape_course_status_ing"
+        android:background="?attr/klx_main_bt_background"
         android:gravity="center"
         android:text="确定"
         android:textColor="@color/white"

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

@@ -68,7 +68,7 @@
             android:gravity="center"
             android:text="获取验证码"
             android:textSize="@dimen/sp_14"
-            android:textColor="@color/color_01c0b5"
+            android:textColor="?attr/klx_main_color2"
             app:layout_constraintTop_toBottomOf="@+id/view_line"
             app:layout_constraintRight_toRightOf="parent"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
@@ -82,7 +82,7 @@
         android:layout_marginTop="20dp"
         android:layout_marginRight="28dp"
         android:layout_marginBottom="48dp"
-        android:background="@drawable/shape_course_status_ing"
+        android:background="?attr/klx_main_bt_background"
         android:gravity="center"
         android:text="确定"
         android:textColor="@color/white"

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

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/color_f6f8f9">
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -46,7 +45,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="11dp"
             android:layout_marginRight="10dp"
             android:layout_marginBottom="119dp"
             android:nestedScrollingEnabled="false"
@@ -62,7 +61,7 @@
         android:layout_marginLeft="27dp"
         android:layout_marginRight="27dp"
         android:layout_marginBottom="48dp"
-        android:background="@drawable/shape_course_status_ing"
+        android:background="?attr/klx_main_bt_background"
         android:gravity="center"
         android:text="确认"
         android:textColor="@color/white"

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

@@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
+    android:paddingTop="5dp"
     android:layout_height="wrap_content">