From ba2206931f9232e48179142d2a71ace6d8b4ab48 Mon Sep 17 00:00:00 2001
From: juntao <chenjuntao@ghzhushou.com>
Date: Thu, 26 Nov 2020 10:14:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=9A=90=E7=A7=81=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97UI=20https://gitlab.ghzs.com/pm/halo-app-issues/-/issu?=
 =?UTF-8?q?es/1064?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gh/common/util/DialogUtils.java   | 14 +++++++-------
 .../main/res/layout/dialog_privacy_policy.xml  | 18 ++++++++++--------
 2 files changed, 17 insertions(+), 15 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 a35baad8f3..c6b808faaf 100644
--- a/app/src/main/java/com/gh/common/util/DialogUtils.java
+++ b/app/src/main/java/com/gh/common/util/DialogUtils.java
@@ -988,13 +988,13 @@ public class DialogUtils {
             WindowManager.LayoutParams params = window.getAttributes();
             params.horizontalMargin = 0;
             params.width = context.getResources().getDisplayMetrics().widthPixels - DisplayUtils.dip2px(40);
-            int height = context.getResources().getDisplayMetrics().heightPixels - DisplayUtils.dip2px(120);
-            int maxHeight = DisplayUtils.dip2px(446);
-            if (height > maxHeight) {
-                params.height = maxHeight;
-            } else {
-                params.height = height;
-            }
+//            int height = context.getResources().getDisplayMetrics().heightPixels - DisplayUtils.dip2px(120);
+//            int maxHeight = DisplayUtils.dip2px(446);
+//            if (height > maxHeight) {
+//                params.height = maxHeight;
+//            } else {
+//                params.height = height;
+//            }
             window.setAttributes(params);
         }
 
diff --git a/app/src/main/res/layout/dialog_privacy_policy.xml b/app/src/main/res/layout/dialog_privacy_policy.xml
index 1855dc3dea..8171d8eab2 100644
--- a/app/src/main/res/layout/dialog_privacy_policy.xml
+++ b/app/src/main/res/layout/dialog_privacy_policy.xml
@@ -10,8 +10,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/dialog_privacy_background">
+        android:layout_height="wrap_content">
 
         <ImageView
             android:id="@+id/head_background"
@@ -64,9 +63,9 @@
             tools:text="为提供完整的" />
 
         <FrameLayout
+            android:id="@+id/permission_container"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            app:layout_constraintBottom_toTopOf="@id/link_content"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toBottomOf="@id/top_content">
@@ -96,7 +95,8 @@
                     android:includeFontPadding="false"
                     android:lineSpacingExtra="8dp"
                     android:textColor="@color/text_333333"
-                    android:textSize="13sp" />
+                    android:textSize="13sp"
+                    tools:text="这是啥" />
 
             </LinearLayout>
         </FrameLayout>
@@ -113,11 +113,12 @@
             android:textColor="@color/text_333333"
             android:textSize="11sp"
             android:visibility="gone"
-            tools:visibility="visible"
-            tools:text="你可以在"
             app:layout_constraintBottom_toTopOf="@id/allow_button"
             app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent" />
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/permission_container"
+            tools:text="你可以在"
+            tools:visibility="visible" />
 
         <TextView
             android:id="@+id/allow_button"
@@ -133,7 +134,8 @@
             android:textColor="@color/white"
             android:textSize="14sp"
             android:textStyle="bold"
-            app:layout_constraintBottom_toTopOf="@id/disallow_button" />
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/link_content" />
 
         <TextView
             android:id="@+id/disallow_button"