修改部分样式问题和加强部分位置机构老师判断逻辑

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke android:color="#dedede" android:width="1dp"/>
+    <corners android:radius="10dp"/>
+</shape>

BaseLibrary/src/main/res/layout/dialog_common_confirm_layout2.xml

@@ -33,8 +33,8 @@
             android:id="@+id/tv_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="14dp"
-            android:layout_marginEnd="14dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
             android:gravity="center"
             android:paddingTop="20dp"
             android:lineSpacingMultiplier="1.1"
@@ -51,7 +51,7 @@
             android:id="@+id/tv_cancel"
             android:layout_width="0dp"
             android:layout_height="40dp"
-            android:layout_marginStart="15dp"
+            android:layout_marginStart="20dp"
             android:layout_marginEnd="8dp"
             android:background="@drawable/shape_border_dbdbdb_1dp_22dp"
             android:gravity="center"
@@ -67,7 +67,7 @@
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_marginStart="8dp"
-            android:layout_marginEnd="15dp"
+            android:layout_marginEnd="20dp"
             android:background="@drawable/shape_2dc7aa_to_2dc7aa_22dp"
             android:gravity="center"
             android:text="确认"

student/src/main/java/com/cooleshow/student/ui/web/HtmlActivity.java

@@ -52,6 +52,7 @@ import com.alipay.sdk.app.PayTask;
 import com.cooleshow.base.BuildConfig;
 import com.cooleshow.base.bean.DownloadTaskBean;
 import com.cooleshow.base.bean.WxPayResult;
+import com.cooleshow.base.common.BaseApplication;
 import com.cooleshow.base.common.WebApi;
 import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.constanst.Constants;
@@ -419,7 +420,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
             ToastUtil.getInstance().showShort("文件异常");
             return;
         }
-        String[] permissions = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.READ_EXTERNAL_STORAGE};
+        String[] permissions = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE};
         PermissionTipHelper.getInstance().showTipDialog(this, permissions);
         new RxPermissions(this)
                 .request(permissions)
@@ -962,8 +963,9 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
         }
         DownloadFileTipDialog dialog = new DownloadFileTipDialog(this);
         dialog.show();
-        dialog.setData(title,content);
-        dialog.handleTitleBg(UserHelper.isTenantAccount());
+        dialog.setData(title, content);
+        boolean teacherClient = BaseApplication.Companion.isTeacherClient();
+        dialog.handleTitleBg(UserHelper.isTenantAccount() && !teacherClient);
         dialog.setOnEventListener(new DownloadFileTipDialog.OnEventListener() {
             @Override
             public void onConfirmClick() {

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

@@ -13,6 +13,7 @@ import android.view.View;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.cooleshow.base.common.BaseApplication;
 import com.cooleshow.base.common.BaseConstant;
 import com.cooleshow.base.constanst.StyleConfig;
 import com.cooleshow.base.router.RouterPath;
@@ -88,7 +89,9 @@ public class SignOutAccountActivity extends BaseMVPActivity<AcSignOutAccountLayo
     protected void initView() {
         initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "注销账号");
         boolean tenantAccount = UserHelper.isTenantAccount();
-        viewBinding.ivTip.setImageResource(tenantAccount ? R.drawable.icon_exclamation_mark_tip : R.drawable.icon_exclamation_mark_tip2);
+        boolean teacherClient = BaseApplication.Companion.isTeacherClient();
+        //老师端不区分机构账号
+        viewBinding.ivTip.setImageResource(!teacherClient && tenantAccount ? R.drawable.icon_exclamation_mark_tip : R.drawable.icon_exclamation_mark_tip2);
     }
 
     @Override

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

@@ -210,11 +210,11 @@
     <View
         android:id="@+id/view_verify_code_bg"
         android:layout_width="0dp"
-        android:layout_height="54dp"
+        android:layout_height="46dp"
         android:layout_marginStart="12dp"
         android:layout_marginEnd="12dp"
         android:layout_marginBottom="30dp"
-        android:background="@drawable/shape_6dp_border_eaeaea_1dp"
+        android:background="@drawable/shape_10dp_border_dedede_1dp"
         app:layout_constraintBottom_toTopOf="@+id/tv_confirm"
         app:layout_constraintLeft_toLeftOf="@+id/view_bg"
         app:layout_constraintRight_toRightOf="@+id/view_bg" />
@@ -254,7 +254,7 @@
         android:paddingStart="12dp"
         android:textCursorDrawable="@drawable/shape_sign_out_edit_drawable"
         android:textColor="@color/color_333333"
-        android:textColorHint="@color/color_999999"
+        android:textColorHint="@color/color_aaaaaa"
         android:textSize="@dimen/sp_16"
         app:layout_constraintBottom_toBottomOf="@+id/view_verify_code_bg"
         app:layout_constraintLeft_toLeftOf="@+id/view_verify_code_bg"