Merge pull request #5 from gavinliu/dev

gavinliu · web-flow · commit 9e8ea30ee563 · 2016-11-20T16:35:37.000+08:00
add class ScaleConfig
diff --git a/Library/src/main/java/cn/gavinliu/android/lib/scale/ScaleFrameLayout.java b/Library/src/main/java/cn/gavinliu/android/lib/scale/ScaleFrameLayout.java
@@ -43,15 +43,15 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         this.mHelper.adjustChildren(widthMeasureSpec, heightMeasureSpec);
 
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        if (this.mHelper.handleMeasuredStateTooSmall()) {
-            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        }
+//        if (this.mHelper.handleMeasuredStateTooSmall()) {
+//            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+//        }
     }
 
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         super.onLayout(changed, left, top, right, bottom);
-        this.mHelper.restoreOriginalParams();
+//        this.mHelper.restoreOriginalParams();
     }
 
     public static class LayoutParams extends FrameLayout.LayoutParams implements ScaleLayoutHelper.ScaleLayoutParams {
diff --git a/Library/src/main/java/cn/gavinliu/android/lib/scale/ScaleLinearLayout.java b/Library/src/main/java/cn/gavinliu/android/lib/scale/ScaleLinearLayout.java
@@ -46,15 +46,15 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         this.mHelper.adjustChildren(widthMeasureSpec, heightMeasureSpec);
 
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        if (this.mHelper.handleMeasuredStateTooSmall()) {
-            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        }
+//        if (this.mHelper.handleMeasuredStateTooSmall()) {
+//            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+//        }
     }
 
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         super.onLayout(changed, left, top, right, bottom);
-        this.mHelper.restoreOriginalParams();
+//        this.mHelper.restoreOriginalParams();
     }
 
     public static class LayoutParams extends LinearLayout.LayoutParams implements ScaleLayoutHelper.ScaleLayoutParams {
diff --git a/Library/src/main/java/cn/gavinliu/android/lib/scale/ScaleRelativeLayout.java b/Library/src/main/java/cn/gavinliu/android/lib/scale/ScaleRelativeLayout.java
@@ -43,15 +43,15 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         this.mHelper.adjustChildren(widthMeasureSpec, heightMeasureSpec);
 
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        if (this.mHelper.handleMeasuredStateTooSmall()) {
-            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        }
+//        if (this.mHelper.handleMeasuredStateTooSmall()) {
+//            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+//        }
     }
 
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         super.onLayout(changed, left, top, right, bottom);
-        this.mHelper.restoreOriginalParams();
+//        this.mHelper.restoreOriginalParams();
     }
 
     public static class LayoutParams extends android.widget.RelativeLayout.LayoutParams implements ScaleLayoutHelper.ScaleLayoutParams {
diff --git a/Library/src/main/java/cn/gavinliu/android/lib/scale/config/ScaleConfig.java b/Library/src/main/java/cn/gavinliu/android/lib/scale/config/ScaleConfig.java
@@ -1,52 +1,52 @@
 package cn.gavinliu.android.lib.scale.config;
 
 import android.content.Context;
-import android.content.res.Configuration;
 
 /**
  * Created by Gavin on 16-9-20.
  */
 public class ScaleConfig {
 
-    private int mDesignWidth = 1080;
-    private int mDesignHeight = 1920;
+    private int mDesignWidth;
+    private int mDesignHeight;
+    private float mDesignDensity;
 
     private int mScreenWidth;
     private int mScreenHeight;
-
-    private int mScreenWidthLand;
-    private int mScreenHeightLand;
+    private float mScreenDensity;
 
     private static ScaleConfig mInstance;
 
-    public static void create(Context ctx) {
+    public static ScaleConfig create(Context ctx, int designWidth, int designHeight, int designDensity) {
         if (mInstance == null) {
-            mInstance = new ScaleConfig(ctx);
+            mInstance = new ScaleConfig(ctx, designWidth, designHeight, designDensity);
         }
+
+        return mInstance;
     }
 
     public static ScaleConfig getInstance() {
+        if (mInstance == null)
+            throw new IllegalArgumentException("You must call ScaleConfig.create first");
+
         return mInstance;
     }
 
     private ScaleConfig(Context ctx) {
         final int width = ctx.getResources().getDisplayMetrics().widthPixels;
         final int height = ctx.getResources().getDisplayMetrics().heightPixels;
+        final float density = ctx.getResources().getDisplayMetrics().density;
 
-        if (ctx.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
-            mScreenWidth = width;
-            mScreenHeight = height;
-
-            mScreenWidthLand = height;
-            mScreenHeightLand = width;
-        } else {
-            mScreenWidth = height;
-            mScreenHeight = width;
-
-            mScreenWidthLand = width;
-            mScreenHeightLand = height;
-        }
+        mScreenWidth = width;
+        mScreenHeight = height;
+        mScreenDensity = density;
+    }
 
+    private ScaleConfig(Context ctx, int designWidth, int designHeight, int designDensity) {
+        this(ctx);
+        mDesignWidth = designWidth;
+        mDesignHeight = designHeight;
+        mDesignDensity = designDensity;
     }
 
     public int getDesignWidth() {
@@ -57,6 +57,14 @@ public int getDesignHeight() {
         return mDesignHeight;
     }
 
+    public float getDesignDensity() {
+        return mDesignDensity;
+    }
+
+    public float getScreenDensity() {
+        return mScreenDensity;
+    }
+
     public int getScreenWidth() {
         return mScreenWidth;
     }
diff --git a/Library/src/main/java/cn/gavinliu/android/lib/scale/helper/ScaleLayoutHelper.java b/Library/src/main/java/cn/gavinliu/android/lib/scale/helper/ScaleLayoutHelper.java
@@ -378,10 +378,10 @@ private int getRealPixelSize(int pix) {
                     design = designWidth;
                     break;
             }
-            return getRealPixelSize(pix, screen, design);
+            return getRealPixelSizeByDip(pix, screen, design);
         }
 
-        private int getRealPixelSize(int pix, int screen, int design) {
+        private int getRealPixelSizeByPix(int pix, int screen, int design) {
             int result;
 
             int res = pix * screen;
@@ -395,6 +395,21 @@ private int getRealPixelSize(int pix, int screen, int design) {
             Log.i(TAG, "pix:" + pix + ",result:" + result);
             return result;
         }
+
+        private int getRealPixelSizeByDip(int pix, int screen, int design) {
+            float density = ScaleConfig.getInstance().getScreenDensity();
+            float designDensity = ScaleConfig.getInstance().getDesignDensity();
+
+            float newpix = (screen * designDensity * pix) / (design * density);
+            int result;
+            if (newpix > 1) {
+                result = (int) Math.rint((double) newpix);
+            } else {
+                result = (int) Math.ceil((double) newpix);
+            }
+            Log.i(TAG, "pix:" + pix + ",newPix:" + newpix + ",result:" + result);
+            return result;
+        }
     }
 
 }
diff --git a/Sample/src/main/AndroidManifest.xml b/Sample/src/main/AndroidManifest.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cn.gavinliu.android_scalelayout">
+          package="cn.gavinliu.android_scalelayout">
 
     <application
+        android:name=".MainApplication"
         android:allowBackup="true"
         android:configChanges="keyboardHidden|orientation|screenSize|locale"
         android:icon="@mipmap/ic_launcher"
@@ -12,9 +13,9 @@
             android:name=".MainActivity"
             android:label="@string/app_name">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
     </application>
diff --git a/Sample/src/main/java/cn/gavinliu/android_scalelayout/MainActivity.java b/Sample/src/main/java/cn/gavinliu/android_scalelayout/MainActivity.java
@@ -1,21 +1,21 @@
 package cn.gavinliu.android_scalelayout;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
-
-import cn.gavinliu.android.lib.scale.config.ScaleConfig;
+import android.util.AttributeSet;
+import android.view.View;
 
 public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ScaleConfig.create(getApplication());
         setContentView(R.layout.activity_main);
     }
 
-//    @Override
-//    public View onCreateView(String name, Context context, AttributeSet attrs) {
+    @Override
+    public View onCreateView(String name, Context context, AttributeSet attrs) {
 //        switch (name) {
 //            case "FrameLayout":
 //                return new ScaleFrameLayout(context, attrs);
@@ -24,6 +24,6 @@ protected void onCreate(Bundle savedInstanceState) {
 //            case "RelativeLayout":
 //                return new ScaleRelativeLayout(context, attrs);
 //        }
-//        return super.onCreateView(name, context, attrs);
-//    }
+        return super.onCreateView(name, context, attrs);
+    }
 }
diff --git a/Sample/src/main/java/cn/gavinliu/android_scalelayout/MainApplication.java b/Sample/src/main/java/cn/gavinliu/android_scalelayout/MainApplication.java
@@ -0,0 +1,18 @@
+package cn.gavinliu.android_scalelayout;
+
+import android.app.Application;
+
+import cn.gavinliu.android.lib.scale.config.ScaleConfig;
+
+/**
+ * Created by Gavin on 16-11-10.
+ */
+
+public class MainApplication extends Application {
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        ScaleConfig.create(this, 1080, 1920, 3);
+    }
+}
diff --git a/Sample/src/main/res/layout/activity_main.xml b/Sample/src/main/res/layout/activity_main.xml
@@ -1,6 +1,5 @@
-<cn.gavinliu.android.lib.scale.ScaleRelativeLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -14,14 +13,14 @@
         android:layout_marginTop="8dp"
         android:background="#46b34b"
         android:paddingLeft="10dp"
-        android:text="xxxx"
-        app:layout_scale_by="width"/>
+        android:paddingTop="10dp"
+        android:text="xxxx"/>
 
-    <cn.gavinliu.android.lib.scale.ScaleFrameLayout
+    <FrameLayout
         android:layout_width="300dp"
         android:layout_height="300dp"
         android:layout_below="@id/view"
-        android:layout_marginTop="5dp"
+        android:layout_marginTop="8dp"
         android:background="#46b"
         android:paddingTop="8dp">
 
@@ -30,10 +29,9 @@
             android:layout_height="120dp"
             android:layout_marginLeft="12dp"
             android:layout_marginTop="8dp"
-            android:background="#46b34b"
-            app:layout_scale_by="width"/>
+            android:background="#46b34b"/>
 
-    </cn.gavinliu.android.lib.scale.ScaleFrameLayout>
+    </FrameLayout>
 
 
-</cn.gavinliu.android.lib.scale.ScaleRelativeLayout>
+</RelativeLayout>
