优化代码

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

@@ -1,17 +1,13 @@
 package com.xypower.mpmaster;
 
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.Network;
-import android.net.NetworkCapabilities;
 import android.net.NetworkInfo;
-import android.net.NetworkRequest;
 import android.os.Environment;
 import android.os.PowerManager;
 import android.os.SystemClock;
-import android.os.storage.StorageManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Pair;
@@ -213,9 +209,9 @@ public class AppMaster {
             postParams.add(new Pair<String, String>("oid", mService.getSerialNo()));
             postParams.add(new Pair<String, String>("maintainVersion", mService.getMasterAppVersion()));
 
-            postParams.add(new Pair<String, String>("simcard1", getSimcard(1)));
+            postParams.add(new Pair<String, String>("simcard1", getImei(1)));
             if (mService.isSeparateNetwork()) {
-                postParams.add(new Pair<String, String>("simcard2", getSimcard(2)));
+                postParams.add(new Pair<String, String>("simcard2", getImei(2)));
             }
 
             postParams.add(new Pair<String, String>("freeROM", getFreeROM()));
@@ -340,7 +336,7 @@ public class AppMaster {
         return "";
     }
 
-    private String getSimcard(int number) {
+    private String getImei(int number) {
         return (number == 1) ? SysApi.getImei(mService) : SysApi.getImei2(mService);
     }