release ICProtocol8.1_V912_2108142020_release.apk

添加destroy 函数unregister Receiver，解决 重启服务 重复注册报错。

diff --git a/app/build.gradle b/app/build.gradle
index 4de1314..362f6fb 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,8 @@ android {
         }
 
         debug {
-            signingConfig signingConfigs.debug
+//            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
             // 启用 Android 插件压缩器
 //            minifyEnabled true
 //            useProguard false

diff --git a/app/release/ICProtocol8.1_V911_2108142000_release.apk b/app/release/ICProtocol8.1_V912_2108142020_release.apk
similarity index 78%
rename from app/release/ICProtocol8.1_V911_2108142000_release.apk
rename to app/release/ICProtocol8.1_V912_2108142020_release.apk
index 644e5c4..855c778 100644 (file)
Binary files a/app/release/ICProtocol8.1_V911_2108142000_release.apk and b/app/release/ICProtocol8.1_V912_2108142020_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index c0a6e7e..7d68314 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":911,"versionName":"2108142000","enabled":true,"outputFile":"ICProtocol8.1_V911_2108142000_release.apk","fullName":"release","baseName":"release"},"path":"ICProtocol8.1_V911_2108142000_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":912,"versionName":"2108142020","enabled":true,"outputFile":"ICProtocol8.1_V912_2108142020_release.apk","fullName":"release","baseName":"release"},"path":"ICProtocol8.1_V912_2108142020_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 5cf3389..6e3b971 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -1833,13 +1833,17 @@ public class CoreService extends Service {
         super.onDestroy();
         ICLogger.d("onDestroy...");
         saveStepCount();
-        this.connectionServiceChain.processDetach(this.connection, this.runtime);
-        this.invokeHandlerServiceChain.processDetach(this.connection, this.runtime);
-        this.locationClient.deinit();
-        this.connection.close();
-        unregisterReceiver(this.TimeChangeBroadcastReceiver);
-        unregisterReceiver(this.screenOnReceiver);
-        unregisterReceiver(this.AtCallbackBroadcastReceiver);
+        connectionServiceChain.processDetach(connection, runtime);
+        invokeHandlerServiceChain.processDetach(connection, runtime);
+        locationClient.deinit();
+        connection.close();
+        smsManager.unregisterIntentReceiver();
+        connection.onDestroy();
+        unregisterReceiver(TimeChangeBroadcastReceiver);
+        unregisterReceiver(screenOnReceiver);
+        unregisterReceiver(AtCallbackBroadcastReceiver);
+        unregisterReceiver(broadcastPracticeCMDReceiver);
+        unregisterReceiver(broadcastSOSReceiver);
         batteryUtil.unregisterBroadReceiver();
         getContentResolver().unregisterContentObserver(airplaneModeObserver);
         getContentResolver().unregisterContentObserver(shutdownFlagObserver);

diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
index 1292ace..5cdb66a 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
+++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
@@ -289,6 +289,9 @@ public class ICSmsManager extends BroadcastReceiver {
         }
     }
 
+    public void unregisterIntentReceiver(){
+        mContext.unregisterReceiver(this);
+    }
     private boolean isAdminNumber(String phoneNumb) {
 
         return true;

diff --git a/app/src/main/java/com/enqualcomm/support/utils/Connection.java b/app/src/main/java/com/enqualcomm/support/utils/Connection.java
index 498a2fd..e89139c 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/Connection.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/Connection.java
@@ -26,5 +26,7 @@ public interface Connection {
     void DeliverCMDMessageToSystem(String cmd, String msg);\r
 \r
     boolean isServerConnected();\r
+\r
+    void onDestroy();\r
 }\r
 \r

diff --git a/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java b/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java
index c3a49c5..391c744 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java
@@ -63,6 +63,10 @@ public class NettyConnection implements Connection {
         connectServer(host, port);
     }
 
+    public void onDestroy(){
+        if(API!=null)
+            API.onDestroy();
+    }
     public void close() {
 //      listener =null;
 //      RxSocket.getInstance().setConnectionListener(null);

diff --git a/app/src/main/java/com/enqualcomm/support/utils/mqttConnection.java b/app/src/main/java/com/enqualcomm/support/utils/mqttConnection.java
index e8aea5c..6fd84f4 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/mqttConnection.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/mqttConnection.java
@@ -146,4 +146,9 @@ public class mqttConnection implements Connection {
         return isServerconnected;\r
     }\r
 \r
+    @Override\r
+    public void onDestroy() {\r
+\r
+    }\r
+\r
 }\r

diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
index 44c1fbd..48da1cb 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
+++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
@@ -57,7 +57,10 @@ public class protocolAPIHelper {
             protocolgator_handler = new protocol_gator(connect, runtime);
         }
     }
-
+    public void onDestroy(){
+        if(protocolanan_handler!=null)
+            protocolanan_handler.unRegisterWearStateReceiver();
+    }
     private static boolean is_protocol_not_Initialled() {
         return (protocolbeehome_handler == null || protocoljiai_handler == null
                 || protocolic_handler == null ||

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 367a4ce..ccd174d 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_anan.java
+++ b/app/src/main/java/com/ic/protocols/protocol_anan.java
@@ -165,6 +165,10 @@ public class protocol_anan {
         mRuntime.getContextProxy().context.registerReceiver(wearStateReceiver, intentFilter);
     }
 
+    public void unRegisterWearStateReceiver(){
+        mRuntime.getContextProxy().context.unregisterReceiver(wearStateReceiver);
+    }
+
     private final BroadcastReceiver wearStateReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {

diff --git a/app/version_code.properties b/app/version_code.properties
index f98cd49..45671b1 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sat Aug 14 01:52:07 CST 2021\r
-VERSION_CODE=910\r
+#Sat Aug 14 20:20:33 CST 2021\r
+VERSION_CODE=912\r