update

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "com.tencent.mm"
         minSdkVersion 19
         targetSdkVersion 26
-        versionCode 7
-        versionName "1.7"
+        versionCode 11
+        versionName "1.11"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         multiDexEnabled true

app/src/main/java/com/virjar/g4proxy/utils/DeviceInfoHolder.java

@@ -5,7 +5,6 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.provider.Settings;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 import android.telephony.TelephonyManager;
@@ -75,7 +74,7 @@ public class DeviceInfoHolder {
                 imei = DeviceMessageUtils.getMachineImei(activity);
             }
 
-            androidId = Settings.System.getString(activity.getContentResolver(), Settings.Secure.ANDROID_ID);
+            androidId = DeviceMessageUtils.getAndroidID(activity);
             serialNumber = android.os.Build.SERIAL;
 
             save(activity);
@@ -156,7 +155,7 @@ public class DeviceInfoHolder {
                 Log.e(DeviceInfoHolderTAG, "channel: " + channel);
                 break;
             case 1:
-                deviceId = DeviceMessageUtils.getSerialNumber() + "_" + getCachedAndroidId(context);
+                deviceId = DeviceMessageUtils.getSerialNumber() + "_" + DeviceMessageUtils.getAndroidID(context);
                 Log.e(DeviceInfoHolderTAG, "channel: " + channel);
                 break;
             default:

app/src/main/java/com/virjar/g4proxy/utils/DeviceMessageUtils.java

@@ -423,8 +423,7 @@ public class DeviceMessageUtils {
     /**
      * 获取手机android_id
      */
-    private static String getAndroidID(Context context) {
-
+    public static String getAndroidID(Context context) {
 
         String sandboxIdpath = "/sdcard/qb/android_id.txt";