网络信号信息优化

mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java

@@ -5,7 +5,6 @@ import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.Network;
 import android.os.Build;
-import android.os.Environment;
 import android.os.PowerManager;
 import android.os.SystemClock;
 import android.text.TextUtils;
@@ -238,8 +237,13 @@ public class AppMaster {
 
             postParams.add(new Pair<String, String>("firmware", MpMasterService.getSystemProperty("ro.custom.ota.version")));
 
-            postParams.add(new Pair<String, String>("signalLevel1", Integer.toString(MpMasterService.getSignalLevel(1))));
-            postParams.add(new Pair<String, String>("signalLevel2", Integer.toString(MpMasterService.getSignalLevel(2))));
+            int ss1 = MpMasterService.getSignalStrength(1);
+            int ss2 = MpMasterService.getSignalStrength(2);
+            postParams.add(new Pair<String, String>("signalLevel1", Integer.toString(MpMasterService.getSignalLevel(ss1, 1))));
+            postParams.add(new Pair<String, String>("signalLevel2", Integer.toString(MpMasterService.getSignalLevel(ss2, 2))));
+
+            postParams.add(new Pair<String, String>("ss1", Integer.toString(ss1)));
+            postParams.add(new Pair<String, String>("ss2", Integer.toString(ss2)));
 
             if (isCriticalTime) {
                 // SysApi.

mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java

@@ -47,7 +47,6 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.lang.reflect.Method;
-import java.nio.channels.FileLock;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
@@ -55,7 +54,7 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.concurrent.atomic.AtomicInteger;;
+;
 
 public class MpMasterService extends Service {
     static {
@@ -1070,7 +1069,7 @@ public class MpMasterService extends Service {
         return JSONUtils.saveJson(path, jsonObject);
     }
 
-    public static int getSignalLevel(int num) {
+    public static int getSignalStrength(int num) {
         String result = getSystemProperty("vendor.ril.nw.signalstrength.lte." + Integer.toString(num));
         if (TextUtils.isEmpty(result)) {
             return 0;
@@ -1084,7 +1083,7 @@ public class MpMasterService extends Service {
             } catch (Exception ex) {
             }
         }
-        return getSignalLevel(rsrp, num);
+        return rsrp;
     }
 
     public static int getSignalLevel(long ss, int num) {

mpmaster/src/main/java/com/xypower/mpmaster/sms/SimUtil.java

@@ -2,6 +2,7 @@ package com.xypower.mpmaster.sms;
 
 
 import android.Manifest;
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.PendingIntent;
 import android.content.ContentResolver;
@@ -38,10 +39,8 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.File;
-import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -704,18 +703,9 @@ public class SimUtil {
                     result.append("," + getNetworkName(networkType));
                     result.append("," + getSimStateName(simState));
 
-                    String ss = MpMasterService.getSystemProperty("vendor.ril.nw.signalstrength.lte." + Integer.toString(slotIdx + 1));
-                    if (!TextUtils.isEmpty(ss)) {
-                        int pos = ss.indexOf(',');
-                        if (pos != -1) {
-                            ss = ss.substring(0, pos);
-
-                            result.append(",SL=" + ss);
-                            int ssVal = Integer.parseInt(ss);
-                            result.append("/" + Integer.toString(MpMasterService.getSignalLevel(ssVal, 5)));
-                        }
-
-                    }
+                    int ss = MpMasterService.getSignalStrength(slotIdx + 1);
+                    result.append(",SL=" + Integer.toString(ss));
+                    result.append("/" + Integer.toString(MpMasterService.getSignalLevel(ss, slotIdx + 1)));
 
                     result.append(isActiveSlot ? ",默认" : "");