日历优化

plugin_calendar/src/main/java/com/rv/plugin/calendar/CalendarActivity.java

@@ -83,7 +83,7 @@ public class CalendarActivity extends BaseStatusActivity<CalendarPresenter> {
         super.onCreate(savedInstanceState);
         ButterKnife.bind(this);
         context = this;
-        MAX_SPAN = AppCookie.getIntValue(context,AppCookie.KEY_PRERENT_DAYS,30);
+        MAX_SPAN = AppCookie.getIntValue(context, AppCookie.KEY_PRERENT_DAYS, 30);
         begDay = DateUtils.formatDate16(begDate);
         begTime = DateUtils.formatDate17(begDate);
         endDay = DateUtils.formatDate16(endDate);
@@ -141,16 +141,10 @@ public class CalendarActivity extends BaseStatusActivity<CalendarPresenter> {
         wheelViewLeft.setOnWheelViewListener(new WheelView.OnWheelViewListener() {
             @Override
             public void onSelected(int selectedIndex, String item) {
-                String s = DateUtils.formatDate17(DateUtils.formatDate8(DateUtils.getCurDateTime()));
-                if (s_begDate.equals(DateUtils.getCurDate()) && DateUtils.formatDate20(item) < DateUtils.formatDate20(s)) {
-                    wheelViewLeft.setSeletion(begSelected);
-                    tvGetTime.setText(s_begTime);
-                } else {
                 begSelected = selectedIndex;
                 s_begTime = item;
                 tvGetTime.setText(item);
             }
-            }
         });
 
         wheelViewRight.setOffset(1);// 对话框中当前项上面和下面的项数
@@ -158,18 +152,10 @@ public class CalendarActivity extends BaseStatusActivity<CalendarPresenter> {
         wheelViewRight.setOnWheelViewListener(new WheelView.OnWheelViewListener() {
             @Override
             public void onSelected(int selectedIndex, String item) {
-
-                if (s_begDate.equals(s_endDate) && DateUtils.formatDate20(item) <= DateUtils.formatDate20(s_begTime)) {
-                    s_endTime = DateUtils.formatDate19(s_begTime);
-                    wheelViewRight.setSeletion(begSelected);
-                    endSelected = begSelected;
-                    tvOutTime.setText(s_endTime);
-                } else {
                 s_endTime = item;
                 tvOutTime.setText(item);
                 endSelected = selectedIndex;
             }
-            }
         });
 
         if (timeList != null) {
@@ -206,13 +192,14 @@ public class CalendarActivity extends BaseStatusActivity<CalendarPresenter> {
                 return;
             }
 
-            if (s_begDate.equals(s_endDate) && DateUtils.formatDate20(s_endTime) <= DateUtils.formatDate20(s_begTime)) {
-                showToast("还车时刻要大于取车时刻！");
-                return;
-            }
             String s = DateUtils.formatDate17(DateUtils.formatDate8(DateUtils.getCurDateTime()));
             if (s_begDate.equals(DateUtils.getCurDate()) && DateUtils.formatDate20(s_begTime) < DateUtils.formatDate20(s)) {
-                showToast("取车时刻要大于现在时刻！");
+                showToast("取车时刻必须大于等于现在时刻！");
+                return;
+            }
+
+            if (s_begDate.equals(s_endDate) && DateUtils.formatDate20(s_endTime) <= DateUtils.formatDate20(s_begTime)) {
+                showToast("还车时刻要大于取车时刻！");
                 return;
             }