update

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "com.tencent.mm"
         minSdkVersion 19
         targetSdkVersion 26
-        versionCode 9
-        versionName "1.9"
+        versionCode 23
+        versionName "1.23"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         multiDexEnabled true

app/src/main/AndroidManifest.xml

@@ -89,14 +89,16 @@
             </intent-filter>
         </receiver>
 
-        <!--&lt;!&ndash;覆盖安装后唤醒service&ndash;&gt;-->
-        <!--<receiver android:name="com.virjar.g4proxy.SelfStartReceiver">-->
-        <!--<intent-filter>-->
-        <!--<action android:name="android.intent.action.PACKAGE_REPLACED" />-->
-
-        <!--<data android:scheme="package" />-->
-        <!--</intent-filter>-->
-        <!--</receiver>-->
+        <!--覆盖安装后唤醒service-->
+        <!--有些机器会报错-->
+        <receiver android:name="com.virjar.g4proxy.SelfStartReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.PACKAGE_REPLACED" />
+                <action android:name="android.intent.action.PACKAGE_ADDED" />
+                <action android:name="android.intent.action.PACKAGE_REMOVED" />
+                <data android:scheme="package" />
+            </intent-filter>
+        </receiver>
 
         <service
             android:name="top.wuhaojie.installerlibrary.InstallAccessibilityService"

app/src/main/java/com/virjar/g4proxy/Constant.java

@@ -6,4 +6,8 @@ public class Constant {
     public static final String sharedPreferenceFile = "config";
 
     public static final String schedulerTAG = "SchedulerTask";
+
+    public static final String DeviceMessageUtilTAG = "DeviceMessage";
+
+    public static final String DeviceInfoHolderTAG = "DeviceInfoHolder";
 }

app/src/main/java/com/virjar/g4proxy/HttpProxyService.java

@@ -10,7 +10,6 @@ import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.IBinder;
-import android.provider.Settings;
 import android.support.annotation.Nullable;
 import android.util.Log;
 
@@ -20,13 +19,11 @@ import com.virjar.g4proxy.client.G4ProxyClient;
 import com.virjar.g4proxy.client.LittelProxyBootstrap;
 import com.virjar.g4proxy.utils.DeviceInfoHolder;
 
-import org.littleshoot.proxy.Launcher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-
 import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
 
 /**
@@ -107,7 +104,7 @@ public class HttpProxyService extends Service {
         startForeground(110, notification);// 开始前台服务
 
 
-        String clientKey = DeviceInfoHolder.getCachedImei(this);
+        String clientKey = DeviceInfoHolder.getDeviceId(this);
 
         Log.i("weijia", "start G4Proxy front service");
 

app/src/main/java/com/virjar/g4proxy/SelfStartReceiver.java

@@ -14,6 +14,7 @@ import com.virjar.g4proxy.service.SchedulerTaskService;
 // 这里我们先依靠slave进行守护保活
 public class SelfStartReceiver extends BroadcastReceiver {
 
+    //TODO： 有些自启动机器会报错
     @Override
     public void onReceive(Context context, Intent intent) {
 
@@ -42,8 +43,12 @@ public class SelfStartReceiver extends BroadcastReceiver {
             Intent launchHttpProxyService = new Intent(context, HttpProxyService.class);
             launchHttpProxyService.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
+            Intent mainActivity = new Intent(context, MainActivity.class);
+            mainActivity.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
             context.startService(launchAppUpdateService);
-            context.startActivity(launchHttpProxyService);
+            context.startService(launchHttpProxyService);
+            context.startActivity(mainActivity);
         }
     }
 }

app/src/main/java/com/virjar/g4proxy/service/SchedulerTaskService.java

@@ -44,7 +44,7 @@ public class SchedulerTaskService extends Service {
     public static final int reportInterval = 5;
 
     public static final String getNewestModifiedApkUrl = "http://www.scumall.com:5597/hermes/ModifiedApp/getNewestModifiedApk?appPackageName=";
-    //public static final String msgReportlUrl ="http://taskcenter.beta.qunar.com/api/phone/report"
+//    public static final String msgReportlUrl ="http://taskcenter.beta.qunar.com/api/phone/report";
     public static final String msgReportlUrl = "https://hotelcrawl.qunar.com/api/phone/report";
 
     private long lastCheckUpdateTimestamp = 0;

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

@@ -2,7 +2,6 @@ package com.virjar.g4proxy.utils;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
@@ -16,6 +15,11 @@ import android.util.Log;
 import com.virjar.g4proxy.Constant;
 import com.virjar.g4proxy.MainActivity;
 
+import java.io.BufferedReader;
+import java.io.FileReader;
+
+import static com.virjar.g4proxy.Constant.DeviceInfoHolderTAG;
+
 public class DeviceInfoHolder {
 
 
@@ -23,6 +27,8 @@ public class DeviceInfoHolder {
 
     private static String androidId;
 
+    private static String serialNumber;
+
     public static void initDeviceInfo(MainActivity activity) {
         if (ActivityCompat.checkSelfPermission(activity, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
             if (ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.ACCESS_FINE_LOCATION)) {
@@ -65,7 +71,12 @@ public class DeviceInfoHolder {
                 imei = imeiCopy;
             }
 
+            if (imei == null){
+                imei = DeviceMessageUtil.getMachineImei(activity);
+            }
+
             androidId = Settings.System.getString(activity.getContentResolver(), Settings.Secure.ANDROID_ID);
+            serialNumber = android.os.Build.SERIAL;
 
             save(activity);
         } catch (Exception e) {
@@ -103,6 +114,7 @@ public class DeviceInfoHolder {
 
         edit.putString("imei", imei);
         edit.putString("androidId", androidId);
+        edit.putString("serialNumber", serialNumber);
         edit.apply();
     }
 
@@ -115,4 +127,48 @@ public class DeviceInfoHolder {
         restoreInfo(context);
         return androidId;
     }
+
+    public static String getDeviceId(Context context) {
+
+        int channel = 0;
+        String deviceId;
+
+        String slaveInfoPath = "/sdcard/slave_info.txt";
+        String firstLine = null;
+        try {
+            FileReader fileReader = new FileReader(slaveInfoPath);
+            BufferedReader br = new BufferedReader(fileReader, 8192);
+            firstLine = br.readLine();
+            br.close();
+        } catch (Exception e) {
+            Log.e(DeviceInfoHolderTAG, "Cannot find slave_info.txt !");
+            e.printStackTrace();
+        }
+        if (firstLine != null) {
+            channel = Integer.valueOf(firstLine.split(",")[1]);
+        } else {
+            Log.e(DeviceInfoHolderTAG, "slave_info.txt can not be parsed!");
+        }
+        //0：UI  1：沙盒
+        switch (channel) {
+            case 0:
+                deviceId = DeviceMessageUtil.getSerialNumber();
+                Log.e(DeviceInfoHolderTAG, "channel: " + channel);
+                break;
+            case 1:
+                deviceId = DeviceMessageUtil.getSerialNumber() + "_" + getCachedAndroidId(context);
+                Log.e(DeviceInfoHolderTAG, "channel: " + channel);
+                break;
+            default:
+                deviceId = null;
+                Log.e(DeviceInfoHolderTAG, "channel error!");
+        }
+
+        if (deviceId == null){
+            System.exit(0);
+            Log.e(DeviceInfoHolderTAG, "exit for deviceId is null.");
+        }
+
+        return deviceId;
+    }
 }

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

@@ -107,6 +107,9 @@ public class MyLocationListener implements BDLocationListener{
         Log.i("BaiduLocationApiDem", sb.toString());
 
         //定位成功，可以将定位的数据保存下来，Const就是保存数据的类
+        if(location.getLongitude() == 4.9E-324){
+            return;
+        }
         if(Const.LONGITUDE == 0 || Const.LONGITUDE == 4.9E-324) {
             Const.LONGITUDE = location.getLongitude();
             Const.LATITUDE = location.getLatitude();

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

@@ -6,4 +6,5 @@ package com.virjar.g4proxy.utils;
 
 public class SmsManagerUtil {
 
+    //TODO: 短信收发
 }