From: snickersun <scy@incartech.cn>
Date: Mon, 2 Nov 2020 07:48:21 +0000 (+0800)
Subject: 优化mqtt 链接状态维护机制。尝试减少crash风险
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=febc2d4f3f7b274c4bb83acd86894424f54e9ac0;p=protocol_srv.git

优化mqtt 链接状态维护机制。尝试减少crash风险
---

diff --git a/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java b/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java
index fcbc8516..e5b61e33 100644
--- a/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java
+++ b/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java
@@ -60,8 +60,8 @@ public class protocol_mqtt_client {
 
         switch (msg.arg1) {
             case MQTTConnectionConstants.STATE_NONE:
-                if (mqttCallbackInterface!= null)
-                    mqttCallbackInterface.onMqttDisconnected();
+//                if (mqttCallbackInterface!= null)
+//                    mqttCallbackInterface.onMqttDisconnected();
                 break;
             case MQTTConnectionConstants.STATE_CONNECTING:
                 break;
diff --git a/app/src/main/java/se/wetcat/qatja/android/QatjaService.java b/app/src/main/java/se/wetcat/qatja/android/QatjaService.java
index 2c3822df..237f7a06 100644
--- a/app/src/main/java/se/wetcat/qatja/android/QatjaService.java
+++ b/app/src/main/java/se/wetcat/qatja/android/QatjaService.java
@@ -1187,9 +1187,11 @@ public class QatjaService extends Service {
         } catch (IOException e) {
           if (DEBUG)
             ICLogger.e("disconnected (this is fine, expected almost)", e);
-          if(!e.getCause().getMessage().contains("ECONNABORTED")) {
             connectionLost();
-          }
+          break;
+        } catch (NullPointerException e){
+          ICLogger.e("null pointer fond ",e);
+          connectionLost();
           break;
         }
       }
diff --git a/dNSCache/dNSCache.iml b/dNSCache/dNSCache.iml
index 8d78d7a1..4e8c3eb7 100644
--- a/dNSCache/dNSCache.iml
+++ b/dNSCache/dNSCache.iml
@@ -31,16 +31,16 @@
     <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />