Merge remote-tracking branch 'origin/master'

# Conflicts:
#	README.md

README.md

@@ -7,14 +7,13 @@
 ~~~
 repositories {
         maven {
-            //allowInsecureProtocol = true//build:gradle版本4.1.3版本以上需添加
-            url "http://maven.keleyanyi.com/repository/benyanyi/"
+            url "http://maven.benyanyi.com/nexus/content/repositories/mylove/"
         }
     }
 ~~~
 ### module 下添加
 ~~~
-implementation 'com.yanyi.benyanyi:DateSelect:1.0.4'
+implementation 'com.yanyi.benyanyi:DateSelect:1.0.3'
 ~~~
 
 或者
@@ -22,7 +21,7 @@ implementation 'com.yanyi.benyanyi:DateSelect:1.0.4'
 <dependency>
   <groupId>com.yanyi.benyanyi</groupId>
   <artifactId>DateSelect</artifactId>
-  <version>1.0.4</version>
+  <version>1.0.3</version>
   <type>aar</type>
 </dependency>
 ~~~
@@ -73,8 +72,7 @@ selectData.setDateClickListener(new SelectData.OnDateClickListener() {
 });
 ~~~
 ## 更新记录
-* 2021-08-27 提交1.0.4版本，修改maven地址
-* 2021-03-14 提交1.0.3版本 删除开始时间和结束时间不能超过当前时间限制
+* 2021-13-14 提交1.0.3版本 删除开始时间和结束时间不能超过当前时间限制
 * 2020-05-18 提交1.0.2版本，将android support转成androidx支持,并将Maven库存放到个人服务器上
 * 2019-06-12 提交1.0.1版本，优化一些已知细节,变更包名，开源库包名进行统一
 * 2018-06-09 提交1.0.0版本

datelib/src/main/java/com/benyanyi/datelib/SelectPeriod.java

@@ -27,14 +27,15 @@ import java.util.Locale;
  * @author myLove
  */
 public class SelectPeriod extends PopupWindow implements View.OnClickListener {
-    private String tag = "SelectPeriod";
-    private Context mContext;
-    private SelectType selectType;
-    private boolean boo;
+    private final String tag = "SelectPeriod";
+    private final Context mContext;
+    private final SelectType selectType;
+    private boolean judgmentTime = true;
+    private boolean boo = true;
 
     public static boolean isDebug = true;
 
-    private View mView;
+    private final View mView;
 
     /**
      * 取消按钮
@@ -104,22 +105,14 @@ public class SelectPeriod extends PopupWindow implements View.OnClickListener {
     private OnDateClickListener onDateClickListener;
 
     public SelectPeriod(Context context) {
-        this(context, SelectType.NONE, true);
-    }
-
-    public SelectPeriod(Context context, boolean judgmentTime) {
-        this(context, SelectType.NONE, judgmentTime);
+        this(context, SelectType.NONE);
     }
 
     public SelectPeriod(Context context, SelectType selectType) {
-        this(context, selectType, true);
-    }
-
-    public SelectPeriod(Context context, SelectType selectType, boolean judgmentTime) {
         super(context);
         this.mContext = context;
         this.selectType = selectType;
-        this.boo = judgmentTime;
+        this.judgmentTime = judgmentTime;
         mView = View.inflate(context, R.layout.select_period_pop_layout, null);
         init();
         //设置SelectPicPopupWindow的View
@@ -665,17 +658,37 @@ public class SelectPeriod extends PopupWindow implements View.OnClickListener {
                 String endTimeStr = getEndTimeStr();
                 log(getStringDate());
                 if (boo) {
-                    if (timeComparison(startTimeStr, endTimeStr)) {
-                        log(startTimeStr + "\t" + endTimeStr);
-                        onDateClickListener.onDateClickListener(startTimeStr, endTimeStr);
-                        dismiss();
+                    if (timeComparison(startTimeStr, getStringDate())) {
+                        toast("开始时间需要大于当前时间");
                     } else {
-                        toast("结束时间需要大于开始时间");
+                        if (judgmentTime) {
+                            if (timeComparison(startTimeStr, endTimeStr)) {
+                                log(startTimeStr + "\t" + endTimeStr);
+                                onDateClickListener.onDateClickListener(startTimeStr, endTimeStr);
+                                dismiss();
+                            } else {
+                                toast("结束时间需要大于开始时间");
+                            }
+                        } else {
+                            onDateClickListener.onDateClickListener(startTimeStr, endTimeStr);
+                            dismiss();
+                        }
                     }
                 } else {
-                    onDateClickListener.onDateClickListener(startTimeStr, endTimeStr);
-                    dismiss();
+                    if (judgmentTime) {
+                        if (timeComparison(startTimeStr, endTimeStr)) {
+                            log(startTimeStr + "\t" + endTimeStr);
+                            onDateClickListener.onDateClickListener(startTimeStr, endTimeStr);
+                            dismiss();
+                        } else {
+                            toast("结束时间需要大于开始时间");
+                        }
+                    } else {
+                        onDateClickListener.onDateClickListener(startTimeStr, endTimeStr);
+                        dismiss();
+                    }
                 }
+
             }
         } else if (view == butCancel) {
             log("cancel");
@@ -861,8 +874,25 @@ public class SelectPeriod extends PopupWindow implements View.OnClickListener {
         Toast.makeText(mContext, msg.toString(), Toast.LENGTH_SHORT).show();
     }
 
-    public void setOnDateClickListener(OnDateClickListener onDateClickListener) {
+    /**
+     * 当前时间小于开始时间
+     *
+     * @param b
+     * @return 是否可以当前时间小于开始时间
+     */
+    public SelectPeriod currentTimeLessStartTime(boolean b) {
+        this.boo = b;
+        return this;
+    }
+
+    public SelectPeriod startTimeLessEndTime(boolean judgmentTime) {
+        this.judgmentTime = judgmentTime;
+        return this;
+    }
+
+    public SelectPeriod setOnDateClickListener(OnDateClickListener onDateClickListener) {
         this.onDateClickListener = onDateClickListener;
+        return this;
     }
 
     public interface OnDateClickListener {