Skip to content

Commit 5e697b3

Browse files
liyujiang-gzuliyujiang-gzu
committed
2 parents 851a4ef + a734bec commit 5e697b3

18 files changed

Lines changed: 278 additions & 79 deletions

File tree

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/*.iml
22
/gradlew
33
/*/*.iml
4-
/gradle
54
/.idea
65
/gradlew.bat
76
bin/

‎ChangeLog.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
### v1.5.3 - 2017.07.01
2+
修复默认无法选中第一项的问题；
3+
新增日期时间选择器联动时是否重置下一级的索引的控制方法;
4+
修复日期选择器setSelectedItem传值错误可能导致的奔溃问题;
5+
新增多项选择器；
16
### v1.5.2 - 2017.05.14
27
有童鞋反应动画太慢，移除选择器默认的动画；
38
DoublePicker支持设置前缀及后缀标签;

‎README.md‎

Lines changed: 45 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@
1010
[查看更新日志](https://github.com/gzu-liyujiang/AndroidPicker/blob/master/ChangeLog.md)，新版本可能未对旧版API作兼容处理，升级后若编译报错请根据错误提示更改。
1111

1212
# Install
13-
“app”是测试用例；“library”包括WheelPicker、ColorPicker、FilePicker，
13+
“app”是测试用例；“library”包括WheelPicker、ColorPicker、FilePicker、MultiplePicker，
1414
WheelPicker包括DatePicker、TimePicker、OptionPicker、LinkagePicker、AddressPicker、NumberPicker、DoublePicker等。
15-
#### ~~懒人建议直接远程加载jcenter里的~~
15+
#### 懒人建议直接远程加载jcenter里的
1616
WheelPicker、FilePicker及ColorPicker是独立的，需要用哪个就compile哪个。
1717
latest.release表示使用最新版，也可以[参照此处指定具体的版本号](https://github.com/gzu-liyujiang/AndroidPicker/releases)，~~1.3.x之前的版本基于ScrollView，1.4.x版本基于ListView~~，1.5.x之后的版本基于View：
1818
```groovy
1919
dependencies {
20-
compile 'cn.qqtheme.framework:WheelPicker:版本号'
21-
compile 'cn.qqtheme.framework:FilePicker:版本号'
22-
compile 'cn.qqtheme.framework:ColorPicker:版本号'
23-
}
24-
```
25-
如果出现“All com.android.support libraries must use the exact same version specification”这种错误，请将依赖改为：
26-
```
27-
compile('cn.qqtheme.framework:WheelPicker:版本号') {
28-
exclude group: 'com.android.support'
20+
compile('cn.qqtheme.framework:WheelPicker:版本号') {
21+
exclude group: 'com.android.support'
22+
}
23+
compile('cn.qqtheme.framework:FilePicker:版本号') {
24+
exclude group: 'com.android.support'
25+
}
26+
compile('cn.qqtheme.framework:ColorPicker:版本号') {
27+
exclude group: 'com.android.support'
28+
}
2929
}
3030
```
3131
#### 若jcenter仓库里的无法下载的话，可换[JitPack](https://jitpack.io/#gzu-liyujiang/AndroidPicker)的仓库试试：
@@ -40,9 +40,15 @@ repositories {
4040
第二步，在项目的app模块下的build.gradle里加：
4141
```
4242
dependencies {
43-
compile 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:版本号'
44-
compile 'com.github.gzu-liyujiang.AndroidPicker:FilePicker:版本号'
45-
compile 'com.github.gzu-liyujiang.AndroidPicker:ColorPicker:版本号'
43+
compile('com.github.gzu-liyujiang.AndroidPicker:WheelPicker:版本号') {
44+
exclude group: 'com.android.support'
45+
}
46+
compile('com.github.gzu-liyujiang.AndroidPicker:FilePicker:版本号') {
47+
exclude group: 'com.android.support'
48+
}
49+
compile('com.github.gzu-liyujiang.AndroidPicker:ColorPicker:版本号') {
50+
exclude group: 'com.android.support'
51+
}
4652
}
4753
```
4854
#### 使用Eclipse的话如何集成？
@@ -61,12 +67,33 @@ dependencies {
6167
各种设置方法：
6268
```java
6369
picker.setXXX(...);
64-
```
65-
自定义顶部及底部视图：
70+
```
71+
如：
72+
设置选项偏移量，可用来要设置显示的条目数，范围为1-5，1显示3行、2显示5行、3显示7行……
73+
```java
74+
picker.setOffset(...);
75+
```
76+
设置是否禁用循环
77+
```java
78+
picker.setCycleDisable(...);
79+
```
80+
设置每项的高度，范围为2-4
81+
```java
82+
picker.setLineSpaceMultiplier(...);
83+
```
84+
设置文字颜色
85+
```java
86+
picker.setTextColor(...);
87+
```
88+
设置分隔线配置项，设置null将隐藏分割线及阴影
89+
```java
90+
picker.setDividerConfig(...);
91+
```
92+
自定义顶部及底部视图
6693
```java
6794
picker.setHeaderView(...);
6895
picker.setFooterView(...);
69-
```
96+
```
7097
自定义选择器示例：
7198
```java
7299
CustomHeaderAndFooterPicker picker = new CustomHeaderAndFooterPicker(this);
@@ -81,6 +108,7 @@ picker.setFooterView(...);
81108
<font color="#FF0000">核心滚轮控件为WheelView，可以参照SinglePicker、DateTimePicker及LinkagePicker自行扩展。</font>
82109

83110
# Screenshots
111+
以下图片显示的效果可能已修改过，实际效果请运行demo查看。
84112
![滑轮选择器内嵌效果图](/screenshots/nestwheelview.jpg)
85113
![自定义选择器效果图](/screenshots/custom.gif)
86114
![日期选择器效果图](/screenshots/date.gif)

‎app/build.gradle‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,12 @@ dependencies {
2626
compile project(':library:WheelPicker')
2727
compile project(':library:FilePicker')
2828
compile project(':library:ColorPicker')
29-
// compile files('libs/AndroidPicker-1.5.2.jar')
29+
compile project(':library:MultiplePicker')
30+
// compile files('libs/AndroidPicker-1.5.3.jar')
3031
// compile 'cn.qqtheme.framework:WheelPicker:latest.release'
3132
// compile 'cn.qqtheme.framework:FilePicker:latest.release'
3233
// compile 'cn.qqtheme.framework:ColorPicker:latest.release'
33-
// compile 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:1.5.2'
34-
// compile 'com.github.gzu-liyujiang.AndroidPicker:FilePicker:1.5.2'
35-
// compile 'com.github.gzu-liyujiang.AndroidPicker:ColorPicker:1.5.2'
34+
// compile 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:1.5.3'
35+
// compile 'com.github.gzu-liyujiang.AndroidPicker:FilePicker:1.5.3'
36+
// compile 'com.github.gzu-liyujiang.AndroidPicker:ColorPicker:1.5.3'
3637
}

‎app/src/main/assets/city.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7011,7 +7011,7 @@
70117011
"counties": [
70127012
{
70137013
"areaId": "411502",
7014-
"areaName": "负忧"
7014+
"areaName": "负忧"
70157015
},
70167016
{
70177017
"areaId": "411503",
@@ -14261,4 +14261,4 @@
1426114261
}
1426214262
]
1426314263
}
14264-
]
14264+
]

‎app/src/main/java/cn/qqtheme/androidpicker/MainActivity.java‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import cn.qqtheme.framework.picker.DoublePicker;
2828
import cn.qqtheme.framework.picker.FilePicker;
2929
import cn.qqtheme.framework.picker.LinkagePicker;
30+
import cn.qqtheme.framework.picker.MultiplePicker;
3031
import cn.qqtheme.framework.picker.NumberPicker;
3132
import cn.qqtheme.framework.picker.OptionPicker;
3233
import cn.qqtheme.framework.picker.TimePicker;
@@ -106,10 +107,11 @@ public void onYearMonthDayPicker(View view) {
106107
final DatePicker picker = new DatePicker(this);
107108
picker.setCanceledOnTouchOutside(true);
108109
picker.setUseWeight(true);
109-
picker.setTopPadding(ConvertUtils.toPx(this, 20));
110+
picker.setTopPadding(ConvertUtils.toPx(this, 10));
110111
picker.setRangeEnd(2111, 1, 11);
111112
picker.setRangeStart(2016, 8, 29);
112113
picker.setSelectedItem(2050, 10, 14);
114+
picker.setResetWhileWheel(false);
113115
picker.setOnDatePickListener(new DatePicker.OnYearMonthDayPickListener() {
114116
@Override
115117
public void onDatePicked(String year, String month, String day) {
@@ -234,9 +236,10 @@ public void onDoublePicker(View view) {
234236
final DoublePicker picker = new DoublePicker(this, firstData, secondData);
235237
picker.setDividerVisible(true);
236238
picker.setCycleDisable(false);
237-
picker.setSelectedIndex(2, 1);
239+
picker.setSelectedIndex(0, 0);
238240
picker.setFirstLabel("于", null);
239241
picker.setSecondLabel("骑/乘", "出发");
242+
picker.setTextSize(12);
240243
picker.setOnPickListener(new DoublePicker.OnPickListener() {
241244
@Override
242245
public void onPicked(int selectedFirstIndex, int selectedSecondIndex) {
@@ -246,6 +249,17 @@ public void onPicked(int selectedFirstIndex, int selectedSecondIndex) {
246249
picker.show();
247250
}
248251

252+
public void onMultiplePicker(View view) {
253+
MultiplePicker picker = new MultiplePicker(this, new String[]{"穿青人", "少数民族", "已识别民族", "未定民族"});
254+
picker.setOnItemPickListener(new MultiplePicker.OnItemPickListener() {
255+
@Override
256+
public void onItemPicked(int count, List<String> items) {
257+
showToast("已选" + count + "项：" + items);
258+
}
259+
});
260+
picker.show();
261+
}
262+
249263
public void onLinkagePicker(View view) {
250264
//联动选择器的更多用法，可参见AddressPicker和CarNumberPicker
251265
LinkagePicker.DataProvider provider = new LinkagePicker.DataProvider() {

‎app/src/main/res/layout/activity_main.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@
8484
android:onClick="onDoublePicker"
8585
android:text="双项选择"/>
8686

87+
<Button
88+
android:layout_width="match_parent"
89+
android:layout_height="wrap_content"
90+
android:onClick="onMultiplePicker"
91+
android:text="多项选择"/>
92+
8793
<Button
8894
android:layout_width="match_parent"
8995
android:layout_height="wrap_content"

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.1.2'
8+
classpath 'com.android.tools.build:gradle:2.1.3'
99
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
1010
}
1111
}

‎gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ com.android.build.gradle.overridePathCheck=true
1515
#android.useDeprecatedNdk=true
1616

1717
#下面定义一些常量供gradle脚本使用
18-
VERSION_NAME=1.5.2
19-
VERSION_CODE=152
18+
VERSION_NAME=1.5.3
19+
VERSION_CODE=153
2020
COMPILE_SDK_VERSION=23
2121
MIN_SDK_VERSION=14
2222
#安卓6.0开始(API23+)，需要动态申请权限

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Fri Mar 03 00:22:35 CST 2017
1+
#Sat Jun 24 17:00:52 CST 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)