From: SnickerSun <scy@incartech.cn>
Date: Wed, 7 Jul 2021 01:56:38 +0000 (+0800)
Subject: release ProtocolV2 V888
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=2fb2f29d21df5319c74b1061f04d8e88b84054b1;p=protocol_srv.git

release ProtocolV2 V888
修正APN调用方式，目前默认L004，L005 使用 Tele2 IoT ，这个只能是临时方案，后面改为可配置。
---

diff --git a/app/release/ICSer_V885_2107052142_release.apk b/app/release/ICSer_V888_2107070948_release.apk
similarity index 77%
rename from app/release/ICSer_V885_2107052142_release.apk
rename to app/release/ICSer_V888_2107070948_release.apk
index c265c849..d7e1499a 100644
Binary files a/app/release/ICSer_V885_2107052142_release.apk and b/app/release/ICSer_V888_2107070948_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index ff565516..95b0cf6c 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":885,"versionName":"2107052142","enabled":true,"outputFile":"ICSer_V885_2107052142_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V885_2107052142_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":888,"versionName":"2107070948","enabled":true,"outputFile":"ICSer_V888_2107070948_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V888_2107070948_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 12ddff76..ac21cc94 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -44,6 +44,7 @@ import com.enqualcomm.support.service.SilentManager;
 import com.enqualcomm.support.service.WeTalkMsgObserver;
 import com.enqualcomm.support.service.base.AbstractConnectionService;
 import com.enqualcomm.support.service.base.AbstractInvokeHandlerService;
+import com.enqualcomm.support.utils.APNUtil;
 import com.enqualcomm.support.utils.AlarmHelper;
 import com.enqualcomm.support.utils.AlarmWakeUp;
 import com.enqualcomm.support.utils.BatteryUtil;
@@ -899,6 +900,19 @@ public class CoreService extends Service {
 
         //重置缓存中的在等待命令
         Deliver.resetCMDReocrdsDB();
+
+
+        if(Config.custom_name.equals("l004pt")||Config.custom_name.equals("l004")||Config.custom_name.equals("l005"))
+        {
+            mHandler.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    //L004PT ,L005 默认开启roaming以及默认使用以下apn
+                    APNUtil.selectAPN("240","07","NXT17.NET",CoreService.getInstance());
+                }
+            },5000);
+
+        }
         ReConnectToServer();
     }
 
diff --git a/app/src/main/java/com/enqualcomm/support/utils/APNUtil.java b/app/src/main/java/com/enqualcomm/support/utils/APNUtil.java
index 2ed39a49..35efdc78 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/APNUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/APNUtil.java
@@ -82,9 +82,7 @@ public class APNUtil {
      * @return
      */
     public static boolean selectAPN(String mcc,String mnc,String apn,Context context) {
-        ApnEditor apnEditor=new ApnEditor(context);
-        apnEditor.setDefaultAPN(apn,mcc+mnc);
-
+        ApnEditor.getApnEditorInstance(context).setDefaultAPN(apn,mcc+mnc);
         return true;
     }
     public static boolean checkAPN(String mcc,String mnc,String apn,Context context) {
diff --git a/app/src/main/java/com/enqualcomm/support/utils/ApnEditor.java b/app/src/main/java/com/enqualcomm/support/utils/ApnEditor.java
index 1db6ff0b..bedd8297 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/ApnEditor.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ApnEditor.java
@@ -267,13 +267,12 @@ public class ApnEditor {
     }
     public void setDefaultAPN(String apn, String mccmnc){
         String apnid=queryApnID(apn,mccmnc);
-        String currentapnid=apnEditor.getSelectedApnKey();
+        String currentapnid=getSelectedApnKey();
         ICLogger.d("current APN key "+apnid +" selected APN key " + currentapnid);
         setSelectedApnKey(apnid);
-        currentapnid=apnEditor.getSelectedApnKey();
+        currentapnid=getSelectedApnKey();
         ICLogger.d("after set APN key "+apnid +" selected APN key " + currentapnid);
 
-
     }
     public String queryApnID(String apn,String mccmnc) {
 
diff --git a/app/version_code.properties b/app/version_code.properties
index fa766153..dd2bb559 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Jul 05 21:42:01 CST 2021
-VERSION_CODE=885
+#Wed Jul 07 09:48:55 CST 2021
+VERSION_CODE=888