From: snickersun <scy@incartech.cn>
Date: Wed, 31 Mar 2021 03:31:36 +0000 (+0800)
Subject: release 772
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=11906616894d1cc6763d00f4b6a4e2b37a0f4066;p=protocol_srv.git

release 772
给DeviceInfo 窗口增加 SIM卡状态，信号强度信息。
---

diff --git a/app/release/ICSer_V770_2103292114_release.apk b/app/release/ICSer_V772_2103311126_release.apk
similarity index 76%
rename from app/release/ICSer_V770_2103292114_release.apk
rename to app/release/ICSer_V772_2103311126_release.apk
index 8cca28a0..3b05ffdc 100644
Binary files a/app/release/ICSer_V770_2103292114_release.apk and b/app/release/ICSer_V772_2103311126_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index c344e1ac..5a1ab0b1 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":770,"versionName":"2103292114","enabled":true,"outputFile":"ICSer_V770_2103292114_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V770_2103292114_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":772,"versionName":"2103311126","enabled":true,"outputFile":"ICSer_V772_2103311126_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V772_2103311126_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/enqualcomm/support/DeviceInfoActivity.java b/app/src/main/java/com/enqualcomm/support/DeviceInfoActivity.java
index 4bf8c14b..a728da99 100644
--- a/app/src/main/java/com/enqualcomm/support/DeviceInfoActivity.java
+++ b/app/src/main/java/com/enqualcomm/support/DeviceInfoActivity.java
@@ -2,6 +2,7 @@ package com.enqualcomm.support;
 
 import android.app.Activity;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
@@ -14,7 +15,7 @@ import com.enqualcomm.support.utils.CellInfoUtil;
 import com.enqualcomm.support.utils.DeviceInfoUtil;
 import com.enqualcomm.support.utils.SimSignalUtil;
 import com.enqualcomm.support.utils.Util;
-
+import com.enqualcomm.support.bean.Runtime;
 import chestnut.utils.PhoneUtils;
 
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
@@ -35,7 +36,12 @@ public class DeviceInfoActivity extends Activity {
         tv_Version.setText("Protocol:"+DeviceInfoUtil.getVersionCode(this)+"\r\nFirmware:"+Build.DISPLAY);
         tv_serveraddr.setText("P"+Config.protocol_no+" "+Config.getProtocolServerHost(this)+":"+Config.getProtocolServerPort(this));
         if (CoreService.getInstance()!=null) {
-          tv_mncmcc.setText(CoreService.getInstance().runtime.getMccAndMnc());
+            Runtime runtime=CoreService.getInstance().runtime;
+            SimSignalUtil sim=SimSignalUtil.getInstance(this);
+            String HAS_SIM=sim.hasSimCard(this)?" SIM Ready ":" NoSIM ";
+            HAS_SIM+=sim.getNetworkType()==SimSignalUtil.IS_2G?"2G":(sim.getNetworkType()==SimSignalUtil.IS_3G)?"3G":(sim.getNetworkType()==SimSignalUtil.IS_4G?"4G":"unknown");
+            HAS_SIM+= " ["+runtime.getSignalStrength()+","+runtime.getSignalInfo()+"] ";
+          tv_mncmcc.setText(HAS_SIM+" : "+CoreService.getInstance().runtime.getMccAndMnc());
         }
 
     }
diff --git a/app/src/main/res/layout/activity_showinfo.xml b/app/src/main/res/layout/activity_showinfo.xml
index ae87456e..8578b37c 100644
--- a/app/src/main/res/layout/activity_showinfo.xml
+++ b/app/src/main/res/layout/activity_showinfo.xml
@@ -76,7 +76,7 @@
         <TextView
             android:id="@+id/ic_mnc_nametxt"
             style="@style/IcTextStyle"
-            android:text="MCC_MNC:"
+            android:text="4G Signal MCC_MNC:"
             android:textSize="20sp" />
 
         <TextView
diff --git a/app/version_code.properties b/app/version_code.properties
index e01bca99..6d30eac8 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Mar 29 21:14:45 CST 2021
-VERSION_CODE=770
+#Wed Mar 31 11:26:30 CST 2021
+VERSION_CODE=772