From: k.liang Date: Mon, 9 Aug 2021 03:56:58 +0000 (+0800) Subject: 1.解决协议出现广播注册后,不取消报错的bug X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=305e65a65a827ab3cb7378f8c84f28b3e20bc30f;p=icsupport.git 1.解决协议出现广播注册后,不取消报错的bug --- diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java index e3bbd220..029b8331 100644 --- a/app/src/main/java/com/enqualcomm/support/CoreService.java +++ b/app/src/main/java/com/enqualcomm/support/CoreService.java @@ -1830,6 +1830,11 @@ public class CoreService extends Service { unregisterReceiver(this.TimeChangeBroadcastReceiver); unregisterReceiver(this.screenOnReceiver); unregisterReceiver(this.AtCallbackBroadcastReceiver); + unregisterReceiver(this.broadcastSOSReceiver); + unregisterReceiver(this.broadcastPracticeCMDReceiver); + if(smsManager != null){ + unregisterReceiver(smsManager); + } batteryUtil.unregisterBroadReceiver(); getContentResolver().unregisterContentObserver(airplaneModeObserver); getContentResolver().unregisterContentObserver(shutdownFlagObserver); 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 c3a49c58..a8265a73 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java +++ b/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java @@ -67,6 +67,9 @@ public class NettyConnection implements Connection { // listener =null; // RxSocket.getInstance().setConnectionListener(null); this.disconnect(); + if(API != null){ + API.release(); + } } public void connect(final String host, final int port) { 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 e8aea5cc..6860e765 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/mqttConnection.java +++ b/app/src/main/java/com/enqualcomm/support/utils/mqttConnection.java @@ -62,7 +62,9 @@ public class mqttConnection implements Connection { @Override public void close() { - + if(API != null){ + API.release(); + } } @Override diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java index 44c1fbd8..ef5c03b8 100644 --- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java +++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java @@ -58,6 +58,12 @@ public class protocolAPIHelper { } } + public void release(){ + if(protocolanan_handler != null){ + protocolanan_handler.unregister(); + } + } + 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 367a4ce1..570a9380 100644 --- a/app/src/main/java/com/ic/protocols/protocol_anan.java +++ b/app/src/main/java/com/ic/protocols/protocol_anan.java @@ -85,6 +85,10 @@ public class protocol_anan { registerWearStateReceiver(); } + public void unregister(){ + unregisterWearStateReceiver(); + } + public static final String KEY_ANTI_EVENT = "eventID"; public static final int STATE_ANTI_NONE = -1; public static final int STATE_ANTI_ON = 0; @@ -165,6 +169,12 @@ public class protocol_anan { mRuntime.getContextProxy().context.registerReceiver(wearStateReceiver, intentFilter); } + private void unregisterWearStateReceiver(){ + if(wearStateReceiver != null){ + mRuntime.getContextProxy().context.unregisterReceiver(wearStateReceiver); + } + } + private final BroadcastReceiver wearStateReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { @@ -1017,6 +1027,7 @@ public class protocol_anan { sb.append(",最高温度 " + temp_high); sb.append(",最低温度 " + temp_low); sb.append("\n"); + ICLogger.i(sb.toString()); msg.append(date); msg.append("," + weather_name);