From: SnickerSun <scy@incartech.cn>
Date: Mon, 6 Sep 2021 14:52:15 +0000 (+0800)
Subject: release ICProtocol8.1_V926
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=4cb6391ceba121f0703ecd4f291ca0f67aa527d2;p=protocol_srv.git

release ICProtocol8.1_V926
修复 FindDev 弹窗编程SOSView的问题。
---

diff --git a/app/release/ICProtocol8.1_V925_2109061905_release.apk b/app/release/ICProtocol8.1_V926_2109062240_release.apk
similarity index 78%
rename from app/release/ICProtocol8.1_V925_2109061905_release.apk
rename to app/release/ICProtocol8.1_V926_2109062240_release.apk
index 41eec986..da03a2b1 100644
Binary files a/app/release/ICProtocol8.1_V925_2109061905_release.apk and b/app/release/ICProtocol8.1_V926_2109062240_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 26a8b131..628e5018 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":925,"versionName":"2109061905","enabled":true,"outputFile":"ICProtocol8.1_V925_2109061905_release.apk","fullName":"release","baseName":"release"},"path":"ICProtocol8.1_V925_2109061905_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":926,"versionName":"2109062240","enabled":true,"outputFile":"ICProtocol8.1_V926_2109062240_release.apk","fullName":"release","baseName":"release"},"path":"ICProtocol8.1_V926_2109062240_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/ic/protocolSrv/service/Deliver.java b/app/src/main/java/com/ic/protocolSrv/service/Deliver.java
index 94c0b424..4bcf885f 100644
--- a/app/src/main/java/com/ic/protocolSrv/service/Deliver.java
+++ b/app/src/main/java/com/ic/protocolSrv/service/Deliver.java
@@ -674,6 +674,7 @@ public class Deliver extends AbstractConnectionService {
         } else if ("sosReceive".equals(paramStringMessage.cmd())) {
             SOSRecView instance = SOSRecView.getInstance();
             instance.showMsgDialog();
+            return true;
         }
         return false;
     }
diff --git a/app/src/main/java/com/ic/protocolSrv/utils/ProcessReceiver.java b/app/src/main/java/com/ic/protocolSrv/utils/ProcessReceiver.java
index e03a124c..426465f9 100644
--- a/app/src/main/java/com/ic/protocolSrv/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/ic/protocolSrv/utils/ProcessReceiver.java
@@ -23,6 +23,7 @@ import com.ic.protocolSrv.service.AudioService;
 import com.ic.protocolSrv.service.Deliver;
 import com.ic.protocolSrv.service.HeartRateManager;
 import com.ic.protocols.protocolAPIHelper;
+import com.ic.view.FindDeviceView;
 import com.ic.view.SOSRecView;
 import com.ic.view.webmsgresponse.WebMsgView;
 
@@ -465,21 +466,21 @@ public class ProcessReceiver extends BroadcastReceiver {
                 }
             } else if (paramIntent.hasExtra("findDev")) {
                 ICLogger.d("hasExtra(findDev)");
-                SOSRecView instance = SOSRecView.getInstance();
-                instance.showMsgDialog();
+//                SOSRecView instance = SOSRecView.getInstance();
+//                instance.showMsgDialog();
                 this.screenOn(paramContext);
-//                String findDevTxt = paramIntent.getStringExtra("findDev");
-//                SharePreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false);
-//                isSilence = SharePreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
-//                ICLogger.d("isSilence ==> " + isSilence);
-//                ICLogger.d("findDevTxt ==> " + findDevTxt);
-//                if (findDevTxt != null && !isSilence) {
-//                    //this.initMyDialog(paramContext, null, 5, findDevTxt, false);
-//                    this.playFindDevVoice(paramContext);
-//                    VibrateUtil.getInstance(paramContext).vibrateOn(true);
-//                    this.screenOn(paramContext);
-//                    FindDeviceView.getInstance().showMsgDialog();
-//                }
+                String findDevTxt = paramIntent.getStringExtra("findDev");
+                SharePreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false);
+                isSilence = SharePreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
+                ICLogger.d("isSilence ==> " + isSilence);
+                ICLogger.d("findDevTxt ==> " + findDevTxt);
+                if (findDevTxt != null && !isSilence) {
+                    //this.initMyDialog(paramContext, null, 5, findDevTxt, false);
+                    this.playFindDevVoice(paramContext);
+                    VibrateUtil.getInstance(paramContext).vibrateOn(true);
+                    this.screenOn(paramContext);
+                    FindDeviceView.getInstance().showMsgDialog();
+                }
             } else if (paramIntent.hasExtra("takephoto")) {
                 String takephoto = paramIntent.getStringExtra("takephoto");
                 SharePreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false);
diff --git a/app/version_code.properties b/app/version_code.properties
index 724e8261..61c5894b 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Sep 06 19:05:13 CST 2021
-VERSION_CODE=925
+#Mon Sep 06 22:40:09 CST 2021
+VERSION_CODE=926