fix dialog 内部view的context强转异常

hongyangAndroid · hongyangAndroid · commit ff2d74b7e6ee · 2015-12-04T14:44:49.000+08:00
diff --git a/README.md b/README.md
@@ -55,7 +55,7 @@ dependencies {
 
 ```
 dependencies {
-    compile 'com.zhy:autolayout:1.2.0'
+    compile 'com.zhy:autolayout:1.2.1'
 }
 ```
 
diff --git a/autolayout/autolayout.iml b/autolayout/autolayout.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":autolayout" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.zhy" external.system.module.version="1.2.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":autolayout" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.zhy" external.system.module.version="1.2.1" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
diff --git a/autolayout/build.gradle b/autolayout/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-version = "1.2.0"
+version = "1.2.1"
 
 android {
     compileSdkVersion 23
diff --git a/autolayout/src/main/java/com/zhy/autolayout/AutoLayoutConifg.java b/autolayout/src/main/java/com/zhy/autolayout/AutoLayoutConifg.java
@@ -8,7 +8,6 @@
 import android.content.res.TypedArray;
 import android.os.Build;
 import android.util.DisplayMetrics;
-import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 
@@ -17,14 +16,15 @@
  */
 public class AutoLayoutConifg
 {
+
     private boolean mStatusBarAvailable;
     private static final String STATUS_BAR_HEIGHT_RES_NAME = "status_bar_height";
 
 
     DisplayMetrics outMetrics = new DisplayMetrics();
 
     private int mAvailableWidth;
-    private int mAvailaleHegiht;
+    private int mAvailableHeight;
 
 
     private static final String KEY_DESIGN_WIDTH = "design_width";
@@ -39,9 +39,9 @@ public int getAvailableWidth()
         return mAvailableWidth;
     }
 
-    public int getAvailaleHeight()
+    public int getAvailableHeight()
     {
-        return mAvailaleHegiht;
+        return mAvailableHeight;
     }
 
     public int getDesignWidth()
@@ -54,33 +54,35 @@ public int getDesignHeight()
         return mDesignHeight;
     }
 
-    public void auto(Activity activity)
+    public void auto(Context context)
     {
-        auto(activity, true);
+        auto(context, true);
     }
 
 
-    public void auto(Activity activity, boolean ignoreStatusBar)
+    public void auto(Context context, boolean ignoreStatusBar)
     {
-        getMetaData(activity);
+        getMetaData(context);
 
-        WindowManager wm = (WindowManager) activity.getSystemService(Context.WINDOW_SERVICE);
+        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
         wm.getDefaultDisplay().getMetrics(outMetrics);
         mAvailableWidth = outMetrics.widthPixels;
-        mAvailaleHegiht = outMetrics.heightPixels;
-        mAvailaleHegiht -= getStatusHeight(activity.getResources());
+        mAvailableHeight = outMetrics.heightPixels;
+        mAvailableHeight -= getStatusHeight(context.getResources());
 
         if (ignoreStatusBar)
             return;
 
-        checkStatusBar(activity);
+        if (!(context instanceof Activity))
+            return;
+        checkStatusBar((Activity) context);
 
         if (mStatusBarAvailable)
         {
-            mAvailaleHegiht += getStatusHeight(activity.getResources());
+            mAvailableHeight += getStatusHeight(context.getResources());
         }
 
-        L.e("mAvailableWidth =" + mAvailableWidth + " , mAvailaleHegiht = " + mAvailaleHegiht);
+        L.e("mAvailableWidth =" + mAvailableWidth + " , mAvailableHeight = " + mAvailableHeight);
     }
 
     private void getMetaData(Context context)
@@ -109,7 +111,6 @@ private void getMetaData(Context context)
     private void checkStatusBar(Activity activity)
     {
         Window win = activity.getWindow();
-        ViewGroup decorViewGroup = (ViewGroup) win.getDecorView();
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
         {
@@ -150,5 +151,4 @@ private int getStatusHeight(Resources res)
 
 
 
-
 }
diff --git a/autolayout/src/main/java/com/zhy/autolayout/AutoLayoutHelper.java b/autolayout/src/main/java/com/zhy/autolayout/AutoLayoutHelper.java
@@ -16,7 +16,6 @@
 
 package com.zhy.autolayout;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
@@ -64,22 +63,34 @@ public class AutoLayoutHelper
     private static final String VAL_WRAP_CONTENT = "-2";
     private static final String VAL_MATCH_PARENT = "-1";
 
+
     /**
      * TODO  move to other place
      */
-    private AutoLayoutConifg mAutoLayout;
+    private static AutoLayoutConifg mAutoLayoutConifg;
 
     public AutoLayoutHelper(ViewGroup host)
     {
         mHost = host;
-        mAutoLayout = new AutoLayoutConifg();
+
+        if (mAutoLayoutConifg == null)
+        {
+            initAutoLayoutConfig(host);
+        }
+
+
+    }
+
+    private void initAutoLayoutConfig(ViewGroup host)
+    {
+        mAutoLayoutConifg = new AutoLayoutConifg();
 
         boolean ignoreStatusBar = true;
         if (host.getContext() instanceof UseStatusBar)
         {
             ignoreStatusBar = false;
         }
-        mAutoLayout.auto((Activity) host.getContext(), ignoreStatusBar);
+        mAutoLayoutConifg.auto(host.getContext(), ignoreStatusBar);
     }
 
 
@@ -193,23 +204,23 @@ private void supportPadding(View view, AutoLayoutInfo info)
 
     private int getAvailableWidth()
     {
-        return mAutoLayout.getAvailableWidth();
+        return mAutoLayoutConifg.getAvailableWidth();
     }
 
     private int getAvailableHeight()
     {
-        return mAutoLayout.getAvailaleHeight();
+        return mAutoLayoutConifg.getAvailableHeight();
 
     }
 
     private int getDesignWidth()
     {
-        return mAutoLayout.getDesignWidth();
+        return mAutoLayoutConifg.getDesignWidth();
     }
 
     private int getDesignHeight()
     {
-        return mAutoLayout.getDesignHeight();
+        return mAutoLayoutConifg.getDesignHeight();
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ dependencies {`
`55`	`55`
`56`	`56`	```
`57`	`57`	`dependencies {`
`58`		`- compile 'com.zhy:autolayout:1.2.0'`
	`58`	`+ compile 'com.zhy:autolayout:1.2.1'`
`59`	`59`	`}`
`60`	`60`	```
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`import android.content.res.TypedArray;`
`9`	`9`	`import android.os.Build;`
`10`	`10`	`import android.util.DisplayMetrics;`
`11`		`-import android.view.ViewGroup;`
`12`	`11`	`import android.view.Window;`
`13`	`12`	`import android.view.WindowManager;`
`14`	`13`
`@@ -17,14 +16,15 @@`
`17`	`16`	`*/`
`18`	`17`	`public class AutoLayoutConifg`
`19`	`18`	`{`
	`19`	`+`
`20`	`20`	`private boolean mStatusBarAvailable;`
`21`	`21`	`private static final String STATUS_BAR_HEIGHT_RES_NAME = "status_bar_height";`
`22`	`22`
`23`	`23`
`24`	`24`	`DisplayMetrics outMetrics = new DisplayMetrics();`
`25`	`25`
`26`	`26`	`private int mAvailableWidth;`
`27`		`- private int mAvailaleHegiht;`
	`27`	`+ private int mAvailableHeight;`
`28`	`28`
`29`	`29`
`30`	`30`	`private static final String KEY_DESIGN_WIDTH = "design_width";`
`@@ -39,9 +39,9 @@ public int getAvailableWidth()`
`39`	`39`	`return mAvailableWidth;`
`40`	`40`	`}`
`41`	`41`
`42`		`- public int getAvailaleHeight()`
	`42`	`+ public int getAvailableHeight()`
`43`	`43`	`{`
`44`		`- return mAvailaleHegiht;`
	`44`	`+ return mAvailableHeight;`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public int getDesignWidth()`
`@@ -54,33 +54,35 @@ public int getDesignHeight()`
`54`	`54`	`return mDesignHeight;`
`55`	`55`	`}`
`56`	`56`
`57`		`- public void auto(Activity activity)`
	`57`	`+ public void auto(Context context)`
`58`	`58`	`{`
`59`		`- auto(activity, true);`
	`59`	`+ auto(context, true);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`
`63`		`- public void auto(Activity activity, boolean ignoreStatusBar)`
	`63`	`+ public void auto(Context context, boolean ignoreStatusBar)`
`64`	`64`	`{`
`65`		`- getMetaData(activity);`
	`65`	`+ getMetaData(context);`
`66`	`66`
`67`		`- WindowManager wm = (WindowManager) activity.getSystemService(Context.WINDOW_SERVICE);`
	`67`	`+ WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);`
`68`	`68`	`wm.getDefaultDisplay().getMetrics(outMetrics);`
`69`	`69`	`mAvailableWidth = outMetrics.widthPixels;`
`70`		`- mAvailaleHegiht = outMetrics.heightPixels;`
`71`		`- mAvailaleHegiht -= getStatusHeight(activity.getResources());`
	`70`	`+ mAvailableHeight = outMetrics.heightPixels;`
	`71`	`+ mAvailableHeight -= getStatusHeight(context.getResources());`
`72`	`72`
`73`	`73`	`if (ignoreStatusBar)`
`74`	`74`	`return;`
`75`	`75`
`76`		`- checkStatusBar(activity);`
	`76`	`+ if (!(context instanceof Activity))`
	`77`	`+ return;`
	`78`	`+ checkStatusBar((Activity) context);`
`77`	`79`
`78`	`80`	`if (mStatusBarAvailable)`
`79`	`81`	`{`
`80`		`- mAvailaleHegiht += getStatusHeight(activity.getResources());`
	`82`	`+ mAvailableHeight += getStatusHeight(context.getResources());`
`81`	`83`	`}`
`82`	`84`
`83`		`- L.e("mAvailableWidth =" + mAvailableWidth + " , mAvailaleHegiht = " + mAvailaleHegiht);`
	`85`	`+ L.e("mAvailableWidth =" + mAvailableWidth + " , mAvailableHeight = " + mAvailableHeight);`
`84`	`86`	`}`
`85`	`87`
`86`	`88`	`private void getMetaData(Context context)`
`@@ -109,7 +111,6 @@ private void getMetaData(Context context)`
`109`	`111`	`private void checkStatusBar(Activity activity)`
`110`	`112`	`{`
`111`	`113`	`Window win = activity.getWindow();`
`112`		`- ViewGroup decorViewGroup = (ViewGroup) win.getDecorView();`
`113`	`114`
`114`	`115`	`if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)`
`115`	`116`	`{`
`@@ -150,5 +151,4 @@ private int getStatusHeight(Resources res)`
`150`	`151`
`151`	`152`
`152`	`153`
`153`		`-`
`154`	`154`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`
`17`	`17`	`package com.zhy.autolayout;`
`18`	`18`
`19`		`-import android.app.Activity;`
`20`	`19`	`import android.content.Context;`
`21`	`20`	`import android.content.res.TypedArray;`
`22`	`21`	`import android.util.AttributeSet;`
`@@ -64,22 +63,34 @@ public class AutoLayoutHelper`
`64`	`63`	`private static final String VAL_WRAP_CONTENT = "-2";`
`65`	`64`	`private static final String VAL_MATCH_PARENT = "-1";`
`66`	`65`
	`66`	`+`
`67`	`67`	`/**`
`68`	`68`	`* TODO move to other place`
`69`	`69`	`*/`
`70`		`- private AutoLayoutConifg mAutoLayout;`
	`70`	`+ private static AutoLayoutConifg mAutoLayoutConifg;`
`71`	`71`
`72`	`72`	`public AutoLayoutHelper(ViewGroup host)`
`73`	`73`	`{`
`74`	`74`	`mHost = host;`
`75`		`- mAutoLayout = new AutoLayoutConifg();`
	`75`	`+`
	`76`	`+ if (mAutoLayoutConifg == null)`
	`77`	`+ {`
	`78`	`+ initAutoLayoutConfig(host);`
	`79`	`+ }`
	`80`	`+`
	`81`	`+`
	`82`	`+ }`
	`83`	`+`
	`84`	`+ private void initAutoLayoutConfig(ViewGroup host)`
	`85`	`+ {`
	`86`	`+ mAutoLayoutConifg = new AutoLayoutConifg();`
`76`	`87`
`77`	`88`	`boolean ignoreStatusBar = true;`
`78`	`89`	`if (host.getContext() instanceof UseStatusBar)`
`79`	`90`	`{`
`80`	`91`	`ignoreStatusBar = false;`
`81`	`92`	`}`
`82`		`- mAutoLayout.auto((Activity) host.getContext(), ignoreStatusBar);`
	`93`	`+ mAutoLayoutConifg.auto(host.getContext(), ignoreStatusBar);`
`83`	`94`	`}`
`84`	`95`
`85`	`96`
`@@ -193,23 +204,23 @@ private void supportPadding(View view, AutoLayoutInfo info)`
`193`	`204`
`194`	`205`	`private int getAvailableWidth()`
`195`	`206`	`{`
`196`		`- return mAutoLayout.getAvailableWidth();`
	`207`	`+ return mAutoLayoutConifg.getAvailableWidth();`
`197`	`208`	`}`
`198`	`209`
`199`	`210`	`private int getAvailableHeight()`
`200`	`211`	`{`
`201`		`- return mAutoLayout.getAvailaleHeight();`
	`212`	`+ return mAutoLayoutConifg.getAvailableHeight();`
`202`	`213`
`203`	`214`	`}`
`204`	`215`
`205`	`216`	`private int getDesignWidth()`
`206`	`217`	`{`
`207`		`- return mAutoLayout.getDesignWidth();`
	`218`	`+ return mAutoLayoutConifg.getDesignWidth();`
`208`	`219`	`}`
`209`	`220`
`210`	`221`	`private int getDesignHeight()`
`211`	`222`	`{`
`212`		`- return mAutoLayout.getDesignHeight();`
	`223`	`+ return mAutoLayoutConifg.getDesignHeight();`
`213`	`224`	`}`
`214`	`225`
`215`	`226`