From a3fc0093a0725354aa002a3c2a9e90d3a2ac93a4 Mon Sep 17 00:00:00 2001
From: oujunhui <313127320@qq.com>
Date: Wed, 1 Jul 2020 00:13:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A2=A6=E5=B9=BB=E8=AE=B8=E6=84=BF=E6=B1=A0?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91bugfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChooseTreasureBoxDialogFragment.java      |  8 ++---
 .../utils/TimeUtils.java                      | 34 ++++++++++---------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java
index 79abe3bf8..a6122d31b 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java
+++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java
@@ -70,15 +70,13 @@ public class ChooseTreasureBoxDialogFragment extends DialogFragment implements V
         clBoxNormal.setOnClickListener(this);
         clBoxHonour.setOnClickListener(this);
         tvOpenTime.setText("限时 "+ mOpenTime);
-        int currentTime = TimeUtils.getTime24();
+        String mOpenTime = "10:10-13:00";
         int startTime = Integer.parseInt(mOpenTime.substring(0,mOpenTime.indexOf("-")).replace(":",""));
         int endTime = Integer.parseInt(mOpenTime.substring(mOpenTime.indexOf("-") + 1).replace(":",""));
         LogUtils.e("startTime"+startTime);
         LogUtils.e("endTime"+endTime);
-        LogUtils.e("当前小时"+TimeUtils.getTime24());
-        LogUtils.e("范围："+TimeUtils.getTimeLimit(17,59,13,20));
-//        LogUtils.e("范围："+TimeUtils.getTimeLimit());
-        if (TimeUtils.getTimeLimit(10,10,18,20)){
+        LogUtils.e("范围："+TimeUtils.getTimeLimit(startTime,endTime));
+        if (TimeUtils.getTimeLimit(startTime,endTime)){
             mTvOpenHonour.setEnabled(true);
         }else {
             mTvOpenHonour.setEnabled(false);
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/TimeUtils.java b/library/src/main/java/com/yizhuan/xchat_android_library/utils/TimeUtils.java
index 728924794..56532d385 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/TimeUtils.java
+++ b/library/src/main/java/com/yizhuan/xchat_android_library/utils/TimeUtils.java
@@ -824,13 +824,6 @@ public class TimeUtils {
      * @return HashMap
      */
     public static int getTime24(){
-        Calendar calendar=Calendar.getInstance();
-        String hour = String.valueOf(calendar.get(Calendar.HOUR_OF_DAY));
-        String minute = String.valueOf(calendar.get(Calendar.MINUTE));
-        return Integer.parseInt(hour +minute);
-    }
-
-    public static boolean getTimeLimit(int start_hour,int start_minute,int end_hour,int end_minute) {
         SimpleDateFormat hh = new SimpleDateFormat("HH", Locale.CHINA);
         SimpleDateFormat mm = new SimpleDateFormat("mm", Locale.CHINA);
         hh.setTimeZone(TimeZone.getTimeZone("GMT+08")); // 获取指定时区的时间
@@ -838,19 +831,28 @@ public class TimeUtils {
         Date date = new Date();
         String hour = hh.format(date);
         String minute = mm.format(date);
-        final int start = start_hour * start_minute;// 起始时间 8:00的分钟数
-        final int end = end_hour * end_minute;// 结束时间 19:00的分钟数
-        int minuteOfDay = Integer.parseInt(hour) * 60 + Integer.parseInt(minute);
+        return Integer.parseInt(hour +minute);
+    }
+
+    public static boolean getTimeLimit(int start_hour,int end_hour) {
+        SimpleDateFormat hh = new SimpleDateFormat("HH", Locale.CHINA);
+        SimpleDateFormat mm = new SimpleDateFormat("mm", Locale.CHINA);
+        hh.setTimeZone(TimeZone.getTimeZone("GMT+08")); // 获取指定时区的时间
+        mm.setTimeZone(TimeZone.getTimeZone("GMT+08"));
+        Date date = new Date();
+        String hour = hh.format(date);
+        String minute = mm.format(date);
         Log.i("stf", "--hour:minute-->" + hour + ":" + minute);
-        LogUtil.print("start" +start);
-        LogUtil.print("end" +end);
-        LogUtil.print("minuteOfDay" +minuteOfDay);
-        if (minuteOfDay >= start && minuteOfDay <= end) {
+        int currentTime = Integer.parseInt(hour +minute);
+        LogUtil.print("start" +start_hour);
+        LogUtil.print("end" +end_hour);
+        LogUtil.print("minuteOfDay" +currentTime);
+        if (currentTime >= start_hour && currentTime <= end_hour) {
             LogUtil.print("工作时间内" + hour + ":" + minute);
             return true;
         } else {
-            if (start > end){
-                if (minuteOfDay >= start || minuteOfDay <= end){
+            if (start_hour > end_hour){
+                if (currentTime >= start_hour || currentTime <= end_hour){
                     return true;
                 }
             }