Home Explore Help
Sign In
mgtech
/
BaseLibrary
15
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

CustomDialog.java 修改

niusongtao@dl-cg.com 5 years ago
parent
a46d8692a7
commit
6e9452324c
3 changed files with 13 additions and 7 deletions
Split View Show Diff Stats
  1. 1 3
      base_library/build.gradle
  2. 4 0
      base_library/src/main/java/com/mgtech/base_library/util/CustomDialog.java
  3. 8 4
      base_library/src/main/res/layout/dialog_update.xml

+ 1 - 3
base_library/build.gradle
View File 

@@ -126,9 +126,7 @@ dependencies {
 
     api 'com.aliyun.dpa:oss-android-sdk:+'
 
 
     api 'com.airbnb.android:lottie:3.5.0'
 
-
 
-    api 'org.jsoup:jsoup:1.13.1'
 
-
 
+    
     testImplementation lib.junit
 
     androidTestImplementation lib.runner
 
     androidTestImplementation lib.espresso

+ 4 - 0
base_library/src/main/java/com/mgtech/base_library/util/CustomDialog.java
View File 

@@ -6,6 +6,7 @@ import android.content.Context;
 
 import android.content.DialogInterface;
 
 import android.graphics.drawable.ColorDrawable;
 
 import android.text.Html;
 
+import android.text.method.ScrollingMovementMethod;
 
 import android.view.LayoutInflater;
 
 import android.view.View;
 
 import android.widget.LinearLayout;
 
@@ -182,6 +183,7 @@ public class CustomDialog extends Dialog {
 
             }
 
             // set the content message
 
             if (message != null) {
 
+                ((TextView) contentView.findViewById(R.id.dialog_message)).setMovementMethod(ScrollingMovementMethod.getInstance());
 
                 if (message.startsWith("<html>"))
 
                     ((TextView) contentView.findViewById(R.id.dialog_message)).setText(Html.fromHtml(message));
 
                 else
 
@@ -197,6 +199,8 @@ public class CustomDialog extends Dialog {
 
 //            }
 
             dialog.setContentView(contentView,new LinearLayout.LayoutParams(
 
                     LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
 
+            dialog.setCancelable(false);
 
+            dialog.setCanceledOnTouchOutside(false);
 
             return dialog;
 
         }
 
     }

+ 8 - 4
base_library/src/main/res/layout/dialog_update.xml
View File 

@@ -12,13 +12,14 @@
 
         android:layout_marginStart="@dimen/dp_40"
 
         android:layout_marginTop="@dimen/dp_50"
 
         android:layout_marginEnd="@dimen/dp_40"
 
-        app:layout_constraintDimensionRatio="284:284"
 
         app:layout_constraintEnd_toEndOf="parent"
 
         app:layout_constraintStart_toStartOf="parent"
 
         app:layout_constraintTop_toTopOf="parent"
 
+        app:layout_constraintBottom_toBottomOf="@id/dialog_negative"
 
         app:stv_solid="@color/white"
 
         app:stv_corner="@dimen/dp_20" />
 
 
+
 
     <ImageView
 
         android:id="@+id/dialog_update_img"
 
         android:layout_width="wrap_content"
 
@@ -52,6 +53,8 @@
 
         android:layout_marginTop="@dimen/dp_15"
 
         android:layout_marginEnd="@dimen/dp_20"
 
         android:gravity="center"
 
+        android:scrollbars="vertical"
 
+        android:maxHeight="@dimen/dp_80"
 
         android:textColor="@color/black_alpha_50"
 
         android:textSize="@dimen/sp_13"
 
         app:layout_constraintEnd_toEndOf="@id/dialog_bg"
 
@@ -64,10 +67,10 @@
 
         android:layout_height="@dimen/dp_40"
 
         android:layout_marginStart="@dimen/dp_20"
 
         android:layout_marginEnd="@dimen/dp_20"
 
-        android:layout_marginBottom="@dimen/dp_10"
 
         android:gravity="center"
 
         android:textColor="@color/black"
 
-        app:layout_constraintBottom_toTopOf="@id/dialog_negative"
 
+        android:layout_marginTop="@dimen/dp_30"
 
+        app:layout_constraintTop_toBottomOf="@id/dialog_message"
 
         app:layout_constraintEnd_toEndOf="@id/dialog_bg"
 
         app:layout_constraintStart_toStartOf="@id/dialog_bg"
 
         app:stv_corner="@dimen/dp_25"
 
@@ -81,8 +84,9 @@
 
         android:layout_marginEnd="@dimen/dp_20"
 
         android:layout_marginBottom="@dimen/dp_20"
 
         android:gravity="center"
 
+        android:layout_marginTop="@dimen/dp_10"
 
         android:textColor="@color/black_alpha_50"
 
-        app:layout_constraintBottom_toBottomOf="@id/dialog_bg"
 
+        app:layout_constraintTop_toBottomOf="@id/dialog_positive"
 
         app:layout_constraintEnd_toEndOf="@id/dialog_bg"
 
         app:layout_constraintStart_toStartOf="@id/dialog_bg"
 
         app:stv_corner="@dimen/dp_25"