From c8a0420b2134ef2e200e8cbeb3bb303ae62b691b Mon Sep 17 00:00:00 2001
From: kehaoyuan <kehaoyuan@ghzhushou.com>
Date: Mon, 2 Mar 2020 18:31:09 +0800
Subject: [PATCH] =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E9=9A=90=E7=A7=81?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/gh/common/util/DialogUtils.java     | 8 +++++++-
 .../main/res/layout/dialog_disallow_privacy_policy.xml    | 2 ++
 app/src/main/res/layout/dialog_privacy_policy.xml         | 8 ++++----
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java
index bb79effe56..582a2f7b7d 100644
--- a/app/src/main/java/com/gh/common/util/DialogUtils.java
+++ b/app/src/main/java/com/gh/common/util/DialogUtils.java
@@ -890,7 +890,13 @@ public class DialogUtils {
             WindowManager.LayoutParams params = window.getAttributes();
             params.horizontalMargin = 0;
             params.width = context.getResources().getDisplayMetrics().widthPixels - DisplayUtils.dip2px(40);
-            params.height = context.getResources().getDisplayMetrics().heightPixels - DisplayUtils.dip2px(120);
+            int height = context.getResources().getDisplayMetrics().heightPixels - DisplayUtils.dip2px(120);
+            int maxHeight = DisplayUtils.dip2px(546);
+            if (height > maxHeight) {
+                params.height = maxHeight;
+            } else {
+                params.height = height;
+            }
             window.setAttributes(params);
         }
 
diff --git a/app/src/main/res/layout/dialog_disallow_privacy_policy.xml b/app/src/main/res/layout/dialog_disallow_privacy_policy.xml
index e22ed36bae..d0392f528b 100644
--- a/app/src/main/res/layout/dialog_disallow_privacy_policy.xml
+++ b/app/src/main/res/layout/dialog_disallow_privacy_policy.xml
@@ -32,6 +32,8 @@
         android:orientation="vertical"
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@id/icon">
 
         <TextView
diff --git a/app/src/main/res/layout/dialog_privacy_policy.xml b/app/src/main/res/layout/dialog_privacy_policy.xml
index af0cc94c65..a8c8e0c2e2 100644
--- a/app/src/main/res/layout/dialog_privacy_policy.xml
+++ b/app/src/main/res/layout/dialog_privacy_policy.xml
@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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:layout_height="546dp"
     android:background="@drawable/dialog_privacy_background">
 
     <ImageView
@@ -81,7 +81,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="16dp"
                 android:layout_marginRight="16dp"
-                android:layout_marginBottom="40dp"
+                android:layout_marginBottom="20dp"
                 android:includeFontPadding="false"
                 android:lineSpacingExtra="8dp"
                 android:textColor="@color/text_333333"
@@ -96,7 +96,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
-        android:layout_marginBottom="24dp"
+        android:layout_marginBottom="20dp"
         android:includeFontPadding="false"
         android:lineSpacingExtra="8dp"
         android:textColor="@color/text_333333"
@@ -114,10 +114,10 @@
         android:background="@drawable/dialog_privacy_button"
         android:gravity="center"
         android:paddingBottom="16dp"
+        android:text="同意"
         android:textColor="@color/white"
         android:textSize="14sp"
         android:textStyle="bold"
-        android:text="同意"
         app:layout_constraintBottom_toTopOf="@id/disallow_button" />
 
     <TextView