[Fix]: designDensity init type

Author: gavinliu

ScaleLayout/build.gradle

@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 24
-        versionCode 3
-        versionName "1.0.2"
+        versionCode 4
+        versionName "1.0.3"
     }
     buildTypes {
         release {
@@ -28,7 +28,7 @@ apply plugin: 'com.jfrog.bintray'
 def siteUrl = 'https://github.com/gavinliu/Android-ScaleLayout' // 项目的主页
 def gitUrl = 'https://github.com/gavinliu/Android-ScaleLayout.git' // Git仓库的url
 
-version = "1.0.2"
+version = "1.0.3"
 group = "cn.gavinliu.android.lib"
 
 install {

ScaleLayout/src/main/java/cn/gavinliu/android/lib/scale/config/ScaleConfig.java

@@ -24,7 +24,15 @@ public class ScaleConfig {
 
     private static ScaleConfig mInstance;
 
-    public static ScaleConfig create(Context ctx, int designWidth, int designHeight, int designDensity, int dimensionUnit) {
+    /**
+     * @param ctx Context
+     * @param designWidth Design Width (Pixel)
+     * @param designHeight Design Height (Pixel)
+     * @param designDensity Design Density
+     * @param dimensionUnit DIMENS_UNIT_DP or DIMENS_UNIT_PIX
+     * @return Single instance
+     */
+    public static ScaleConfig create(Context ctx, int designWidth, int designHeight, float designDensity, int dimensionUnit) {
         if (mInstance == null) {
             mInstance = new ScaleConfig(ctx, designWidth, designHeight, designDensity, dimensionUnit);
         }
@@ -49,7 +57,7 @@ private ScaleConfig(Context ctx) {
         mScreenDensity = density;
     }
 
-    private ScaleConfig(Context ctx, int designWidth, int designHeight, int designDensity, int dimensionUnit) {
+    private ScaleConfig(Context ctx, int designWidth, int designHeight, float designDensity, int dimensionUnit) {
         this(ctx);
         mDesignWidth = designWidth;
         mDesignHeight = designHeight;

ScaleLayout/src/main/java/cn/gavinliu/android/lib/scale/helper/ScaleLayoutHelper.java

@@ -406,18 +406,31 @@ private int getRealPixelSizeByDp(int pix, int screen, int design) {
             float density = ScaleConfig.getInstance().getScreenDensity();
             float designDensity = ScaleConfig.getInstance().getDesignDensity();
 
-            float newPix = (screen * designDensity * pix) / (design * density);
+            int designDp = convertPix2Dp(density, pix);
+            int designPix = convertDp2Pix(designDensity, designDp);
+
             int result;
-            if (newPix > 1) {
-                result = (int) Math.rint((double) newPix);
+
+            int res = designPix * screen;
+
+            if (res % design == 0) {
+                result = res / design;
             } else {
-                result = (int) Math.ceil((double) newPix);
+                result = res / design + 1;
             }
 
             if (ScaleConfig.getInstance().isDebug())
-                Log.i(TAG, "pix:" + pix + ",newPix:" + newPix + ",result:" + result);
+                Log.i(TAG, "pix:" + pix + ",dp:" + designDp + ",result:" + result);
             return result;
         }
+
+        private static int convertPix2Dp(float density, int px) {
+            return (int) (px / density + 0.5f);
+        }
+
+        private static int convertDp2Pix(float density, int dip) {
+            return (int) (dip * density + 0.5f);
+        }
     }
 
 }