未来时间选择优化

yijiebuyi · Apr 12, 2018 · e142043 · e142043
1 parent 91fb2ef
commit e142043
Show file tree

Hide file tree

Showing 40 changed files with 636 additions and 263 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -28,5 +28,5 @@ dependencies {
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     testCompile 'junit:junit:4.12'
 
-    compile project(':libragy')
+    compile project(':library')
 }
diff --git a/app/src/main/java/com/wp/demo/MainActivity.java b/app/src/main/java/com/wp/demo/MainActivity.java
@@ -6,6 +6,7 @@
 import android.widget.Toast;
 
 import com.wheelpicker.DataPicker;
+import com.wheelpicker.DateWheelPicker;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -33,15 +34,29 @@ public void onBirthPicked(int year, int month, int day) {
             }
         });
 
+        findViewById(R.id.picker_future_date).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                DataPicker.pickFutureDate(MainActivity.this, new Date(System.currentTimeMillis()),
+                        DateWheelPicker.TYPE_ALL, View.VISIBLE, new DataPicker.OnDatePickListener() {
+                            @Override
+                            public void onDatePicked(int year, int month, int day, int hour, int minute, int second) {
+                                Toast.makeText(MainActivity.this, year + "-" + (month + 1) + "-" + day + " " + hour + ":" + minute, Toast.LENGTH_SHORT).show();
+                            }
+                        });
+            }
+        });
+
         findViewById(R.id.picker_future).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                DataPicker.pickFutureDate(MainActivity.this, new Date(System.currentTimeMillis() + 30 * 60 * 1000), new DataPicker.OnDatePickListener() {
-                    @Override
-                    public void onDatePicked(int year, int month, int day, int hour, int minute, int second) {
-                        Toast.makeText(MainActivity.this, year + "-" + (month + 1) + "-" + day + " " + hour + ":" + minute, Toast.LENGTH_SHORT).show();
-                    }
-                });
+                DataPicker.pickFutureDate(MainActivity.this, new Date(System.currentTimeMillis() + 30 * 60 * 1000),
+                        365, new DataPicker.OnDatePickListener() {
+                            @Override
+                            public void onDatePicked(int year, int month, int day, int hour, int minute, int second) {
+                                Toast.makeText(MainActivity.this, year + "-" + (month + 1) + "-" + day + " " + hour + ":" + minute, Toast.LENGTH_SHORT).show();
+                            }
+                        });
             }
         });
 

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -11,6 +11,12 @@
             android:layout_marginTop="10dp"
             android:text="选择生日日期"/>
 
+    <Button android:id="@+id/picker_future_date"
+        android:layout_width="150dp"
+        android:layout_height="50dp"
+        android:layout_marginTop="10dp"
+        android:text="选择未来日期"/>
+
     <Button android:id="@+id/picker_future"
             android:layout_width="150dp"
             android:layout_height="50dp"

diff --git a/libragy/src/main/java/com/wheelpicker/DataPicker.java b/libragy/src/main/java/com/wheelpicker/DataPicker.java
diff --git a/libragy/.gitignore → library/.gitignore b/libragy/.gitignore → library/.gitignore
diff --git a/libragy/build.gradle → library/build.gradle b/libragy/build.gradle → library/build.gradle
diff --git a/libragy/proguard-rules.pro → library/proguard-rules.pro b/libragy/proguard-rules.pro → library/proguard-rules.pro
diff --git a/libragy/src/main/AndroidManifest.xml → library/src/main/AndroidManifest.xml b/libragy/src/main/AndroidManifest.xml → library/src/main/AndroidManifest.xml
diff --git a/...ain/java/com/wheelpicker/BottomSheet.java → ...ain/java/com/wheelpicker/BottomSheet.java b/...ain/java/com/wheelpicker/BottomSheet.java → ...ain/java/com/wheelpicker/BottomSheet.java