Skip to content

Commit bbfbcdb

Browse files
liyujiang-gzuliyujiang-gzu
committed
改代码布局为XML布局，可视化方便修改；更新效果图
1 parent 21ff5e2 commit bbfbcdb

21 files changed

Lines changed: 148 additions & 143 deletions

File tree

‎.gitignore‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
.gradle/
2-
build/
3-
/*/build/
4-
local.properties
5-
.idea
1+
/.gradle
2+
/build
3+
/local.properties
4+
/.idea
5+
/*.iml

‎README.md‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# About
1+
# Summary
22
安卓选择器类库，包括日期时间选择器、一二三级联动选择器、城市选择器、颜色选择器、文件目录选择器、数字选择器。
33
Picker for android, include date&time/option/color/file&directory/number.
44

@@ -13,12 +13,13 @@ dependencies {
1313
}
1414
```
1515
注：
16+
gradle为1.3.0，buildTools为23.0.1，sdk为23。
1617
滑轮选择器的名称较长时，将以“...”显示超出的部分。
17-
支持android2.2+，项目编码为UTF-8。
18+
支持android2.2+，项目编码为UTF-8。
1819

19-
# Simple
20+
# Sample
2021
日期选择器：
21-
```java
22+
```java
2223
DateTimePicker picker = new DateTimePicker(this);
2324
picker.setMode(DateTimePicker.Mode.YEAR_MONTH_DAY);
2425
picker.setRange(1990, 2015);
@@ -33,7 +34,7 @@ dependencies {
3334
```
3435

3536
时间选择器：
36-
```java
37+
```java
3738
DateTimePicker picker = new DateTimePicker(this);
3839
picker.setMode(DateTimePicker.Mode.HOUR_MINUTE);
3940
picker.setOnWheelListener(new WheelPicker.OnWheelListener<Date>() {
@@ -46,7 +47,7 @@ dependencies {
4647
```
4748

4849
单项选择器（可用于性别、学历、职业等选择）：
49-
```java
50+
```java
5051
OptionPicker picker = new OptionPicker(this);
5152
picker.setScrollingDuration(100);
5253
final String[] sex = {"男", "女", "保密"};
@@ -62,7 +63,7 @@ dependencies {
6263
```
6364

6465
二级联动选择器：
65-
```java
66+
```java
6667
final ArrayList<String> option1 = new ArrayList<String>();
6768
option1.add("技术方案");
6869
option1.add("开发工具");
@@ -100,7 +101,7 @@ dependencies {
100101
```
101102

102103
三级联动选择器(参见城市选择器@CityPicker)：
103-
```java
104+
```java
104105
final ArrayList<String> option1 = new ArrayList<String>();
105106
option1.add("贵州省");
106107
option1.add("北京市");
@@ -147,7 +148,7 @@ dependencies {
147148
```
148149

149150
颜色选择器：
150-
```java
151+
```java
151152
ColorPicker picker = new ColorPicker(this);
152153
picker.setInitColor(0xDD00DD);
153154
picker.setOnColorPickListener(new ColorPicker.OnColorPickListener() {
@@ -160,7 +161,7 @@ dependencies {
160161
```
161162

162163
文件选择器：
163-
```java
164+
```java
164165
FilePicker picker = new FilePicker(this);
165166
picker.setMode(FilePicker.Mode.File);
166167
picker.setShowHideDir(false);
@@ -176,7 +177,7 @@ dependencies {
176177
```
177178

178179
目录选择器：
179-
```java
180+
```java
180181
FilePicker picker = new FilePicker(this);
181182
picker.setMode(FilePicker.Mode.Directory);
182183
picker.setOnFilePickListener(new FilePicker.OnFilePickListener() {
@@ -188,7 +189,7 @@ dependencies {
188189
picker.showAtBottom();
189190
```
190191
数字选择器(可用于身高、体重、年龄等选择)：
191-
```java
192+
```java
192193
NumberPicker picker = new NumberPicker(this);
193194
picker.setRange(145, 200);
194195
picker.setSelectedNumber(172);
@@ -202,7 +203,7 @@ dependencies {
202203
picker.showAtBottom();
203204
```
204205
城市选择器：
205-
```java
206+
```java
206207
CityPicker picker = new CityPicker(activity);
207208
picker.setSelectedCity("贵州", "毕节", "纳雍");
208209
picker.setOnCityPickListener(new CityPicker.OnCityPickListener() {
@@ -228,7 +229,6 @@ https://github.com/alibaba/fastjson<br />
228229
![时间选择器效果图](/screenshots/timepicker.jpg)
229230
![单项选择器效果图](/screenshots/1optionpicker.jpg)
230231
![二级联动选择器效果图](/screenshots/2optionpicker.jpg)
231-
![三级联动选择器效果图](/screenshots/3optionpicker.jpg)
232232
![颜色选择器效果图](/screenshots/colorpicker.jpg)
233233
![文件选择器效果图](/screenshots/filepicker.jpg)
234234
![目录选择器效果图](/screenshots/dirpicker.jpg)

‎app/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
/build
2+
/*.iml

‎app/app.iml‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,32 +65,25 @@
6565
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
6767
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
68-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6968
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
69+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
7170
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7271
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
72+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.0/jars" />
7573
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
76-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
8074
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
8275
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
8476
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8577
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8678
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
8780
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
8881
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8982
</content>
9083
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
9184
<orderEntry type="sourceFolder" forTests="false" />
92-
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
93-
<orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
85+
<orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
86+
<orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
9487
<orderEntry type="module" module-name="framework-picker" exported="" />
9588
</component>
9689
</module>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void onTimePicker(View view) {
5858
picker.setOnWheelListener(new WheelPicker.OnWheelListener<Date>() {
5959
@Override
6060
public void onSubmit(Date result) {
61-
showToast(result.toLocaleString());
61+
showToast(result.getHours() + ":" + result.getMinutes());
6262
}
6363
});
6464
picker.showAtBottom();

‎framework-picker/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
/build
2+
/*.iml

‎framework-picker/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
22

33
android {
44
compileSdkVersion 23
5-
buildToolsVersion "23.0.0"
5+
buildToolsVersion "23.0.1"
66

77
defaultConfig {
88
minSdkVersion 8
@@ -13,7 +13,7 @@ android {
1313
buildTypes {
1414
release {
1515
minifyEnabled false
16-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
16+
proguardFiles 'proguard-rules.pro'
1717
}
1818
}
1919
}

‎framework-picker/framework-picker.iml‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,22 +65,13 @@
6565
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6767
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
6869
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6970
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
7071
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
71-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
7272
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
7573
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
76-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
7974
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
8475
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8576
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8677
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
@@ -89,7 +80,7 @@
8980
</content>
9081
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
9182
<orderEntry type="sourceFolder" forTests="false" />
92-
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
93-
<orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
83+
<orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
84+
<orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
9485
</component>
9586
</module>

‎framework-picker/src/main/AndroidManifest.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:tools="http://schemas.android.com/tools"
23
package="cn.qqtheme.framework.picker">
34

45
<application
56
android:allowBackup="true"
67
android:label="@string/app_name"
7-
android:supportsRtl="true">
8+
android:supportsRtl="true"
9+
tools:ignore="GoogleAppIndexingWarning">
810

911
</application>
1012

‎framework-picker/src/main/java/cn/qqtheme/framework/Config.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package cn.qqtheme.framework;
22

3+
import cn.qqtheme.framework.picker.BuildConfig;
4+
35
/**
46
* 框架配置
57
*
@@ -8,6 +10,6 @@
810
* Created By IntelliJ IDEA
911
*/
1012
public class Config {
11-
public static final boolean DEBUG_ENABLE = true;// 是否调试模式
13+
public static final boolean DEBUG_ENABLE = BuildConfig.DEBUG;// 是否调试模式
1214
public static final String DEBUG_TAG = "liyujiang";// LogCat的标记
1315
}

0 commit comments

Comments
 (0)