From: TrillGates <williamtrillgates@gmail.com>
Date: Tue, 27 Apr 2021 03:13:17 +0000 (+0800)
Subject: fixed fzd alarm set issues.
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=9f3e714e24d2f89beb6ee00dc64f641960ae5a09;p=protocol_srv.git

fixed fzd alarm set issues.
---

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 1d6a76cb..217e157d 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -699,7 +699,7 @@ public class CoreService extends Service {
             Config.load_config_fromfile();
             Config.setLocationMode(this, Config.DefaultLocationMode);
             Config.setLocationCycle(this, Config.DefaultLocationCycle);
-            Config.setPPGTestCycle(this,Config.DefaultPPGTestCycle);
+            Config.setPPGTestCycle(this, Config.DefaultPPGTestCycle);
             Config.setTemperatureTestCycle(runtime, Config.DefaultTemperatureTestCycle);
             Config.setConfigInitFlag(this, 1);
         }
@@ -1074,8 +1074,7 @@ public class CoreService extends Service {
                     ICLogger.logToFile("alarmCycle", "HEART_ALARM alarmCycle  ");
                 return Service.START_STICKY;
             } else if (ACTION_LOCATION_ALARM.equals(paramIntent.getAction())) {
-
-
+                ICLogger.d("收到定位闹钟...");
 //                    if (cmcm_call_eiot_into_powersave_mode() == 1) {
 //                        ICLogger.i("2 into powersave return");
 //                        return Service.START_NOT_STICKY;
@@ -1104,11 +1103,7 @@ public class CoreService extends Service {
                 }
 //                setAlarm(alarmCycle);
 //                if (Config.LOG_TOFILE) FileOutputUtil.fileOutput(runtime.getCacheDir(), "alarmCycle", "ALARM alarmCycle");
-
-
                 this.locationClient.onAlarm(getWakeLock(1));
-
-
                 //收到定时定位消息
                 setLocationAlarm(runtime.getLocationInstance().getWorkingMod());
                 StringBuilder stringBuilder1 = new StringBuilder();
@@ -1116,7 +1111,6 @@ public class CoreService extends Service {
                 stringBuilder1.append(runtime.getLocationInstance().getWorkingMod());
                 if (Config.LOG_TOFILE) ICLogger.logToFile("alarmCycle", stringBuilder1.toString());
 //                this.locationClient.triggerLocationProcess();
-
             } else if (Constants.OTHER_ALARM_END.equals(paramIntent.getAction())) {
                 ICLogger.i("OTHER_ALARM_END set Ringmode Normal vib true");
                 SilentManager.setSilentConfig(this, false);
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 a577c4f6..f8154589 100644
--- a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
@@ -673,6 +673,7 @@ public class SilentManager extends AbstractInvokeHandlerService {
             Alarm alarm = (Alarm) itAlarm.next();
             ICLogger.d("alarm == > " + alarm);
             if ("ON".equals(alarm.status)) {
+                alarm.time = alarm.time.replace(":", "");
                 int hour = Integer.parseInt(alarm.time.substring(2, 4));
                 int minute = Integer.parseInt(alarm.time.substring(5, 7));
                 calendar.set(Calendar.HOUR_OF_DAY, hour);
diff --git a/app/src/main/java/com/ic/protocols/protocol_anan.java b/app/src/main/java/com/ic/protocols/protocol_anan.java
index 514cb714..77d8e04c 100644
--- a/app/src/main/java/com/ic/protocols/protocol_anan.java
+++ b/app/src/main/java/com/ic/protocols/protocol_anan.java
@@ -3,6 +3,7 @@ package com.ic.protocols;
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.content.BroadcastReceiver;
+import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -22,6 +23,8 @@ import com.enqualcomm.support.bean.Runtime;
 import com.enqualcomm.support.bean.StringMessage;
 import com.enqualcomm.support.bean.VoiceContent;
 import com.enqualcomm.support.bean.voicePacket;
+import com.enqualcomm.support.provider.FZDDatabaseHelper;
+import com.enqualcomm.support.provider.FZDSettingsProvider;
 import com.enqualcomm.support.service.HeartRateManager;
 import com.enqualcomm.support.utils.Connection;
 import com.enqualcomm.support.utils.ICLogger;
@@ -36,6 +39,7 @@ import java.util.Locale;
 import static com.enqualcomm.support.Constants.FROM_SERVER;
 import static com.enqualcomm.support.bean.Contact.GROUP_ALL;
 import static com.ic.protocols.protocol_anan.CMD_TYPE.AP32;
+import static com.ic.protocols.protocol_anan.CMD_TYPE.BPSW;
 import static java.lang.Math.abs;
 
 /**
@@ -632,7 +636,14 @@ public class protocol_anan {
             String value = split[3];
             //1打开，0关闭 （终端默认为1）
             ICLogger.d("cmd == > " + cmd);
-            //TODO:设置项进入数据库
+            //设置项进入数据库
+            // 不取消定位闹钟，而是在定位闹钟广播的地方去判断
+            // 因为用户可能又开启了，所以闹钟还是需要的
+            ContentValues contentValues = new ContentValues();
+            contentValues.put(FZDDatabaseHelper.sKey, cmdMap.get(BPSW));
+            contentValues.put(FZDDatabaseHelper.sValue, value);
+            mRuntime.getContextProxy().getResolver().insert(Uri.parse(FZDSettingsProvider.SETTINGS),
+                    contentValues);
             //回复IWAPSW,0808351,1#
             mConnection.send(APSW(responseCode, value));
         } else {
diff --git a/app/src/main/java/com/ic/protocols/protocol_fzd.java b/app/src/main/java/com/ic/protocols/protocol_fzd.java
index c98f1dd6..88c49dbc 100644
--- a/app/src/main/java/com/ic/protocols/protocol_fzd.java
+++ b/app/src/main/java/com/ic/protocols/protocol_fzd.java
@@ -2116,7 +2116,7 @@ public class protocol_fzd {
                 }
                 String weekValue = stringBuilder.toString();
                 ICLogger.d("weekValue ==> " + weekValue);
-                alarmList.add(new Alarm("ST" + time.substring(0, 2) + "." + time.substring(2),
+                alarmList.add(new Alarm("ST" + time.substring(0, 2) + "." + time.substring(3),
                         "W" + weekValue, "CON", "1".equals(state) ? "ON" : "OFF", "闹铃"));
             }
             mRuntime.getDbHelper().saveAlarm(alarmList);