v0.2.0

- 升级工程编译工具版本
- 升级3D滚轮控件
- 完善字体大小自适应
- 微调选中项改变监听器

Author: imkarl

README.md

@@ -5,7 +5,15 @@
 可实现单项选择，并支持一二三级联动效果
 高仿iOS的滚轮效果，实现字体大小自适应
 
-### Demo
+### ChangeLog
+
+#### 0.2.0
+- 升级工程编译工具版本
+- 升级3D滚轮控件
+- 完善字体大小自适应
+- 微调选中项改变监听器
+
+### Useage
 
     //选项选择器
     CharacterPickerWindow mOptions = new CharacterPickerWindow(activity);
@@ -14,17 +22,17 @@
     //设置默认选中的三级项目
     mOptions.setSelectOptions(0, 0, 0);
     //监听确定选择按钮
-    mOptions.setOnoptionsSelectListener(new CharacterPickerWindow.OnOptionsSelectListener() {
+    mOptions.setOnoptionsSelectListener(new OnOptionChangedListener() {
         @Override
-        public void onOptionsSelect(int options1, int option2, int options3) {
+        public void onOptionChanged(int options1, int option2, int options3) {
             // TODO 处理选择结果
         }
     });
     mOptions.showAtLocation(v, Gravity.BOTTOM, 0, 0);
-        
 
-### 效果图
-![效果图](./Screenshot/Screenshot_2015-11-13-154813.gif)
+
+### Preview
+![Preview](./Screenshot/Screenshot_2015-11-13-154813.gif)
 
 ##How to
 
@@ -37,7 +45,7 @@ repositories {
 - Step 2. 在你的app build.gradle 的 dependencies 中添加依赖
 ```
 dependencies {
-	compile 'com.github.imkarl:CharacterPickerView:v0.1'
+	compile 'com.github.imkarl:CharacterPickerView:v0.2.0'
 }
 ```
 

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:2.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

demo/build.gradle

@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.2"
 
     defaultConfig {
         applicationId "cn.jeesoft.demo"
         minSdkVersion 11
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 1
-        versionName "1.0"
+        versionName "0.2.0"
     }
     buildTypes {
         release {
@@ -21,6 +21,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:23.1.0'
+    compile 'com.android.support:appcompat-v7:24.2.0'
     compile project(':library')
 }

demo/src/main/java/cn/jeesoft/demo/ArrayDataDemo.java

@@ -1,9 +1,6 @@
 package cn.jeesoft.demo;
 
-import android.content.Context;
-
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;

demo/src/main/java/cn/jeesoft/demo/MainActivity.java

@@ -11,9 +11,9 @@
 
 import cn.jeesoft.widget.pickerview.CharacterPickerView;
 import cn.jeesoft.widget.pickerview.CharacterPickerWindow;
+import cn.jeesoft.widget.pickerview.OnOptionChangedListener;
 
 public class MainActivity extends AppCompatActivity {
-    private RelativeLayout.LayoutParams layoutParams;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -30,7 +30,7 @@ private void showView() {
         RelativeLayout layout = new RelativeLayout(this);
         setContentView(layout);
 
-        layoutParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         layoutParams.addRule(RelativeLayout.CENTER_IN_PARENT);
 
         CharacterPickerView pickerView = new CharacterPickerView(this);
@@ -40,9 +40,9 @@ private void showView() {
         OptionsWindowHelper.setPickerData(pickerView);
 
         //设置监听事件
-        pickerView.setOnOptionChangedListener(new CharacterPickerView.OnOptionChangedListener() {
+        pickerView.setOnOptionChangedListener(new OnOptionChangedListener() {
             @Override
-            public void onOptionChanged(CharacterPickerView view, int option1, int option2, int option3) {
+            public void onOptionChanged(int option1, int option2, int option3) {
                 Log.e("test", option1 + "," + option2 + "," + option3);
             }
         });

demo/src/main/java/cn/jeesoft/demo/OptionsWindowHelper.java

@@ -9,6 +9,7 @@
 
 import cn.jeesoft.widget.pickerview.CharacterPickerView;
 import cn.jeesoft.widget.pickerview.CharacterPickerWindow;
+import cn.jeesoft.widget.pickerview.OnOptionChangedListener;
 
 /**
  * 地址选择器
@@ -21,8 +22,8 @@ public class OptionsWindowHelper {
     private static List<List<String>> options2Items = null;
     private static List<List<List<String>>> options3Items = null;
 
-    public static interface OnOptionsSelectListener {
-        public void onOptionsSelect(String province, String city, String area);
+    public interface OnOptionsSelectListener {
+        void onOptionsSelect(String province, String city, String area);
     }
 
     private OptionsWindowHelper() {
@@ -36,13 +37,13 @@ public static CharacterPickerWindow builder(Activity activity, final OnOptionsSe
         //设置默认选中的三级项目
         mOptions.setSelectOptions(0, 0, 0);
         //监听确定选择按钮
-        mOptions.setOnoptionsSelectListener(new CharacterPickerWindow.OnOptionsSelectListener() {
+        mOptions.setOnoptionsSelectListener(new OnOptionChangedListener() {
             @Override
-            public void onOptionsSelect(int options1, int option2, int options3) {
+            public void onOptionChanged(int option1, int option2, int option3) {
                 if (listener != null) {
-                    String province = options1Items.get(options1);
-                    String city = options2Items.get(options1).get(option2);
-                    String area = options3Items.get(options1).get(option2).get(options3);
+                    String province = options1Items.get(option1);
+                    String city = options2Items.get(option1).get(option2);
+                    String area = options3Items.get(option1).get(option2).get(option3);
                     listener.onOptionsSelect(province, city, area);
                 }
             }
@@ -55,9 +56,9 @@ public void onOptionsSelect(int options1, int option2, int options3) {
      */
     public static void setPickerData(CharacterPickerView view) {
         if (options1Items == null) {
-            options1Items = new ArrayList();
+            options1Items = new ArrayList<>();
             options2Items = new ArrayList<>();
-            options3Items = new ArrayList();
+            options3Items = new ArrayList<>();
 
             final Map<String, Map<String, List<String>>> allCitys = ArrayDataDemo.getAll();
             for (Map.Entry<String, Map<String, List<String>>> entry1 : allCitys.entrySet()) {
@@ -66,15 +67,15 @@ public static void setPickerData(CharacterPickerView view) {
 
                 options1Items.add(key1);
 
-                ArrayList options2Items01 = new ArrayList();
+                List<String> options2Items01 = new ArrayList<>();
                 List<List<String>> options3Items01 = new ArrayList<>();
                 for (Map.Entry<String, List<String>> entry2 : value1.entrySet()) {
                     String key2 = entry2.getKey();
                     List<String> value2 = entry2.getValue();
 
                     options2Items01.add(key2);
                     Collections.sort(value2);
-                    options3Items01.add(new ArrayList(value2));
+                    options3Items01.add(new ArrayList<>(value2));
                 }
                 Collections.sort(options2Items01);
                 options2Items.add(options2Items01);