1.修改确定取消弹窗UI样式

baselib/src/main/java/com/yingyangfly/baselib/net/BaseNetWork.kt

@@ -19,9 +19,9 @@ fun <T> Any.initAPI(url: String, cla: Class<T>): T = BaseNetWork.initRetrofit(ur
 
 object BaseNetWork {
     private val timeUnit: TimeUnit = TimeUnit.SECONDS
-    private const val connectTimeOut: Long = 5
-    private const val readTimeOut: Long = 5
-    private const val writeTimeOut: Long = 5
+    private const val connectTimeOut: Long = 15
+    private const val readTimeOut: Long = 15
+    private const val writeTimeOut: Long = 15
 
     /**
      * 初始化Retrofit

baselib/src/main/java/com/yingyangfly/baselib/net/OkHttpHelper.kt

@@ -17,9 +17,9 @@ class OkHttpHelper private constructor() {
 
     lateinit var okHttpClient: OkHttpClient
     private val timeUnit: TimeUnit = TimeUnit.SECONDS
-    private val connectTimeOut: Long = 5
-    private val readTimeOut: Long = 5
-    private val writeTimeOut: Long = 5
+    private val connectTimeOut: Long = 15
+    private val readTimeOut: Long = 15
+    private val writeTimeOut: Long = 15
 
     init {
         initHttpClient()

baselib/src/main/res/drawable/bg_dialog_tip_left.xml

@@ -4,6 +4,6 @@
     <stroke
         android:width="@dimen/divider_1px"
         android:color="@color/color_FF054DFF" />
-    <corners android:radius="@dimen/divider_13px" />
+    <corners android:radius="@dimen/divider_34px" />
     <solid android:color="@android:color/white" />
 </shape>

baselib/src/main/res/drawable/bg_dialog_tip_right.xml

@@ -4,6 +4,6 @@
     <stroke
         android:width="@dimen/divider_1px"
         android:color="@color/color_FF054DFF" />
-    <corners android:radius="@dimen/divider_13px" />
+    <corners android:radius="@dimen/divider_34px" />
     <solid android:color="@color/color_FF054DFF" />
 </shape>

baselib/src/main/res/drawable/bg_dialog_tips_title.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/color_FF4A76FF" />
+    <corners android:radius="@dimen/divider_40px" />
+    <padding
+        android:bottom="@dimen/divider_13px"
+        android:left="@dimen/divider_58px"
+        android:right="@dimen/divider_58px"
+        android:top="@dimen/divider_13px" />
+</shape>

baselib/src/main/res/layout/dialog_message.xml

@@ -1,19 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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">
 
+    <com.google.android.material.card.MaterialCardView
+        android:layout_width="@dimen/divider_667px"
+        android:layout_height="@dimen/divider_435px"
+        android:layout_gravity="center"
+        android:layout_marginTop="@dimen/divider_8px"
+        android:theme="@style/Theme.MaterialComponents.NoActionBar"
+        app:cardCornerRadius="@dimen/divider_42px"
+        app:strokeColor="@color/color_FF1532A1"
+        app:strokeWidth="@dimen/divider_20px" />
+
     <com.google.android.material.card.MaterialCardView
         android:layout_width="@dimen/divider_667px"
         android:layout_height="@dimen/divider_427px"
+        android:layout_gravity="center"
         android:theme="@style/Theme.MaterialComponents.NoActionBar"
         app:cardBackgroundColor="@android:color/white"
         app:cardCornerRadius="@dimen/divider_42px"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:cardElevation="@dimen/divider_8px"
+        app:strokeColor="@color/color_FF4A76FF"
+        app:strokeWidth="@dimen/divider_20px">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -23,12 +33,13 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tvTitle"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/divider_48px"
+                android:background="@drawable/bg_dialog_tips_title"
                 android:gravity="center"
-                android:textColor="@color/color_FFF6A532"
-                android:textSize="@dimen/divider_42px"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/divider_38px"
                 android:textStyle="bold" />
 
             <androidx.appcompat.widget.AppCompatTextView
@@ -40,20 +51,20 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:textColor="@color/color_FF333333"
-                android:textSize="@dimen/divider_28px" />
+                android:textSize="@dimen/divider_32px" />
 
             <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btnConform"
-                android:layout_width="@dimen/divider_180px"
-                android:layout_height="@dimen/divider_59px"
+                android:layout_width="@dimen/divider_204px"
+                android:layout_height="@dimen/divider_68px"
                 android:layout_marginBottom="@dimen/divider_52px"
-                android:background="@drawable/bg_confirm_evaluation"
+                android:background="@drawable/bg_dialog_tip_right"
                 android:gravity="center"
                 android:text="@string/dialog_determine"
                 android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_24px" />
+                android:textSize="@dimen/divider_28px" />
 
         </LinearLayout>
     </com.google.android.material.card.MaterialCardView>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>

baselib/src/main/res/layout/dialog_tips.xml

@@ -1,84 +1,105 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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="match_parent"
     tools:ignore="ResourceName">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_gravity="center"
         android:layout_marginStart="@dimen/divider_264px"
         android:layout_marginTop="@dimen/divider_203px"
         android:layout_marginEnd="@dimen/divider_264px"
-        android:layout_marginBottom="@dimen/divider_203px"
-        android:background="@drawable/bg_dialog_base"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        android:layout_marginBottom="@dimen/divider_195px"
+        android:theme="@style/Theme.MaterialComponents.NoActionBar"
+        app:cardCornerRadius="@dimen/divider_42px"
+        app:strokeColor="@color/color_FF1532A1"
+        app:strokeWidth="@dimen/divider_20px" />
 
-        <TextView
-            android:id="@+id/tvTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/divider_71px"
-            android:textColor="@color/color_FFF6A532"
-            android:textSize="@dimen/divider_42px"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="恭喜您" />
+    <com.google.android.material.card.MaterialCardView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:layout_marginStart="@dimen/divider_264px"
+        android:layout_marginTop="@dimen/divider_203px"
+        android:layout_marginEnd="@dimen/divider_264px"
+        android:layout_marginBottom="@dimen/divider_203px"
+        android:theme="@style/Theme.MaterialComponents.NoActionBar"
+        app:cardBackgroundColor="@android:color/white"
+        app:cardCornerRadius="@dimen/divider_42px"
+        app:cardElevation="@dimen/divider_8px"
+        app:strokeColor="@color/color_FF4A76FF"
+        app:strokeWidth="@dimen/divider_20px">
 
-        <TextView
-            android:id="@+id/tvContent"
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginStart="@dimen/divider_65px"
-            android:layout_marginTop="@dimen/divider_29px"
-            android:layout_marginEnd="@dimen/divider_32px"
-            android:gravity="center"
-            android:textColor="@color/color_FF333333"
-            android:textSize="@dimen/divider_28px"
-            app:layout_constraintBottom_toTopOf="@+id/tvLeft"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvTitle"
-            tools:text="通知" />
+            android:layout_height="match_parent">
+
+            <TextView
+                android:id="@+id/tvTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/divider_71px"
+                android:background="@drawable/bg_dialog_tips_title"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/divider_38px"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="恭喜您" />
+
+            <TextView
+                android:id="@+id/tvContent"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_marginStart="@dimen/divider_65px"
+                android:layout_marginTop="@dimen/divider_29px"
+                android:layout_marginEnd="@dimen/divider_32px"
+                android:gravity="center"
+                android:textColor="@color/color_FF333333"
+                android:textSize="@dimen/divider_32px"
+                app:layout_constraintBottom_toTopOf="@+id/tvLeft"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tvTitle"
+                tools:text="通知" />
 
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/tvLeft"
-            android:layout_width="@dimen/divider_204px"
-            android:layout_height="@dimen/divider_59px"
-            android:layout_marginStart="@dimen/divider_92px"
-            android:layout_marginTop="@dimen/divider_72px"
-            android:layout_marginBottom="@dimen/divider_52px"
-            android:background="@drawable/bg_dialog_tip_left"
-            android:gravity="center"
-            android:textColor="@color/color_FF4D7EFF"
-            android:textSize="@dimen/divider_24px"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvContent"
-            tools:text="稍后再看" />
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/tvLeft"
+                android:layout_width="@dimen/divider_204px"
+                android:layout_height="@dimen/divider_68px"
+                android:layout_marginStart="@dimen/divider_92px"
+                android:layout_marginTop="@dimen/divider_72px"
+                android:layout_marginBottom="@dimen/divider_52px"
+                android:background="@drawable/bg_dialog_tip_left"
+                android:gravity="center"
+                android:textColor="@color/color_FF4D7EFF"
+                android:textSize="@dimen/divider_28px"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tvContent"
+                tools:text="稍后再看" />
 
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/tvRight"
-            android:layout_width="@dimen/divider_204px"
-            android:layout_height="@dimen/divider_59px"
-            android:layout_marginTop="@dimen/divider_72px"
-            android:layout_marginEnd="@dimen/divider_100px"
-            android:layout_marginBottom="@dimen/divider_52px"
-            android:background="@drawable/bg_dialog_tip_right"
-            android:gravity="center"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/divider_24px"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvContent"
-            tools:text="立即查看" />
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/tvRight"
+                android:layout_width="@dimen/divider_204px"
+                android:layout_height="@dimen/divider_68px"
+                android:layout_marginTop="@dimen/divider_72px"
+                android:layout_marginEnd="@dimen/divider_100px"
+                android:layout_marginBottom="@dimen/divider_52px"
+                android:background="@drawable/bg_dialog_tip_right"
+                android:gravity="center"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/divider_28px"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tvContent"
+                tools:text="立即查看" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
+    </com.google.android.material.card.MaterialCardView>
+</FrameLayout>

baselib/src/main/res/values/colors.xml

@@ -37,4 +37,5 @@
     <color name="color_FF81D7FF">#FF81D7FF</color>
     <color name="color_FF1AA1FF">#FF1AA1FF</color>
     <color name="color_FF92ADFF">#FF92ADFF</color>
+    <color name="color_FF1532A1">#FF1532A1</color>
 </resources>

baselib/src/main/res/values/dimens.xml

@@ -19,6 +19,7 @@
     <dimen name="divider_502px" tools:ignore="ResourceName">502px</dimen>
     <dimen name="divider_483px" tools:ignore="ResourceName">483px</dimen>
     <dimen name="divider_440px" tools:ignore="ResourceName">440px</dimen>
+    <dimen name="divider_435px" tools:ignore="ResourceName">435px</dimen>
     <dimen name="divider_432px" tools:ignore="ResourceName">432px</dimen>
     <dimen name="divider_430px" tools:ignore="ResourceName">430px</dimen>
     <dimen name="divider_427px" tools:ignore="ResourceName">427px</dimen>
@@ -60,6 +61,7 @@
     <dimen name="divider_218px" tools:ignore="ResourceName">218px</dimen>
     <dimen name="divider_214px" tools:ignore="ResourceName">214px</dimen>
     <dimen name="divider_213px" tools:ignore="ResourceName">213px</dimen>
+    <dimen name="divider_211px" tools:ignore="ResourceName">211px</dimen>
     <dimen name="divider_204px" tools:ignore="ResourceName">204px</dimen>
     <dimen name="divider_203px" tools:ignore="ResourceName">203px</dimen>
     <dimen name="divider_200px" tools:ignore="ResourceName">200px</dimen>

workbenches/src/main/res/layout/item_free_training_type.xml

@@ -13,7 +13,7 @@
     <LinearLayout
         android:layout_width="@dimen/divider_195px"
         android:layout_height="@dimen/divider_55px"
-        android:layout_marginTop="@dimen/divider_40px">
+        android:layout_marginBottom="@dimen/divider_40px">
 
         <TextView
             android:id="@+id/tvType"