diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 124479b..cb2344b 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -16,7 +16,6 @@
-
diff --git a/app/src/main/java/com/lxj/xpopupextdemo/MainActivity.java b/app/src/main/java/com/lxj/xpopupextdemo/MainActivity.java
index 4437d85..d048e5e 100644
--- a/app/src/main/java/com/lxj/xpopupextdemo/MainActivity.java
+++ b/app/src/main/java/com/lxj/xpopupextdemo/MainActivity.java
@@ -47,6 +47,11 @@ public void onTimeConfirm(Date date, View view) {
//点击确认时间
Toast.makeText(MainActivity.this, "选择的时间:"+date.toLocaleString(), Toast.LENGTH_SHORT).show();
}
+
+ @Override
+ public void onCancel() {
+
+ }
});
new XPopup.Builder(MainActivity.this)
@@ -72,6 +77,11 @@ public void onCityChange(String province, String city, String area) {
Log.e("tag", province +" - " +city+" - " +area);
Toast.makeText(MainActivity.this, province +" - " +city+" - " +area, Toast.LENGTH_SHORT).show();
}
+
+ @Override
+ public void onCancel() {
+
+ }
});
new XPopup.Builder(MainActivity.this)
.borderRadius(30)
@@ -96,10 +106,15 @@ public void onClick(View v) {
public void onItemSelected(int index, String data) {
Toast.makeText(MainActivity.this, "选中的是 "+ data, Toast.LENGTH_SHORT).show();
}
+
+ @Override
+ public void onCancel() {
+
+ }
});
new XPopup.Builder(MainActivity.this)
- .borderRadius(30)
- .isDarkTheme(true)
+// .borderRadius(30)
+// .isDarkTheme(true)
.asCustom(popup)
.show();
}
diff --git a/build.gradle b/build.gradle
index 82303e5..fecc778 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath "com.android.tools.build:gradle:3.5.3"
+ classpath "com.android.tools.build:gradle:4.2.0"
}
}
diff --git a/ext/src/main/java/com/lxj/xpopupext/listener/CityPickerListener.java b/ext/src/main/java/com/lxj/xpopupext/listener/CityPickerListener.java
index 9eb7db3..8973410 100755
--- a/ext/src/main/java/com/lxj/xpopupext/listener/CityPickerListener.java
+++ b/ext/src/main/java/com/lxj/xpopupext/listener/CityPickerListener.java
@@ -10,5 +10,6 @@ public interface CityPickerListener {
void onCityConfirm(String province, String city, String area, View v);
void onCityChange(String province, String city, String area);
+ void onCancel();
}
diff --git a/ext/src/main/java/com/lxj/xpopupext/listener/CommonPickerListener.java b/ext/src/main/java/com/lxj/xpopupext/listener/CommonPickerListener.java
index 5022140..0ff48c6 100644
--- a/ext/src/main/java/com/lxj/xpopupext/listener/CommonPickerListener.java
+++ b/ext/src/main/java/com/lxj/xpopupext/listener/CommonPickerListener.java
@@ -2,4 +2,5 @@
public interface CommonPickerListener {
void onItemSelected(int index, String data);
+ void onCancel();
}
diff --git a/ext/src/main/java/com/lxj/xpopupext/listener/TimePickerListener.java b/ext/src/main/java/com/lxj/xpopupext/listener/TimePickerListener.java
index 4bbdb7a..ab8b443 100755
--- a/ext/src/main/java/com/lxj/xpopupext/listener/TimePickerListener.java
+++ b/ext/src/main/java/com/lxj/xpopupext/listener/TimePickerListener.java
@@ -8,4 +8,5 @@ public interface TimePickerListener {
void onTimeChanged(Date date);
void onTimeConfirm(Date date, View view);
+ void onCancel();
}
diff --git a/ext/src/main/java/com/lxj/xpopupext/popup/CityPickerPopup.java b/ext/src/main/java/com/lxj/xpopupext/popup/CityPickerPopup.java
index 26f8b26..a85df55 100644
--- a/ext/src/main/java/com/lxj/xpopupext/popup/CityPickerPopup.java
+++ b/ext/src/main/java/com/lxj/xpopupext/popup/CityPickerPopup.java
@@ -57,6 +57,7 @@ protected void onCreate() {
btnCancel.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
+ if (cityPickerListener != null) cityPickerListener.onCancel();
dismiss();
}
});
diff --git a/ext/src/main/java/com/lxj/xpopupext/popup/CommonPickerPopup.java b/ext/src/main/java/com/lxj/xpopupext/popup/CommonPickerPopup.java
index 2084e9c..91e4d04 100644
--- a/ext/src/main/java/com/lxj/xpopupext/popup/CommonPickerPopup.java
+++ b/ext/src/main/java/com/lxj/xpopupext/popup/CommonPickerPopup.java
@@ -54,6 +54,7 @@ protected void onCreate() {
btnCancel.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
+ if(commonPickerListener!=null) commonPickerListener.onCancel();
dismiss();
}
});
diff --git a/ext/src/main/java/com/lxj/xpopupext/popup/TimePickerPopup.java b/ext/src/main/java/com/lxj/xpopupext/popup/TimePickerPopup.java
index b15b44c..140477e 100644
--- a/ext/src/main/java/com/lxj/xpopupext/popup/TimePickerPopup.java
+++ b/ext/src/main/java/com/lxj/xpopupext/popup/TimePickerPopup.java
@@ -76,6 +76,7 @@ protected void onCreate() {
btnCancel.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
+ if (timePickerListener != null) timePickerListener.onCancel();
dismiss();
}
});
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8204040..bff4ad5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jun 16 22:36:20 CST 2020
+#Wed Dec 18 19:13:30 CST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip