添加双项选择器，类似于2级联动选择器，但数据不联动

chaunqingren · chaunqingren · commit 4d4da537760b · 2017-05-02T23:29:38.000+08:00
diff --git a/README.md b/README.md
@@ -4,14 +4,14 @@
 [![JitPack](https://jitpack.io/v/gzu-liyujiang/AndroidPicker.svg)](https://jitpack.io/#gzu-liyujiang/AndroidPicker)
 [![Build Status](https://travis-ci.org/gzu-liyujiang/AndroidPicker.svg?branch=master)](https://travis-ci.org/gzu-liyujiang/AndroidPicker)
 
-安卓选择器类库，包括日期及时间选择器（可设置范围）、单项选择器（可用于性别、职业、学历、星座等）、城市地址选择器（分省级、地级及县级）、数字选择器（可用于年龄、身高、体重、温度等）、颜色选择器、文件及目录选择器等……
+安卓选择器类库，包括日期及时间选择器（可设置范围）、单项选择器（可用于性别、职业、学历、星座等）、城市地址选择器（分省级、地级及县级）、数字选择器（可用于年龄、身高、体重、温度等）、双项选择器、颜色选择器、文件及目录选择器等……
 欢迎大伙儿在[Issues](https://github.com/gzu-liyujiang/AndroidPicker/issues)提交你的意见或建议。    
 欢迎Fork & Pull requests贡献您的代码，大家共同学习【[AndroidPicker交流群 604235437](https://jq.qq.com/?_wv=1027&k=42bKOeD)】。
 [查看更新日志](https://github.com/gzu-liyujiang/AndroidPicker/blob/master/ChangeLog.md)，新版本可能未对旧版API作兼容处理，升级后若编译报错请根据错误提示更改。
 
 # Install
 “app”是测试用例；“library”包括WheelPicker、ColorPicker、FilePicker，
-WheelPicker包括DatePicker、TimePicker、OptionPicker、LinkagePicker、AddressPicker、NumberPicker、CarNumberPicker等。
+WheelPicker包括DatePicker、TimePicker、OptionPicker、LinkagePicker、AddressPicker、NumberPicker、DoublePicker等。
 #### ~~懒人建议直接远程加载jcenter里的~~
 WheelPicker、FilePicker及ColorPicker是独立的，需要用哪个就compile哪个。
 latest.release表示使用最新版，也可以[参照此处指定具体的版本号](https://github.com/gzu-liyujiang/AndroidPicker/releases)，1.3.x之前的版本基于ScrollView，1.4.x版本基于ListView，1.5.x之后的版本基于View：
@@ -78,7 +78,7 @@ picker.setFooterView(...);
         });
         picker.show();
 ```
-核心滚轮控件为WheelView，可以参照SinglePicker、DateTimePicker及LinkagePicker自行扩展。
+<font color="#FF0000">核心滚轮控件为WheelView，可以参照SinglePicker、DateTimePicker及LinkagePicker自行扩展。</font>
 
 # Screenshots
 ![滑轮选择器内嵌效果图](/screenshots/nestwheelview.jpg)
@@ -95,9 +95,9 @@ picker.setFooterView(...);
 ![目录选择器效果图](/screenshots/dir.png)
 
 # Thanks
-[基于View的WheelView](https://github.com/weidongjian/androidWheelView)
-[基于ListView的WheelView](https://github.com/venshine/WheelView)
-[基于ScrollView的WheelView](https://github.com/wangjiegulu/WheelView)
+[基于View的WheelView](https://github.com/weidongjian/androidWheelView)<br />
+[基于ListView的WheelView](https://github.com/venshine/WheelView)<br />
+[基于ScrollView的WheelView](https://github.com/wangjiegulu/WheelView)<br />
 
 
 # Contact
diff --git a/app/src/main/java/cn/qqtheme/androidpicker/MainActivity.java b/app/src/main/java/cn/qqtheme/androidpicker/MainActivity.java
@@ -22,6 +22,7 @@
 import cn.qqtheme.framework.picker.ColorPicker;
 import cn.qqtheme.framework.picker.DatePicker;
 import cn.qqtheme.framework.picker.DateTimePicker;
+import cn.qqtheme.framework.picker.DoublePicker;
 import cn.qqtheme.framework.picker.FilePicker;
 import cn.qqtheme.framework.picker.LinkagePicker;
 import cn.qqtheme.framework.picker.NumberPicker;
@@ -216,6 +217,31 @@ public void onOptionPicked(int index, String item) {
         picker.show();
     }
 
+    public void onDoublePicker(View view) {
+        final ArrayList<String> firstData = new ArrayList<>();
+        firstData.add("2017年5月2日星期二");
+        firstData.add("2017年5月3日星期三");
+        firstData.add("2017年5月4日星期四");
+        firstData.add("2017年5月5日星期五");
+        firstData.add("2017年5月6日星期六");
+        final ArrayList<String> secondData = new ArrayList<>();
+        secondData.add("电动自行车");
+        secondData.add("二轮摩托车");
+        secondData.add("私家小汽车");
+        secondData.add("公共交通汽车");
+        final DoublePicker picker = new DoublePicker(this, firstData, secondData);
+        picker.setDividerVisible(false);
+        picker.setShadowColor(Color.DKGRAY, 80);
+        picker.setSelectedIndex(2, 1);
+        picker.setOnPickListener(new DoublePicker.OnPickListener() {
+            @Override
+            public void onPicked(int selectedFirstIndex, int selectedSecondIndex) {
+                showToast(firstData.get(selectedFirstIndex) + " " + secondData.get(selectedSecondIndex));
+            }
+        });
+        picker.show();
+    }
+
     public void onLinkagePicker(View view) {
         LinkagePicker.DataProvider provider = new LinkagePicker.DataProvider() {
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -78,6 +78,12 @@
                 android:onClick="onOptionPicker"
                 android:text="单项选择"/>
 
+            <Button
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:onClick="onDoublePicker"
+                android:text="双项选择"/>
+
             <Button
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/library/WheelPicker/src/main/java/cn/qqtheme/framework/picker/DoublePicker.java b/library/WheelPicker/src/main/java/cn/qqtheme/framework/picker/DoublePicker.java
@@ -2,25 +2,127 @@
 
 import android.app.Activity;
 import android.support.annotation.NonNull;
+import android.view.Gravity;
 import android.view.View;
+import android.widget.LinearLayout;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import cn.qqtheme.framework.widget.WheelView;
 
 /**
  * 双项选择器，选择两项，数据不联动。
- * <p>
+ * <p/>
  * Author:李玉江[QQ:1032694760]
  * DateTime:2017/5/1 8:34
  * Builder:Android Studio
  */
 public class DoublePicker extends WheelPicker {
+    private List<String> firstData = new ArrayList<>();
+    private List<String> secondData = new ArrayList<>();
+    private int selectedFirstIndex = 0;
+    private int selectedSecondIndex = 0;
+    private OnWheelListener onWheelListener;
+    private OnPickListener onPickListener;
 
-    public DoublePicker(Activity activity) {
+    public DoublePicker(Activity activity, List<String> firstData, List<String> secondData) {
         super(activity);
+        this.firstData = firstData;
+        this.secondData = secondData;
+    }
+
+    public void setSelectedIndex(int firstIndex, int secondIndex) {
+        if (firstIndex >= 0 && firstIndex < firstData.size()) {
+            selectedFirstIndex = firstIndex;
+        }
+        if (secondIndex >= 0 && secondIndex < secondData.size()) {
+            selectedSecondIndex = secondIndex;
+        }
+    }
+
+    public String getSelectedFirstItem() {
+        if (firstData.size() > selectedFirstIndex) {
+            return firstData.get(selectedFirstIndex);
+        }
+        return "";
+    }
+
+    public String getSelectedSecondItem() {
+        if (secondData.size() > selectedSecondIndex) {
+            return secondData.get(selectedSecondIndex);
+        }
+        return "";
     }
 
     @NonNull
     @Override
     protected View makeCenterView() {
-        throw new RuntimeException("Stub");
+        LinearLayout layout = new LinearLayout(activity);
+        layout.setOrientation(LinearLayout.HORIZONTAL);
+        layout.setGravity(Gravity.CENTER);
+        final WheelView firstView = createWheelView();
+        firstView.setLayoutParams(new LinearLayout.LayoutParams(0, WRAP_CONTENT, 1.0f));
+        layout.addView(firstView);
+        final WheelView secondView = createWheelView();
+        secondView.setLayoutParams(new LinearLayout.LayoutParams(0, WRAP_CONTENT, 1.0f));
+        layout.addView(secondView);
+        firstView.setItems(firstData, selectedFirstIndex);
+        firstView.setOnItemSelectListener(new WheelView.OnItemSelectListener() {
+            @Override
+            public void onSelected(int index) {
+                selectedFirstIndex = index;
+                if (onWheelListener != null) {
+                    onWheelListener.onFirstWheeled(selectedFirstIndex, firstData.get(selectedFirstIndex));
+                }
+            }
+        });
+        secondView.setItems(secondData, selectedSecondIndex);
+        secondView.setOnItemSelectListener(new WheelView.OnItemSelectListener() {
+            @Override
+            public void onSelected(int index) {
+                selectedSecondIndex = index;
+                if (onWheelListener != null) {
+                    onWheelListener.onSecondWheeled(selectedSecondIndex, secondData.get(selectedSecondIndex));
+                }
+            }
+        });
+        return layout;
+    }
+
+    @Override
+    public void onSubmit() {
+        if (onPickListener != null) {
+            onPickListener.onPicked(selectedFirstIndex, selectedSecondIndex);
+        }
+    }
+
+    public void setOnWheelListener(OnWheelListener onWheelListener) {
+        this.onWheelListener = onWheelListener;
+    }
+
+    public void setOnPickListener(OnPickListener onPickListener) {
+        this.onPickListener = onPickListener;
+    }
+
+    /**
+     * 数据条目滑动监听器
+     */
+    public interface OnWheelListener {
+
+        void onFirstWheeled(int index, String item);
+
+        void onSecondWheeled(int index, String item);
+
+    }
+
+    /**
+     * 数据选择完成监听器
+     */
+    public interface OnPickListener {
+
+        void onPicked(int selectedFirstIndex, int selectedSecondIndex);
+
     }
 
 }
