增加下载pdf弹窗样式

BaseLibrary/src/main/java/com/cooleshow/base/widgets/dialog/DownloadFileTipDialog.java

@@ -26,6 +26,7 @@ public class DownloadFileTipDialog extends BaseFullDialog implements View.OnClic
     private TextView mTvCopy;
     private TextView mTvTitle;
     private View mViewTitleBg;
+    private boolean isOtherStyle = false;
 
 
     public DownloadFileTipDialog(@NonNull Context context) {
@@ -35,7 +36,13 @@ public class DownloadFileTipDialog extends BaseFullDialog implements View.OnClic
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.dialog_download_file_tip_layout);
+        if (isOtherStyle) {
+            //机构端
+            setContentView(R.layout.dialog_download_file_tip_layout2);
+        } else {
+            //老师和学生
+            setContentView(R.layout.dialog_download_file_tip_layout);
+        }
         initParams();
         mTvConfirm = findViewById(R.id.tv_confirm);
         mTvCancel = findViewById(R.id.tv_cancel);
@@ -78,6 +85,10 @@ public class DownloadFileTipDialog extends BaseFullDialog implements View.OnClic
     private void initData() {
     }
 
+    public void setOtherStyle(boolean otherStyle) {
+        isOtherStyle = otherStyle;
+    }
+
     public void setData(String title, String text) {
         if (mTvTip != null) {
             mTvTip.setText(text);

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/white" />
+    <corners
+        android:radius="12dp" />
+</shape>

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

@@ -11,10 +11,11 @@
         android:layout_marginEnd="@dimen/dp_32"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/bg_white_20dp"
+        android:background="@drawable/bg_white_12dp"
         android:paddingBottom="20dp">
 
         <View
+            android:visibility="gone"
             android:id="@+id/view_title_bg"
             android:layout_width="match_parent"
             android:layout_height="49dp"
@@ -27,12 +28,11 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:paddingTop="20dp"
+            android:layout_marginTop="15dp"
+            android:paddingStart="20dp"
             android:textColor="@color/color_1a1a1a"
-            android:textSize="@dimen/sp_18"
-            android:textStyle="bold"
+            android:textSize="@dimen/sp_16"
             app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="我是标题" />
 
@@ -42,7 +42,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
             android:gravity="left"
-            android:paddingTop="20dp"
+            android:paddingTop="15dp"
             android:textColor="@color/color_666666"
             android:textSize="@dimen/sp_16"
             android:lineSpacingMultiplier="1.2"
@@ -59,7 +59,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:textColor="?attr/klx_main_color"
+            android:textColor="@color/color_2dc7aa"
             android:textSize="@dimen/sp_16"
             android:text="复制"
             android:paddingStart="5dp"
@@ -91,7 +91,7 @@
             android:layout_height="40dp"
             android:layout_marginStart="8dp"
             android:layout_marginEnd="20dp"
-            android:background="@drawable/shape_2dc7aa_22dp_dynamic"
+            android:background="@drawable/shape_2dc7aa_22dp"
             android:gravity="center"
             android:text="打开文件"
             android:textColor="@color/white"
@@ -101,12 +101,13 @@
             app:layout_constraintTop_toTopOf="@+id/tv_cancel" />
 
         <ImageView
+            android:layout_marginEnd="20dp"
             android:id="@+id/iv_close"
-            app:layout_constraintTop_toTopOf="parent"
+            android:padding="3dp"
             app:layout_constraintRight_toRightOf="parent"
-            android:layout_marginEnd="20dp"
-            android:layout_marginTop="24dp"
-            android:src="@drawable/icon_close_black"
+            app:layout_constraintBottom_toBottomOf="@+id/tv_title"
+            app:layout_constraintTop_toTopOf="@+id/tv_title"
+            android:src="@drawable/icon_close_dialog"
             android:layout_width="18dp"
             android:layout_height="18dp"/>
     </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_marginStart="@dimen/dp_32"
+        android:layout_marginEnd="@dimen/dp_32"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_white_20dp"
+        android:paddingBottom="20dp">
+
+        <View
+            android:id="@+id/view_title_bg"
+            android:layout_width="match_parent"
+            android:layout_height="49dp"
+            android:background="@drawable/shape_defaff_to_white_20dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:paddingTop="20dp"
+            android:textColor="@color/color_1a1a1a"
+            android:textSize="@dimen/sp_18"
+            android:textStyle="bold"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="我是标题" />
+
+        <TextView
+            android:id="@+id/tv_content"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:gravity="left"
+            android:paddingTop="20dp"
+            android:textColor="@color/color_666666"
+            android:textSize="@dimen/sp_16"
+            android:lineSpacingMultiplier="1.2"
+            app:layout_constraintRight_toLeftOf="@+id/tv_copy"
+            app:layout_constraintLeft_toLeftOf="parent"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:includeFontPadding="false"
+            app:layout_constraintTop_toBottomOf="@+id/tv_title"
+            tools:text="文件已保存到以下地址 C:/文件/dei/dei/dei/dei/dei/dei/dei/dei" />
+
+        <TextView
+            android:id="@+id/tv_copy"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textColor="?attr/klx_main_color"
+            android:textSize="@dimen/sp_16"
+            android:text="复制"
+            android:paddingStart="5dp"
+            android:paddingEnd="25dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tv_content"
+            app:layout_constraintRight_toRightOf="parent" />
+
+
+
+        <TextView
+            android:layout_marginTop="25dp"
+            android:id="@+id/tv_cancel"
+            android:layout_width="0dp"
+            android:layout_height="40dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="8dp"
+            android:background="@drawable/shape_border_dbdbdb_1dp_22dp"
+            android:gravity="center"
+            android:text="取消"
+            android:textColor="@color/color_666666"
+            android:textSize="@dimen/sp_16"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toLeftOf="@+id/tv_confirm"
+            app:layout_constraintTop_toBottomOf="@+id/tv_content" />
+
+        <TextView
+            android:id="@+id/tv_confirm"
+            android:layout_width="0dp"
+            android:layout_height="40dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="20dp"
+            android:background="@drawable/shape_2dc7aa_22dp_dynamic"
+            android:gravity="center"
+            android:text="打开文件"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_16"
+            app:layout_constraintLeft_toRightOf="@+id/tv_cancel"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/tv_cancel" />
+
+        <ImageView
+            android:id="@+id/iv_close"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            android:layout_marginEnd="20dp"
+            android:layout_marginTop="24dp"
+            android:src="@drawable/icon_close_black"
+            android:layout_width="18dp"
+            android:layout_height="18dp"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>

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

@@ -961,11 +961,13 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
         if (UiUtils.isFastClick()) {
             return;
         }
+        boolean teacherClient = BaseApplication.Companion.isTeacherClient();
+        //是否是学生机构端
+        boolean isTenantAndNotTeacher= UserHelper.isTenantAccount() && !teacherClient;
         DownloadFileTipDialog dialog = new DownloadFileTipDialog(this);
+        dialog.setOtherStyle(isTenantAndNotTeacher);
         dialog.show();
         dialog.setData(title, content);
-        boolean teacherClient = BaseApplication.Companion.isTeacherClient();
-        dialog.handleTitleBg(UserHelper.isTenantAccount() && !teacherClient);
         dialog.setOnEventListener(new DownloadFileTipDialog.OnEventListener() {
             @Override
             public void onConfirmClick() {