From: snickersun <scy@incartech.cn>
Date: Wed, 18 Mar 2020 02:16:35 +0000 (+0800)
Subject: 修复没有网络就不继续重试计时，造成无法按计划重置SIM卡的问题。
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=c9e8e93bc8851fb9d19bc21ad86022894fb462d1;p=protocol_srv.git

修复没有网络就不继续重试计时，造成无法按计划重置SIM卡的问题。
---

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index a7d77c72..41c74550 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -869,8 +869,10 @@ public class CoreService extends Service {
     }
 
     public void startConnectionRetryTimer(){
-        //联网再重试连接服务器
-        if (SimSignalUtil.checkNet(runtime.getContextProxy().context) ) {
+        //联网再重试连接服务器, 不能够联网的情况下不管是不是有sim卡，以及是否联网，都进行重试，以便处理下面情况：
+        //1、sim卡接触不良，掉卡，可以尝试用此法恢复
+        //2、网络信号不好，造成临时掉线，但是恢复慢或不恢复，可以用此法尝试恢复
+//        if (SimSignalUtil.checkNet(runtime.getContextProxy().context) ) {
              stopConnectionRetryTimer();
             if (mTimer_retry_connect == null) {
                 mTimer_retry_connect = new Timer();
@@ -888,7 +890,7 @@ public class CoreService extends Service {
                     }
                 }, 5000, 20000); //每次都是断网才需要重连，delay 5秒重连，并且每20秒重试一次
             }
-        }
+//        }
     }
 
     private static int no_network_Heartbeats_Count=0;
@@ -922,13 +924,13 @@ public class CoreService extends Service {
             }
         }else{
             //没有网络就不用重新尝试连接网络了。网络连接后再重新尝试联网
-            ICLogger.i("retry 没有网络就不用重新尝试连接网络了。网络连接后再重新尝试联网!");
+            ICLogger.i("retry "+no_network_Heartbeats_Count+" 没有网络就不用重新尝试连接网络了。网络连接后再重新尝试联网!");
             no_network_Heartbeats_Count++;
             stopConnectionRetryTimer();
         }
         if( no_network_Heartbeats_Count >10){
             ICLogger.i("当前第"+no_network_Heartbeats_Count+"次心跳都没有连接服务器成功 > 10 ，重置SIM卡尝试重新注册网络！");
-            SimSignalUtil.send_at_to_onoff_simcard(runtime);
+            SimSignalUtil.send_at_to_reset_simcard(runtime);
         }
     }
 
diff --git a/app/src/main/java/com/enqualcomm/support/toolActivity.java b/app/src/main/java/com/enqualcomm/support/toolActivity.java
index e8e79797..e88fe551 100644
--- a/app/src/main/java/com/enqualcomm/support/toolActivity.java
+++ b/app/src/main/java/com/enqualcomm/support/toolActivity.java
@@ -58,7 +58,7 @@ public class toolActivity extends AppCompatActivity {
         btnSim.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                SimSignalUtil.send_at_to_onoff_simcard(CoreService.getInstance().runtime);
+                SimSignalUtil.send_at_to_reset_simcard(CoreService.getInstance().runtime);
                 Util.ShowToast(CoreService.getInstance().runtime,"Reset SimCard!");
             }
         });
diff --git a/app/src/main/java/com/enqualcomm/support/utils/SimSignalUtil.java b/app/src/main/java/com/enqualcomm/support/utils/SimSignalUtil.java
index 68d48b35..8e8a0359 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/SimSignalUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/SimSignalUtil.java
@@ -200,7 +200,7 @@ public class SimSignalUtil {
 
     return lisScreenOn;
   }
-  public static void send_at_to_onoff_simcard(Runtime runtime){
+  public static void send_at_to_reset_simcard(Runtime runtime){
 
     Intent intent = new Intent("com.eqc.intent.action.getTelephony.lbs");
     intent.putExtra("command", "AT+SFUN=2"); //重新初始化sim卡
@@ -209,14 +209,6 @@ public class SimSignalUtil {
     ICLogger.i("send_at_to_update_lbs ");
   }
 
-  public static void send_at_to_reload_simcard(Runtime runtime){
-
-    Intent intent = new Intent("com.eqc.intent.action.getTelephony.lbs");
-    intent.putExtra("command", "AT+SFUN=3"); //重新初始化sim卡
-    intent.putExtra("arg2", "");
-    ( runtime.getContextProxy()).context.sendBroadcast(intent);
-    ICLogger.i("send_at_to_update_lbs ");
-  }
   public static void send_at_to_update_lbs(Runtime runtime) {
     Intent intent = new Intent("com.eqc.intent.action.getTelephony.lbs");
     intent.putExtra("command", "AT+CREG=2");