修改部分样式问题

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

@@ -81,7 +81,7 @@ public class MineFragment extends BaseMVPFragment<FgMineLayoutBinding, MinePrese
         }
         mViewBinding.tvVipStatus.setText(vipTip);
 
-        String tip = "暂未开放";
+        String tip = "暂未开通";
         if (!TextUtils.isEmpty(data.getTenantAlbumEndTime())) {
             String s = DateUtil.date2Str(DateUtil.str2Date(data.getTenantAlbumEndTime()), "yyyy-MM-dd");
             tip = "至" + s;

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

@@ -134,6 +134,12 @@ public class PersonalSettingActivity extends BaseMVPActivity<JgActivityPersonalS
             finish();
             return;
         }
+
+        if(id == R.id.cs_sign_out_accout){
+            ARouter.getInstance().build(RouterPath.UserCenter.SIGN_OUT_ACCOUNT)
+                    .navigation();
+            return;
+        }
     }
 
     private TimePickerView pvTime;
@@ -361,6 +367,7 @@ public class PersonalSettingActivity extends BaseMVPActivity<JgActivityPersonalS
         viewBinding.clBirthday.setOnClickListener(this);
         viewBinding.clScore.setOnClickListener(this);
         viewBinding.tvLogout.setOnClickListener(this);
+        viewBinding.csSignOutAccout.setOnClickListener(this);
     }
 
     @Override

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

@@ -329,7 +329,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:includeFontPadding="false"
-                android:paddingStart="24dp"
+                android:paddingStart="15dp"
                 android:paddingTop="15dp"
                 android:text="常用功能"
                 android:textColor="@color/color_333333"
@@ -527,7 +527,7 @@
                 android:id="@+id/tv_privacy_policy"
                 android:layout_width="match_parent"
                 android:layout_height="58dp"
-                android:drawableStart="@drawable/jg_user_protocol"
+                android:drawableStart="@drawable/jg_privacy_policy"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
                 android:text="隐私政策"

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

@@ -352,12 +352,12 @@
                         app:layout_constraintTop_toTopOf="parent" />
 
                     <View
-                        android:visibility="gone"
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
                         android:layout_marginLeft="11dp"
                         android:layout_marginRight="9dp"
                         android:background="@color/color_f2f2f2"
+                        android:visibility="gone"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintLeft_toLeftOf="parent" />
                 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -365,9 +365,9 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/cl_certification"
-                    android:visibility="gone"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_55"
+                    android:visibility="gone"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/cl_modify_psd">
 
@@ -405,6 +405,46 @@
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:id="@+id/cs_sign_out_accout"
+                    android:layout_height="55dp"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/cl_certification">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:layout_marginLeft="11dp"
+                        android:layout_marginRight="9dp"
+                        android:background="@color/color_f2f2f2"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintLeft_toLeftOf="parent" />
+
+                    <TextView
+                        android:id="@+id/tv_sign_out_account"
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_marginLeft="12dp"
+                        android:gravity="center_vertical"
+                        android:text="注销账号"
+                        android:textColor="@color/color_1a1a1a"
+                        android:textSize="@dimen/sp_16"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+
+                    <ImageView
+                        android:layout_width="@dimen/dp_6"
+                        android:layout_height="@dimen/dp_11"
+                        android:layout_marginRight="15dp"
+                        android:background="@drawable/icon_arrow_right"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <TextView

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

@@ -2,8 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/color_f6f8f9">
+    android:layout_height="match_parent">
 
 
     <LinearLayout

usercenter/src/main/java/com/cooleshow/usercenter/ui/activity/setting/SignOutAccountActivity.java

@@ -9,6 +9,7 @@ import android.view.View;
 
 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.KeyboardUtils;
@@ -57,6 +58,7 @@ public class SignOutAccountActivity extends BaseMVPActivity<AcSignOutAccountLayo
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        StyleConfig.setTheme(this);
         super.onCreate(savedInstanceState);
         QMUIStatusBarHelper.setStatusBarLightMode(this);
         KeyboardUtils.fixAndroidBug5497(this);

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

@@ -200,7 +200,7 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:text="获取验证码"
-        android:textColor="@color/color_ff2dc7aa"
+        android:textColor="?attr/klx_main_color"
         android:textSize="@dimen/sp_14"
         app:layout_constraintBottom_toBottomOf="@+id/view_verify_code_bg"
         app:layout_constraintRight_toRightOf="@+id/view_verify_code_bg"
@@ -210,7 +210,7 @@
         android:id="@+id/view_line"
         android:layout_width="1dp"
         android:layout_height="18dp"
-        android:background="@color/color_ff2dc7aa"
+        android:background="?attr/klx_main_color"
         app:layout_constraintBottom_toBottomOf="@+id/tv_send_verify_code"
         app:layout_constraintRight_toLeftOf="@+id/tv_send_verify_code"
         app:layout_constraintTop_toTopOf="@+id/tv_send_verify_code" />
@@ -240,7 +240,7 @@
         android:layout_marginStart="25dp"
         android:layout_marginEnd="25dp"
         android:layout_marginBottom="23dp"
-        android:background="@drawable/shape_login_bt_bg"
+        android:background="?attr/klx_main_bt_background"
         android:gravity="center"
         android:text="注销账号"
         android:textColor="@color/white"