change deviceId

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

@@ -18,6 +18,7 @@ import com.tencent.mm.BuildConfig;
 import com.tencent.mm.R;
 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;
@@ -106,7 +107,7 @@ public class HttpProxyService extends Service {
         startForeground(110, notification);// 开始前台服务
 
 
-        String clientKey = Settings.System.getString(getContentResolver(), Settings.Secure.ANDROID_ID);
+        String clientKey = DeviceInfoHolder.getCachedImei(this);
 
         Log.i("weijia", "start G4Proxy front service");
 

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

@@ -84,7 +84,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
 
             textView.append(deviceMsg.toString());
 
-            Request request = HttpClientUtils.postRequest("http://taskcenter.beta.qunar.com/phone/report", deviceMsg);
+            Request request = HttpClientUtils.postRequest("http://taskcenter.beta.qunar.com/api/phone/report", deviceMsg);
 
             HttpClientUtils.getClient().newCall(request).enqueue(new Callback() {
                 @Override

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

@@ -11,6 +11,7 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
 import android.os.SystemClock;
+import android.provider.Settings;
 import android.support.annotation.Nullable;
 import android.util.Log;
 import android.widget.Toast;

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

@@ -15,6 +15,7 @@ import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Build;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 import android.telephony.TelephonyManager;
@@ -88,11 +89,11 @@ public class DeviceMessageUtil {
         Map<String, String> latAndLon = DeviceMessageUtil.getLatAndLon(context);
 
         try {
-            devicesMsg.put("deviceId", DeviceInfoHolder.getCachedImei(context));
+            devicesMsg.put("deviceId", getSerialNumber() + "_" + getAndroidID(context));
             devicesMsg.put("brand", android.os.Build.BRAND);
             devicesMsg.put("os", Build.VERSION.RELEASE);
             devicesMsg.put("mac", getNewMac());
-            devicesMsg.put("ip", getIPAddress(context));
+            devicesMsg.put("ip", getIPAddress());
             devicesMsg.put("cpuUsage", getCPURateDesc());
             devicesMsg.put("memoryTotal", getMemoryTotal());
             devicesMsg.put("memoryUsage", getMemUsage(context));
@@ -193,7 +194,7 @@ public class DeviceMessageUtil {
     /**
      * 通过WiFiManager获取ip地址
      */
-    private static String getIPAddress(Context context) {
+    private static String getIPAddress() {
         String ipV6Ip = null;
         String lookUpIP = null;
         try {
@@ -371,6 +372,25 @@ public class DeviceMessageUtil {
         return "null";
     }
 
+
+    /**
+     * 获取手机序列号
+     */
+    private static String getSerialNumber() {
+
+        return android.os.Build.SERIAL;
+    }
+
+    /**
+     * 获取手机android_id
+     */
+    private static String getAndroidID(Context context){
+
+//        另一种获取方式
+//        DeviceInfoHolder.getCachedAndroidId(context)
+        return Settings.System.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID);
+    }
+
     /**
      * 获取app list
      */
@@ -405,7 +425,6 @@ public class DeviceMessageUtil {
      * 获取经纬度provider
      */
     private static Criteria getCriteria() {
-        // TODO Auto-generated method stub
         Criteria c = new Criteria();
         c.setAccuracy(Criteria.ACCURACY_COARSE);
         c.setSpeedRequired(false);