修复部分View设置WARP_CONTENT预览显示的问题

Brook007 · Feb 3, 2019 · 14d5e18 · 14d5e18
1 parent ffe496c
commit 14d5e18
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 7 deletions.
diff --git a/app/src/main/res/layout/activity_simple_px.xml b/app/src/main/res/layout/activity_simple_px.xml
@@ -21,13 +21,14 @@
     <TextView
         android:id="@+id/title"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="50dp"
         android:background="@null"
         android:includeFontPadding="false"
         android:text="手机验证登录"
         android:textColor="#333333"
         android:textSize="48px"
         android:textStyle="bold"
+        android:gravity="center"
         app:belowTo="@id/close"
         app:centerInParentHorizontal="true"
         app:dependency_marginTop="102px" />

diff --git a/library/src/main/java/com/brook/app/android/supportlibrary/view/DependencyLayout.java b/library/src/main/java/com/brook/app/android/supportlibrary/view/DependencyLayout.java
@@ -115,12 +115,6 @@ public DependencyLayout(Context context, AttributeSet attrs) {
     public DependencyLayout(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
 
-        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-        Display defaultDisplay = wm.getDefaultDisplay();
-        DisplayMetrics metrics = new DisplayMetrics();
-        defaultDisplay.getMetrics(metrics);
-        screenWidth = metrics.widthPixels;
-        screenHeight = metrics.heightPixels;
 
         this.metrics = new Metrics();
 
@@ -161,6 +155,37 @@ public DependencyLayout(Context context, AttributeSet attrs, int defStyleAttr) {
             }
             typedArray.recycle();
         }
+
+        WindowManager wm = (WindowManager) context.getApplicationContext().getSystemService(Context.WINDOW_SERVICE);
+        Display defaultDisplay = wm.getDefaultDisplay();
+        DisplayMetrics metrics = new DisplayMetrics();
+        defaultDisplay.getMetrics(metrics);
+        if (metrics.widthPixels <= 0) {
+            String value = Util.getValue(mDesignWidth);
+            String unit = value.substring(value.length());
+            if ("dp".equals(unit) || "dip".equals(unit)) {
+                screenWidth = (int) Util.dp2px(Util.toFloat(value));
+            } else if ("px".equals(unit)) {
+                screenWidth = (int) Util.toFloat(value);
+            } else {
+                screenWidth = 1080;
+            }
+        } else {
+            screenWidth = metrics.widthPixels;
+        }
+        if (metrics.heightPixels <= 0) {
+            String value = Util.getValue(mDesignHeight);
+            String unit = value.substring(value.length());
+            if ("dp".equals(unit) || "dip".equals(unit)) {
+                screenHeight = (int) Util.dp2px(Util.toFloat(value));
+            } else if ("px".equals(unit)) {
+                screenHeight = (int) Util.toFloat(value);
+            } else {
+                screenHeight = 1920;
+            }
+        } else {
+            screenHeight = metrics.heightPixels;
+        }
     }
 
     @Override