From 8735b56eefde751618c819f5b331a56a62274a5c Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期四, 14 五月 2020 18:30:22 +0800
Subject: [PATCH] Merge branch 'newUI'

---
 app/src/main/java/safeluck/drive/evaluation/util/DimenUtil.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/app/src/main/java/safeluck/drive/evaluation/util/DimenUtil.java b/app/src/main/java/safeluck/drive/evaluation/util/DimenUtil.java
index 0f8b220..a641fb8 100644
--- a/app/src/main/java/safeluck/drive/evaluation/util/DimenUtil.java
+++ b/app/src/main/java/safeluck/drive/evaluation/util/DimenUtil.java
@@ -6,6 +6,7 @@
 import android.graphics.Bitmap;
 import android.telephony.TelephonyManager;
 import android.util.DisplayMetrics;
+import android.util.Log;
 import android.view.Surface;
 
 import com.google.zxing.BarcodeFormat;
@@ -20,6 +21,9 @@
 
 
 public final class DimenUtil {
+
+
+    private static final String TAG = "DimenUtil";
 
     public static int getScreenWidth(Context context ) {
         final Resources resources = context.getResources();
@@ -72,4 +76,16 @@
         return bitmap;
     }
 
+    public static int px2dp(Context context, float pxValue) {
+        float scale = context.getResources().getDisplayMetrics().density;
+        Log.i(TAG,"density="+scale);
+        return (int) (pxValue / scale + 0.5f);// + 0.5f鏄负浜嗚缁撴灉鍥涜垗浜斿叆
+    }
+
+    public static int px2sp(Context context, float pxValue) {
+        float fontScale = context.getResources().getDisplayMetrics().scaledDensity;
+        Log.i(TAG,"scaledDensity 1.2625="+fontScale);
+        return (int) (pxValue / fontScale + 0.5f);
+    }
+
 }

--
Gitblit v1.8.0