From: snickersun <scy@incartech.cn>
Date: Tue, 17 Nov 2020 06:51:42 +0000 (+0800)
Subject: release V704
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=a4a0c127ecf2304d98695bf6317787a1c4efe7a6;p=protocol_srv.git

release V704
12次心跳失败后重置网络，还需重新断开重连服务器。
---

diff --git a/app/release/ICSer_V703_2011162055_release.apk b/app/release/ICSer_V704_2011171449_release.apk
similarity index 78%
rename from app/release/ICSer_V703_2011162055_release.apk
rename to app/release/ICSer_V704_2011171449_release.apk
index dff429ee..c54a1870 100644
Binary files a/app/release/ICSer_V703_2011162055_release.apk and b/app/release/ICSer_V704_2011171449_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 42888d95..d10bd9a5 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":703,"versionName":"2011162055","enabled":true,"outputFile":"ICSer_V703_2011162055_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V703_2011162055_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":704,"versionName":"2011171449","enabled":true,"outputFile":"ICSer_V704_2011171449_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V704_2011171449_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 b98263e6..7c73e043 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -1594,17 +1594,20 @@ public class CoreService extends Service {
         }
         if( no_network_Heartbeats_Count >12){
             ICLogger.i("当前第"+no_network_Heartbeats_Count+"次心跳都没有连接服务器成功 > 10 ，重置SIM卡尝试重新注册网络！");
-            //SimSignalUtil.send_at_to_reset_simcard(runtime); //直接下此命令不能实现断网重连，所以干脆采用关闭网络再打开的方式。
-            SimSignalUtil.setAirMode(this,"OpenAirplane");
-            mHandler.postDelayed(reopenSim,5000);
+            SimSignalUtil.send_at_to_reset_simcard(runtime); //直接下此命令不能实现断网重连，所以干脆采用关闭网络再打开的方式。
+            //SimSignalUtil.setAirMode(this,"OpenAirplane");
+            mHandler.postDelayed(reopenSim,5000); //5秒后重新链接服务器。
             no_network_Heartbeats_Count=0;//重置Sim卡后重置计数。防止后面多次重置Sim卡。
         }
     }
     private Runnable reopenSim =new Runnable(){
         @Override
         public void run() {
-            if (CoreService.getInstance()!=null)
-                SimSignalUtil.setAirMode(CoreService.getInstance(),"CloseAirplane");
+            if (CoreService.getInstance()!=null) {
+             //   SimSignalUtil.setAirMode(CoreService.getInstance(), "CloseAirplane");
+                disconnect_server();
+                ReConnectToServer();
+            }
         }
     };
     public void stopConnectionRetryTimer(){
diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
index 8db23ce5..f00f18ed 100644
--- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
+++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
@@ -1213,6 +1213,23 @@ public class ICSmsManager  extends BroadcastReceiver {
                Deliver.sendLocationMSG(protocolAPIHelper.getLBSLocationMSG(runtime));
            }
 
+        }else if(cmd.startsWith("resetsim")) {
+
+            if(CoreService.getInstance()!=null){
+                SimSignalUtil.send_at_to_reset_simcard(CoreService.getInstance().runtime);
+            }
+
+        }else if(cmd.startsWith("airplane")) {
+
+            if(CoreService.getInstance()!=null){
+                SimSignalUtil.setAirMode(CoreService.getInstance(), "OpenAirplane");
+                new Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        SimSignalUtil.setAirMode(CoreService.getInstance(),"CloseAirplane");
+                    }
+                },5000);
+            }
         }else if(cmd.startsWith("testCMDRecords")) {
 
             if(CoreService.getInstance()!=null){
diff --git a/app/version_code.properties b/app/version_code.properties
index f7fb9df2..7ae0fb6e 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Nov 16 20:55:24 CST 2020
-VERSION_CODE=703
+#Tue Nov 17 14:49:39 CST 2020
+VERSION_CODE=704