修改 helper 的 mode 参数传递

Author: bugyun

app/build.gradle

@@ -40,8 +40,8 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-//    implementation project(path: ':screen-helper')
-    implementation 'vip.ruoyun.helper:screen-helper:1.0.1'
+    implementation project(path: ':screen-helper')
+//    implementation 'vip.ruoyun.helper:screen-helper:1.0.1'
 
 }
 

app/src/main/java/vip/ruoyun/screenlayout/Helper.kt

@@ -19,7 +19,7 @@ class Helper {
         @JvmStatic
         fun apply(resources: Resources): Resources {
             if (isOpenScreen) {
-                return ScreenHelper.applyAdapt(resources, 480f, ScreenHelper.ScreenMode.WIDTH_DP)
+                return ScreenHelper.applyAdapt(resources, 480f, ScreenHelper.WIDTH_DP)
             } else {
                 return ScreenHelper.closeAdapt(resources)
             }

screen-helper/build.gradle

@@ -17,5 +17,8 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+}
 
+dependencies {
+    implementation 'com.android.support:support-annotations:28.0.0'
 }

screen-helper/src/main/java/vip/ruoyun/screen/ScreenHelper.java

@@ -3,18 +3,24 @@
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.support.annotation.IntDef;
 import android.util.DisplayMetrics;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
 public class ScreenHelper {
 
-    public interface ScreenMode {
-        int WIDTH_DP = 0x25;
-        int WIDTH_PT = 0x35;
-        int HEIGHT_PT = 0x45;
+    public static final int WIDTH_DP = 0x25;
+    public static final int WIDTH_PT = 0x35;
+    public static final int HEIGHT_PT = 0x45;
+
+    @IntDef({WIDTH_DP, WIDTH_PT, HEIGHT_PT})
+    @Retention(RetentionPolicy.CLASS)
+    @interface ScreenMode {
     }
 
     private ScreenHelper() {
@@ -23,7 +29,7 @@ private ScreenHelper() {
     private static List<Field> sMetricsFields;
     private static DisplayMetrics systemDm;
 
-    public static Resources applyAdapt(final Resources resources, float size, int screenMode) {
+    public static Resources applyAdapt(final Resources resources, float size, @ScreenMode int screenMode) {
         DisplayMetrics activityDm = resources.getDisplayMetrics();
         if (null == systemDm) {
             systemDm = Resources.getSystem().getDisplayMetrics();
@@ -70,15 +76,15 @@ public static Resources applyAdapt(final Resources resources, float size, int sc
     }
 
 
-    private static void change(int screenMode, final Resources resources, DisplayMetrics activityDm, DisplayMetrics systemDm, float size) {
+    private static void change(@ScreenMode int screenMode, final Resources resources, DisplayMetrics activityDm, DisplayMetrics systemDm, float size) {
         switch (screenMode) {
-            case ScreenMode.WIDTH_DP:
+            case WIDTH_DP:
                 adaptWidthPixels(resources, activityDm, systemDm, size);
                 break;
-            case ScreenMode.HEIGHT_PT:
+            case HEIGHT_PT:
                 adaptHeightXdpi(resources, size, systemDm);
                 break;
-            case ScreenMode.WIDTH_PT:
+            case WIDTH_PT:
                 adaptWidthXdpi(resources, size, systemDm);
                 break;
         }
@@ -176,11 +182,11 @@ private static void resetResources(DisplayMetrics activityDm, DisplayMetrics sys
     public static int value2px(Context context, float value, int screenMode) {
         DisplayMetrics metrics = context.getResources().getDisplayMetrics();
         switch (screenMode) {
-            case ScreenMode.WIDTH_DP:
+            case WIDTH_DP:
             default:
                 return (int) (value * metrics.density);
-            case ScreenMode.HEIGHT_PT:
-            case ScreenMode.WIDTH_PT:
+            case HEIGHT_PT:
+            case WIDTH_PT:
                 return (int) (value * metrics.xdpi / 72f + 0.5);
         }
     }
@@ -191,14 +197,14 @@ public static int value2px(Context context, float value, int screenMode) {
      * @param pxValue The value of px.
      * @return value of pt
      */
-    public static int px2Value(Context context, float pxValue, int screenMode) {
+    public static int px2Value(Context context, float pxValue, @ScreenMode int screenMode) {
         DisplayMetrics metrics = context.getResources().getDisplayMetrics();
         switch (screenMode) {
-            case ScreenMode.WIDTH_DP:
+            case WIDTH_DP:
             default:
                 return (int) (pxValue / metrics.density);
-            case ScreenMode.HEIGHT_PT:
-            case ScreenMode.WIDTH_PT:
+            case HEIGHT_PT:
+            case WIDTH_PT:
                 return (int) (pxValue * 72 / metrics.xdpi + 0.5);
         }
     }