修复联动选择器联动时的一个数组越界异常

liyujiang-gzu · liyujiang-gzu · commit b94f6445a08d · 2016-10-19T23:51:36.000+08:00
diff --git a/README.md b/README.md
@@ -227,16 +227,16 @@ dependencies {
 
 地址选择器（含省级、地级、县级）：
 ```java
-        ArrayList<AddressPicker.Province> data = new ArrayList<AddressPicker.Province>();
+        ArrayList<Province> data = new ArrayList<Province>();
         String json = AssetsUtils.readText(this, "city.json");
-        data.addAll(JSON.parseArray(json, AddressPicker.Province.class));
+        data.addAll(JSON.parseArray(json, Province.class));
         AddressPicker picker = new AddressPicker(this, result);
         picker.setSelectedItem("贵州", "贵阳", "花溪");
         //picker.setHideProvince(true);//加上此句举将只显示地级及县级
         //picker.setHideCounty(true);//加上此句举将只显示省级及地级
         picker.setOnAddressPickListener(new AddressPicker.OnAddressPickListener() {
             @Override
-            public void onAddressPicked(String province, String city, String county) {
+            public void onAddressPicked(Province province, City city, County county) {
                 showToast(province + city + county);
             }
         });
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -38,6 +38,7 @@
     *;
 }
 
+#使用fastjson，不能混淆泛型和注解
 -keepattributes Exceptions,InnerClasses,Signature
 -keepattributes *Annotation*
 
@@ -48,6 +49,5 @@
 -dontwarn android.support.**
 -keep class android.support.v4.** { *; }
 
-#不混淆地址选择器的实体类，一般fastjson能正常解析
+#不混淆地址选择器的实体类，以便fastjson能正常解析
 -keep class cn.qqtheme.framework.entity.** { *;}
--keep class cn.qqtheme.framework.picker.AddressPickerr$* { *;}
diff --git a/app/src/main/java/cn/qqtheme/androidpicker/MyApp.java b/app/src/main/java/cn/qqtheme/androidpicker/MyApp.java
@@ -17,6 +17,9 @@ public class MyApp extends Application {
     public void onCreate() {
         super.onCreate();
         AppConfig.DEBUG_ENABLE = true;//BuildConfig.DEBUG;
+        if (!AppConfig.DEBUG_ENABLE) {
+            android.util.Log.d(AppConfig.DEBUG_TAG, "logcat is disabled");
+        }
     }
 
 }
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.2.1'
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5"
     }
 }
@@ -181,7 +181,7 @@ subprojects {
 
                 bintray {
                     // You should configure "bintray.user" and "bintray.apiKey" in the gradle.properties
-                    // that in gradle cache directory (${HOME}/.gradle/gradle.properties)
+                    // that in gradle cache directory (～/.gradle/gradle.properties)
                     user = safeGetProperty("bintray.user")
                     key = safeGetProperty("bintray.apikey")
 
diff --git a/library/Common/src/main/java/cn/qqtheme/framework/util/CompatUtils.java b/library/Common/src/main/java/cn/qqtheme/framework/util/CompatUtils.java
@@ -60,9 +60,10 @@ public static String getString(Context context, @StringRes int stringRes) {
         }
     }
 
+    @TargetApi(Build.VERSION_CODES.M)
     @ColorInt
     public static int getColor(Context context, @ColorRes int colorRes) {
-        if (Build.VERSION.SDK_INT < 21) {
+        if (Build.VERSION.SDK_INT < 23) {
             //noinspection deprecation
             return context.getResources().getColor(colorRes);
         } else {
diff --git a/library/WheelPicker/src/main/java/cn/qqtheme/framework/entity/Area.java b/library/WheelPicker/src/main/java/cn/qqtheme/framework/entity/Area.java
@@ -0,0 +1,35 @@
+package cn.qqtheme.framework.entity;
+
+/**
+ * 省市县抽象，本类及其子类不可混淆
+ * <br/>
+ * Author:李玉江[QQ:1032694760]
+ * DateTime:2016-10-15 19:06
+ * Builder:Android Studio
+ */
+public abstract class Area {
+    private String areaId;
+    private String areaName;
+
+    public String getAreaId() {
+        return areaId;
+    }
+
+    public void setAreaId(String areaId) {
+        this.areaId = areaId;
+    }
+
+    public String getAreaName() {
+        return areaName;
+    }
+
+    public void setAreaName(String areaName) {
+        this.areaName = areaName;
+    }
+
+    @Override
+    public String toString() {
+        return "areaId=" + areaId + ",areaName=" + areaName;
+    }
+
+}
diff --git a/library/WheelPicker/src/main/java/cn/qqtheme/framework/entity/City.java b/library/WheelPicker/src/main/java/cn/qqtheme/framework/entity/City.java
@@ -0,0 +1,23 @@
+package cn.qqtheme.framework.entity;
+
+import java.util.ArrayList;
+
+/**
+ * 地市
+ * <br/>
+ * Author:李玉江[QQ:1032694760]
+ * DateTime:2016-10-15 19:07
+ * Builder:Android Studio
+ */
+public class City extends Area {
+    private ArrayList<County> counties = new ArrayList<County>();
+
+    public ArrayList<County> getCounties() {
+        return counties;
+    }
+
+    public void setCounties(ArrayList<County> counties) {
+        this.counties = counties;
+    }
+
+}
diff --git a/library/WheelPicker/src/main/java/cn/qqtheme/framework/entity/County.java b/library/WheelPicker/src/main/java/cn/qqtheme/framework/entity/County.java
@@ -0,0 +1,11 @@
+package cn.qqtheme.framework.entity;
+
+/**
+ * 区县
+ * <br/>
+ * Author:李玉江[QQ:1032694760]
+ * DateTime:2016-10-15 19:08
+ * Builder:Android Studio
+ */
+public class County extends Area {
+}
diff --git a/library/WheelPicker/src/main/java/cn/qqtheme/framework/entity/Province.java b/library/WheelPicker/src/main/java/cn/qqtheme/framework/entity/Province.java
@@ -0,0 +1,23 @@
+package cn.qqtheme.framework.entity;
+
+import java.util.ArrayList;
+
+/**
+ * 省份
+ * <br/>
+ * Author:李玉江[QQ:1032694760]
+ * DateTime:2016-10-15 19:06
+ * Builder:Android Studio
+ */
+public class Province extends Area {
+    private ArrayList<City> cities = new ArrayList<City>();
+
+    public ArrayList<City> getCities() {
+        return cities;
+    }
+
+    public void setCities(ArrayList<City> cities) {
+        this.cities = cities;
+    }
+
+}
diff --git a/library/WheelPicker/src/main/java/cn/qqtheme/framework/picker/AddressPicker.java b/library/WheelPicker/src/main/java/cn/qqtheme/framework/picker/AddressPicker.java

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,9 @@ public class MyApp extends Application {`
`17`	`17`	`public void onCreate() {`
`18`	`18`	`super.onCreate();`
`19`	`19`	`AppConfig.DEBUG_ENABLE = true;//BuildConfig.DEBUG;`
	`20`	`+ if (!AppConfig.DEBUG_ENABLE) {`
	`21`	`+ android.util.Log.d(AppConfig.DEBUG_TAG, "logcat is disabled");`
	`22`	`+ }`
`20`	`23`	`}`
`21`	`24`
`22`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`jcenter()`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:2.2.0'`
	`8`	`+ classpath 'com.android.tools.build:gradle:2.2.1'`
`9`	`9`	`classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5"`
`10`	`10`	`}`
`11`	`11`	`}`
`@@ -181,7 +181,7 @@ subprojects {`
`181`	`181`
`182`	`182`	`bintray {`
`183`	`183`	`// You should configure "bintray.user" and "bintray.apiKey" in the gradle.properties`
`184`		`- // that in gradle cache directory (${HOME}/.gradle/gradle.properties)`
	`184`	`+ // that in gradle cache directory (～/.gradle/gradle.properties)`
`185`	`185`	`user = safeGetProperty("bintray.user")`
`186`	`186`	`key = safeGetProperty("bintray.apikey")`
`187`	`187`
Original file line number	Diff line number	Diff line change
`@@ -60,9 +60,10 @@ public static String getString(Context context, @StringRes int stringRes) {`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
	`63`	`+ @TargetApi(Build.VERSION_CODES.M)`
`63`	`64`	`@ColorInt`
`64`	`65`	`public static int getColor(Context context, @ColorRes int colorRes) {`
`65`		`- if (Build.VERSION.SDK_INT < 21) {`
	`66`	`+ if (Build.VERSION.SDK_INT < 23) {`
`66`	`67`	`//noinspection deprecation`
`67`	`68`	`return context.getResources().getColor(colorRes);`
`68`	`69`	`} else {`