From: TrillGates Date: Thu, 12 Aug 2021 03:39:28 +0000 (+0800) Subject: fixed air mode issues. X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=c7448ddae7b842f972e081b3ed3f32526999db32;p=icsupport.git fixed air mode issues. --- diff --git a/app/release/ICSer_V910_2108101433_release.apk b/app/release/ICSer_V911_2108111805_release.apk similarity index 77% rename from app/release/ICSer_V910_2108101433_release.apk rename to app/release/ICSer_V911_2108111805_release.apk index eb8c9d21..d6ac4967 100644 Binary files a/app/release/ICSer_V910_2108101433_release.apk and b/app/release/ICSer_V911_2108111805_release.apk differ diff --git a/app/release/output.json b/app/release/output.json index f13c477a..8e8806f5 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":910,"versionName":"2108101433","enabled":true,"outputFile":"ICSer_V910_2108101433_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V910_2108101433_release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":911,"versionName":"2108111805","enabled":true,"outputFile":"ICSer_V911_2108111805_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V911_2108111805_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 c63f00ca..61f623d5 100644 --- a/app/src/main/java/com/enqualcomm/support/CoreService.java +++ b/app/src/main/java/com/enqualcomm/support/CoreService.java @@ -1784,23 +1784,10 @@ 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); //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"); - // disconnect_server(); - // ReConnectToServer(); - } - } - }; - public void stopConnectionRetryTimer() { if (mTimer_retry_connect != null) { mTimer_retry_connect.shutdownNow(); diff --git a/app/src/main/java/com/enqualcomm/support/utils/Util.java b/app/src/main/java/com/enqualcomm/support/utils/Util.java index 8aaa077c..a7a4bae7 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/Util.java +++ b/app/src/main/java/com/enqualcomm/support/utils/Util.java @@ -476,19 +476,12 @@ public class Util { } static public void setSystemProperties(String key, String defaultValue) { - String value = defaultValue; - try { - Class c = Class.forName("android.os.SystemProperties"); - Method set = c.getMethod("set", String.class, String.class); - set.invoke(c, key, value); - } catch (Exception e) { - e.printStackTrace(); ICLogger.e(e.getMessage(), e); } diff --git a/app/src/main/java/com/ic/protocols/protocol_fzd.java b/app/src/main/java/com/ic/protocols/protocol_fzd.java index 7bc74d37..1f93acd7 100644 --- a/app/src/main/java/com/ic/protocols/protocol_fzd.java +++ b/app/src/main/java/com/ic/protocols/protocol_fzd.java @@ -2315,6 +2315,10 @@ public class protocol_fzd { ICLogger.d("target number is == > " + targetPhone); //进行拨号 if (targetPhone != null) { + //先设置标记位 + Util.setSystemProperties("persist.sys.call.monitor", "true"); + String isMonitor = Util.getSystemProperties("persist.sys.call.monitor"); + ICLogger.d("isMonitor ==> " + isMonitor); doCall(targetPhone, mRuntime); } } diff --git a/app/src/main/java/com/ic/protocols/protocol_s123.java b/app/src/main/java/com/ic/protocols/protocol_s123.java index de088c29..cae20812 100644 --- a/app/src/main/java/com/ic/protocols/protocol_s123.java +++ b/app/src/main/java/com/ic/protocols/protocol_s123.java @@ -723,6 +723,7 @@ public class protocol_s123 { if (TextUtils.isEmpty(runtime.getIccid()) || TextUtils.isEmpty(runtime.getImsi())) { String phoneStatus = getPhoneStatus(runtime); ICLogger.d("phoneStatus == > " + phoneStatus); + ICLogger.d("这个协议需要插sim卡,没有sim卡,没有ICCID连接不了服务器..."); return null; } //准备数据 diff --git a/app/version_code.properties b/app/version_code.properties index 84c86cf4..80633694 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Tue Aug 10 14:33:30 CST 2021 -VERSION_CODE=910 +#Wed Aug 11 18:05:32 CST 2021 +VERSION_CODE=911