时间选择器bug修复；联动选择器支持设置宽度填充

liyujiang-gzu · liyujiang-gzu · commit 13605c089bbb · 2017-08-19T18:15:58.000+08:00
diff --git a/README.md b/README.md
@@ -73,9 +73,9 @@ picker.setXXX(...);
 ```java
 picker.setOffset(...);
 ```   
-设置是否禁用循环
+设置启用循环
 ```java
-picker.setCycleDisable(...);
+picker.setCycleDisable(false);
 ```   
 设置每项的高度，范围为2-4
 ```java
@@ -85,6 +85,10 @@ picker.setLineSpaceMultiplier(...);
 ```java
 picker.setTextColor(...);
 ```   
+设置滚轮项填充宽度
+```java
+picker.setUseWeight(true);
+```   
 设置分隔线配置项，设置null将隐藏分割线及阴影
 ```java
 picker.setDividerConfig(...);
diff --git a/app/src/main/java/cn/qqtheme/androidpicker/MainActivity.java b/app/src/main/java/cn/qqtheme/androidpicker/MainActivity.java
@@ -187,6 +187,8 @@ public void onDatePicked(String month, String day) {
 
     public void onTimePicker(View view) {
         TimePicker picker = new TimePicker(this, TimePicker.HOUR_24);
+        picker.setUseWeight(true);
+        picker.setCycleDisable(false);
         picker.setRangeStart(0, 0);//00:00
         picker.setRangeEnd(23, 59);//23:59
         int currentHour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
@@ -303,6 +305,7 @@ public List<String> provideThirdData(int firstIndex, int secondIndex) {
         };
         LinkagePicker picker = new LinkagePicker(this, provider);
         picker.setCycleDisable(true);
+        picker.setUseWeight(false);
         picker.setLabel("小时制", "点");
         picker.setSelectedIndex(0, 8);
         //picker.setSelectedItem("12", "9");
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
@@ -134,20 +134,20 @@ protected View makeCenterView() {
         layout.setGravity(Gravity.CENTER);
 
         final WheelView provinceView = createWheelView();
-        provinceView.setUseWeight(true);
+        provinceView.setUseWeight(useWeight);
         provinceView.setLayoutParams(new LinearLayout.LayoutParams(0, WRAP_CONTENT, provinceWeight));
         layout.addView(provinceView);
         if (hideProvince) {
             provinceView.setVisibility(View.GONE);
         }
 
         final WheelView cityView = createWheelView();
-        cityView.setUseWeight(true);
+        cityView.setUseWeight(useWeight);
         cityView.setLayoutParams(new LinearLayout.LayoutParams(0, WRAP_CONTENT, cityWeight));
         layout.addView(cityView);
 
         final WheelView countyView = createWheelView();
-        countyView.setUseWeight(true);
+        countyView.setUseWeight(useWeight);
         countyView.setLayoutParams(new LinearLayout.LayoutParams(0, WRAP_CONTENT, countyWeight));
         layout.addView(countyView);
         if (hideCounty) {
diff --git a/library/WheelPicker/src/main/java/cn/qqtheme/framework/picker/DateTimePicker.java b/library/WheelPicker/src/main/java/cn/qqtheme/framework/picker/DateTimePicker.java
@@ -753,6 +753,7 @@ private void changeDayData(int selectedYear, int selectedMonth) {
     }
 
     private void initHourData() {
+        hours.clear();
         int currentHour = 0;
         if (!resetWhileWheel) {
             if (timeMode == HOUR_24) {
@@ -780,6 +781,7 @@ private void initHourData() {
     }
 
     private void changeMinuteData(int selectedHour) {
+        minutes.clear();
         if (startHour == endHour) {
             if (startMinute > endMinute) {
                 int temp = startMinute;
diff --git a/library/WheelPicker/src/main/java/cn/qqtheme/framework/picker/LinkagePicker.java b/library/WheelPicker/src/main/java/cn/qqtheme/framework/picker/LinkagePicker.java
@@ -39,6 +39,7 @@ public class LinkagePicker<Fst extends LinkageFirst<Snd>, Snd extends LinkageSec
     protected float firstColumnWeight = 1.0f;//第一级显示的宽度比重
     protected float secondColumnWeight = 1.0f;//第二级显示的宽度比重
     protected float thirdColumnWeight = 1.0f;//第三级显示的宽度比重
+    protected boolean useWeight = true;
     private OnPickListener onPickListener;
     private OnLinkageListener onLinkageListener;
     private OnWheelListener onWheelListener;
@@ -166,6 +167,10 @@ public void setLabel(String firstLabel, String secondLabel, String thirdLabel) {
         this.thirdLabel = thirdLabel;
     }
 
+    public void setUseWeight(boolean useWeight) {
+        this.useWeight = useWeight;
+    }
+
     public Fst getSelectedFirstItem() {
         if (selectedFirstItem == null) {
             //noinspection unchecked
@@ -273,6 +278,7 @@ protected View makeCenterView() {
         layout.setGravity(Gravity.CENTER);
 
         final WheelView firstView = createWheelView();
+        firstView.setUseWeight(useWeight);
         firstView.setLayoutParams(new LinearLayout.LayoutParams(0, WRAP_CONTENT, firstColumnWeight));
         //firstView.setLabel(firstLabel);
         layout.addView(firstView);
@@ -283,6 +289,7 @@ protected View makeCenterView() {
         }
 
         final WheelView secondView = createWheelView();
+        secondView.setUseWeight(useWeight);
         secondView.setLayoutParams(new LinearLayout.LayoutParams(0, WRAP_CONTENT, secondColumnWeight));
         //secondView.setLabel(secondLabel);
         layout.addView(secondView);
@@ -293,6 +300,7 @@ protected View makeCenterView() {
         }
 
         final WheelView thirdView = createWheelView();
+        thirdView.setUseWeight(useWeight);
         if (!provider.isOnlyTwo()) {
             thirdView.setLayoutParams(new LinearLayout.LayoutParams(0, WRAP_CONTENT, thirdColumnWeight));
             //thirdView.setLabel(thirdLabel);

Original file line number	Diff line number	Diff line change
`@@ -753,6 +753,7 @@ private void changeDayData(int selectedYear, int selectedMonth) {`
`753`	`753`	`}`
`754`	`754`
`755`	`755`	`private void initHourData() {`
	`756`	`+ hours.clear();`
`756`	`757`	`int currentHour = 0;`
`757`	`758`	`if (!resetWhileWheel) {`
`758`	`759`	`if (timeMode == HOUR_24) {`
`@@ -780,6 +781,7 @@ private void initHourData() {`
`780`	`781`	`}`
`781`	`782`
`782`	`783`	`private void changeMinuteData(int selectedHour) {`
	`784`	`+ minutes.clear();`
`783`	`785`	`if (startHour == endHour) {`
`784`	`786`	`if (startMinute > endMinute) {`
`785`	`787`	`int temp = startMinute;`