From: snickersun <scy@incartech.cn>
Date: Mon, 7 Dec 2020 08:24:29 +0000 (+0800)
Subject: release L02ProtocolV2 V726
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=3399e4fc0887c9ee91da0504234b39b083f37c89;p=protocol_srv.git

release L02ProtocolV2 V726
修复protocol_fzd 设置静默 周一时无法使能问题。
---

diff --git a/app/release/ICSer_V726_2012071623_release.apk b/app/release/ICSer_V726_2012071623_release.apk
new file mode 100644
index 00000000..64bd13c3
Binary files /dev/null and b/app/release/ICSer_V726_2012071623_release.apk differ
diff --git a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
index 1f1136c6..2334d42c 100644
--- a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
@@ -389,7 +389,9 @@ public class SilentManager extends AbstractInvokeHandlerService {
 
   private void handleSilent(Runtime runtime, boolean silent) {
     int dayofweek = Calendar.getInstance().get(Calendar.DAY_OF_WEEK);
-    if (dayofweek != this.mTodayWeek && (dayofweek != 1 || this.mTodayWeek != 8)) {
+    //if (dayofweek != this.mTodayWeek && (dayofweek != 1 || this.mTodayWeek != 8)) {
+    if (dayofweek != this.mTodayWeek ) {
+      //mToday != 当天，更新一下 设置
       this.getSilentListStartAndEndTime();
       this.queryNotice();
     }
@@ -491,9 +493,9 @@ public class SilentManager extends AbstractInvokeHandlerService {
     ArrayList slist = this.silentList;
     int todayWeek = this.mTodayWeek;
     boolean isSilent = false; //默认不在silent时间段
-    if (todayWeek == 1) {
-      this.mTodayWeek += 7;
-    }
+//    if (todayWeek == 1) {
+//      this.mTodayWeek += 7;
+//    }
 
     Iterator it = slist.iterator();
 
@@ -506,13 +508,14 @@ public class SilentManager extends AbstractInvokeHandlerService {
       Silent silent = (Silent)it.next();
       String week = silent.week;
       StringBuilder sb = new StringBuilder();
-      sb.append(this.mTodayWeek - 1);
+//      sb.append(this.mTodayWeek - 1);
+      sb.append(this.mTodayWeek);
       sb.append("");
       if (week.contains(sb.toString())) {
         long var9 = silent.startTimeMillis - currenttime;
         int hour,minutes;
         StringBuilder sblog;
-
+        ICLogger.i("startTimeMillis  - currenttime "+var9);
         if (var9 < (long)(CoreService.alarmCycle * 60 * 1000) && var9 > 0L) {
           hour = Integer.parseInt(silent.start.substring(2, 4));
           minutes = Integer.parseInt(silent.start.substring(5, 7));
@@ -526,6 +529,7 @@ public class SilentManager extends AbstractInvokeHandlerService {
         }
 
         var9 = silent.endTimeMillis - currenttime;
+        ICLogger.i("endTimeMillis  - currenttime "+var9);
         if (var9 < (long)(CoreService.alarmCycle * 60 * 1000) && var9 > 0L) {
           hour = Integer.parseInt(silent.end.substring(2, 4));
           minutes = Integer.parseInt(silent.end.substring(5, 7));
@@ -543,6 +547,8 @@ public class SilentManager extends AbstractInvokeHandlerService {
           isSilent=true;
           break;
         }
+      }else{
+        ICLogger.i(sb+" not in ["+week+"] silent is false");
       }
     }
 
@@ -860,14 +866,14 @@ public class SilentManager extends AbstractInvokeHandlerService {
       }
     } else {
       ICLogger.i("静默闹钟来了");
-      boolean var4;
+      boolean silentchange;
       if (!"com.eqc.heartrate.action.SILENT_START".equals(action) && !"com.enqualcomm.support.OTHER_HEARTRATE_ALARM_START".equals(action)) {
-        var4 = false;
+        silentchange = false;
       } else {
-        var4 = true;
+        silentchange = true;
       }
 
-      this.handleSilent(runtime, var4 ^ true);
+      //this.handleSilent(runtime, silentchange ^ true);
     }
 
     return false;
diff --git a/app/version_code.properties b/app/version_code.properties
index 2624e4f8..0084bda0 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Dec 04 18:51:56 CST 2020
-VERSION_CODE=725
+#Mon Dec 07 16:23:21 CST 2020
+VERSION_CODE=726