添加设备æŒ指纹

project_build.gradle

@@ -2,11 +2,11 @@ defaultTasks 'clean', 'assembleAppProductWebsiteReleaseChannels'
 
 ext {
     // sdk & tools
-    minSdkVersion = 16
-    targetSdkVersion = 27
-    compileSdkVersion = 27
-    buildToolsVersion = '27.0.3'
-    supportLibraryVersion = '27.1.1'
+    minSdkVersion = 19
+    targetSdkVersion = 28
+    compileSdkVersion = 28
+    buildToolsVersion = '28.0.3'
+    supportLibraryVersion = '28.0.0'
 }
 
 allprojects {

script/garble/obact.py

@@ -8,7 +8,7 @@ used_names = []
 activity_mangle_setting = {}
 
 def process_file_content(path, file_name):
-    print("processing content: %s..."%path)
+    # print("processing content: %s..."%path)
     with open(path, "rt") as fin:
         file_content = fin.read()
         
@@ -71,7 +71,7 @@ for root, dirs, files in os.walk(source_root):
                 src = os.path.join(directory, file)
                 dst = os.path.join(directory, "%s.java"%activity_mangle_setting[name])
                 
-                print("%s -> %s"%(src, dst))
+                # print("%s -> %s"%(src, dst))
                 os.rename(src, dst)
 print("renaming files done")
 

src/main/AndroidManifest.xml

@@ -4,12 +4,10 @@
 
     <!--写入SD卡-->
     <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        tools:node="remove" />
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <!--读取SD卡-->
     <uses-permission
-        android:name="android.permission.READ_EXTERNAL_STORAGE"
-        tools:node="remove" />
+        android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <!--相机-->
     <uses-permission android:name="android.permission.CAMERA" />

src/main/java/tech/starwin/LibConfig.java

@@ -17,7 +17,6 @@ import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
 
 
-
 import cn.fraudmetrix.octopus.aspirit.main.OctopusManager;
 
 import tech.starwin.network.Gateway;
@@ -141,6 +140,8 @@ public class LibConfig {
 
     }
 
+
+
     /**
      * init FirebaseRemoteConfig 1
      */

src/main/java/tech/starwin/network/DefaultHeaderAddInterceptor.java

@@ -57,25 +57,18 @@ class DefaultHeaderAddInterceptor implements Interceptor {
             requestBuilder.header("Connection", "Keep-Alive");
         }
 
-        if (!TextUtils.isEmpty(LibConfig.XH_CHANNEL_NAME)) {
-            requestBuilder.header("X-APP-SOURCE", LibConfig.XH_CHANNEL_NAME);
-        }
-
-        boolean transparentGzip = false;
         if (userRequest.header("Accept-Encoding") == null && userRequest.header("Range") == null) {
-            transparentGzip = true;
             requestBuilder.header("Accept-Encoding", "gzip");
         }
 
-        if (LoginManager.get().getToken() != null) {
-            requestBuilder.header("X-AUTH-TOKEN", LoginManager.get().getToken());
-        }
         requestBuilder.header("X-APP-TYPE", "ANDROID")
                 .header("X-APP-VERSION", String.valueOf(LibConfig.VERSION_CODE))
                 .header("X-APP-VERSION-NAME", String.valueOf(LibConfig.VERSION_NAME))
                 .header("X-APP-PACKAGE-NAME", LibConfig.APPLICATION_ID)
                 .header("X-APP-NAME", LibConfig.APP_NAME)
                 .header("X-APP-ROOTED", getRootStatus())
+                .header("X-AUTH-TOKEN", LoginManager.get().getToken() == null ? "" : LoginManager.get().getToken())
+                .header("X-APP-SOURCE", LibConfig.XH_CHANNEL_NAME == null ? "" : LibConfig.XH_CHANNEL_NAME)
                 .header("thirdpartyDataFlag", String.valueOf(!TextUtils.isEmpty(LibConfig.TONGDUN_PARENT_KEY)))
 //                .header("X-APP-SIM-MOBILE", getSimInfo())
                 .header("X-AF-ID", LibConfig.APPSFLYER_DEV_KEY == null ? "" : LibConfig.APPSFLYER_DEV_KEY)

src/main/java/tech/starwin/network/FirebaseHeaderInterceptor.java

@@ -3,6 +3,7 @@ package tech.starwin.network;
 
 import android.text.TextUtils;
 
+import com.common.toolbox.app_utils.DeviceInfo;
 import com.facebook.libfbref.FbDeepLink;
 
 import java.io.IOException;
@@ -13,9 +14,7 @@ import okhttp3.Request;
 import okhttp3.Response;
 import tech.starwin.LibConfig;
 import tech.starwin.utils.LogUtils;
-import tech.starwin.utils.LoginManager;
 import tech.starwin.utils.PreferencesManager;
-import tech.starwin.utils.collection.UploadManager;
 import tech.starwin.utils.context_utils.AppInfoUtils;
 
 /**
@@ -38,16 +37,12 @@ public class FirebaseHeaderInterceptor implements Interceptor {
                 LogUtils.d(TAG, "android_id: " + AppInfoUtils.getAndroidID(LibConfig.getContext()));
                 builder.addHeader("X-REFERRER", TextUtils.isEmpty(referrer) ? PreferencesManager.get().getInstallReferrer() : referrer)
                         .addHeader("X-REFERRER-SDK", TextUtils.isEmpty(referrer) ? PreferencesManager.get().getInstallReferrerFromSDK() : referrer)
-                        .addHeader("X-ANDROID-ID", AppInfoUtils.getAndroidID(LibConfig.getContext()));
-
-                //登录后的上传
-                if (!existHeader(newRequest.headers(), "X-AUTH-TOKEN") &&
-                        LoginManager.get().getToken() != null) {
-                    builder.addHeader("X-AUTH-TOKEN", LoginManager.get().getToken());
-                }
+                        .addHeader("X-ANDROID-ID", AppInfoUtils.getAndroidID(LibConfig.getContext()))
+                        .addHeader("X-DEVICE-SIGN", DeviceInfo.getSignFromHardware())
+                        .addHeader("X-SD-SIGN", DeviceInfo.getDeviceSignFromSD());
 
                 newRequest = builder.build();
-
+                LogUtils.d("HttpHeaders",newRequest.headers().toString());
             }
         } catch (Exception e) {
             e.printStackTrace();