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 dff429e..c54a187 100644 (file)
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 42888d9..d10bd9a 100644 (file)
--- 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 b98263e..7c73e04 100644 (file)
--- 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 {
         }\r
         if( no_network_Heartbeats_Count >12){\r
             ICLogger.i("当前第"+no_network_Heartbeats_Count+"次心跳都没有连接服务器成功 > 10 ，重置SIM卡尝试重新注册网络！");\r
-            //SimSignalUtil.send_at_to_reset_simcard(runtime); //直接下此命令不能实现断网重连，所以干脆采用关闭网络再打开的方式。\r
-            SimSignalUtil.setAirMode(this,"OpenAirplane");\r
-            mHandler.postDelayed(reopenSim,5000);\r
+            SimSignalUtil.send_at_to_reset_simcard(runtime); //直接下此命令不能实现断网重连，所以干脆采用关闭网络再打开的方式。\r
+            //SimSignalUtil.setAirMode(this,"OpenAirplane");\r
+            mHandler.postDelayed(reopenSim,5000); //5秒后重新链接服务器。\r
             no_network_Heartbeats_Count=0;//重置Sim卡后重置计数。防止后面多次重置Sim卡。\r
         }\r
     }\r
     private Runnable reopenSim =new Runnable(){\r
         @Override\r
         public void run() {\r
-            if (CoreService.getInstance()!=null)\r
-                SimSignalUtil.setAirMode(CoreService.getInstance(),"CloseAirplane");\r
+            if (CoreService.getInstance()!=null) {\r
+             //   SimSignalUtil.setAirMode(CoreService.getInstance(), "CloseAirplane");\r
+                disconnect_server();\r
+                ReConnectToServer();\r
+            }\r
         }\r
     };\r
     public void stopConnectionRetryTimer(){\r

diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
index 8db23ce..f00f18e 100644 (file)
--- 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));\r
            }\r
 \r
+        }else if(cmd.startsWith("resetsim")) {\r
+\r
+            if(CoreService.getInstance()!=null){\r
+                SimSignalUtil.send_at_to_reset_simcard(CoreService.getInstance().runtime);\r
+            }\r
+\r
+        }else if(cmd.startsWith("airplane")) {\r
+\r
+            if(CoreService.getInstance()!=null){\r
+                SimSignalUtil.setAirMode(CoreService.getInstance(), "OpenAirplane");\r
+                new Handler().postDelayed(new Runnable() {\r
+                    @Override\r
+                    public void run() {\r
+                        SimSignalUtil.setAirMode(CoreService.getInstance(),"CloseAirplane");\r
+                    }\r
+                },5000);\r
+            }\r
         }else if(cmd.startsWith("testCMDRecords")) {\r
 \r
             if(CoreService.getInstance()!=null){\r

diff --git a/app/version_code.properties b/app/version_code.properties
index f7fb9df..7ae0fb6 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Nov 16 20:55:24 CST 2020\r
-VERSION_CODE=703\r
+#Tue Nov 17 14:49:39 CST 2020\r
+VERSION_CODE=704\r