From cfec867880f866d957384e10d73fe70133030e68 Mon Sep 17 00:00:00 2001
From: jianbo <263303411@qq.com>
Date: Tue, 23 Nov 2021 17:19:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=94=AF=E4=B8=80=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86=E6=96=B9=E6=B3=95=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |   1 +
 .../fisherbone/fuzhu/FuzhuApplication.java    |   7 ++++++-
 .../fuzhu/activity/MainActivity.java          |  11 +++++++----
 .../build/libs/arouter_compiler.jar           | Bin 16243 -> 16243 bytes
 测试问题                                      |   7 ++++++-
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 10e2eda..b520770 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -128,5 +128,6 @@ dependencies {
         implementation project(":wechat")
 
     }
+    implementation 'com.github.gzu-liyujiang:Android_CN_OAID:4.0.0'
 }
 
diff --git a/app/src/main/java/com/fisherbone/fuzhu/FuzhuApplication.java b/app/src/main/java/com/fisherbone/fuzhu/FuzhuApplication.java
index a21cdc4..d8ec86c 100644
--- a/app/src/main/java/com/fisherbone/fuzhu/FuzhuApplication.java
+++ b/app/src/main/java/com/fisherbone/fuzhu/FuzhuApplication.java
@@ -5,6 +5,7 @@ import android.content.Context;
 
 import com.fisherbone.fuzhu.db.dao.DataBaseHelper;
 import com.fisherbone.fuzhu.utils.ProfileSpUtils;
+import com.github.gzuliyujiang.oaid.DeviceID;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.cache.CacheEntity;
 import com.lzy.okgo.cache.CacheMode;
@@ -49,6 +50,7 @@ public class FuzhuApplication extends Application {
     public static Context getContext() {
         return mContext;
     }
+    private boolean privacyPolicyAgreed = true;
 
     @Override
     public void onCreate() {
@@ -63,7 +65,10 @@ public class FuzhuApplication extends Application {
         MyCrashHandler.getInstance().init(this);
         NetworkApi.init(new XiangxueNetwork(this));
 
-
+        if (privacyPolicyAgreed) {
+            DeviceID.register(this);
+            privacyPolicyAgreed = true;
+        }
 
     }
 
diff --git a/app/src/main/java/com/fisherbone/fuzhu/activity/MainActivity.java b/app/src/main/java/com/fisherbone/fuzhu/activity/MainActivity.java
index 940d3e0..fc4d178 100644
--- a/app/src/main/java/com/fisherbone/fuzhu/activity/MainActivity.java
+++ b/app/src/main/java/com/fisherbone/fuzhu/activity/MainActivity.java
@@ -92,6 +92,7 @@ import com.fisherbone.fuzhu.utils.SPUtils;
 import com.fisherbone.fuzhu.utils.SystemUtil;
 import com.fisherbone.fuzhu.utils.UpdateManager;
 import com.fisherbone.fuzhu.utils.VersionUtils;
+import com.github.gzuliyujiang.oaid.DeviceID;
 import com.google.gson.Gson;
 import com.gyf.immersionbar.ImmersionBar;
 import com.jeremyliao.liveeventbus.LiveEventBus;
@@ -194,8 +195,12 @@ public class MainActivity extends BaseActivity implements InfoMessage {
         } else {
             ChangLiang.phonetype = "1";
         }
-
-
+        //新修改的获取唯一标识方法
+//        String clientId = DeviceID.getClientIdMD5();
+//        Log.e("TIAOSHI###", "设备唯一标识"+clientId);
+//        SPUtils.setSP(this, FZConfig.KEY_DEVICE_ID, clientId);
+//        OkGo.getInstance().addCommonParams(new HttpParams("device_id", clientId));
+        AblUtil.getPermissions(MainActivity.this);
 
         //adb shell pm grant com.fisherbone.fuzhu android.permission.WRITE_SECURE_SETTINGS
         Settings.Secure.putString(getContentResolver(), Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES, "com.fisherbone.fuzhu/com.fisherbone.fuzhu.abllib.AblService");
@@ -291,8 +296,6 @@ public class MainActivity extends BaseActivity implements InfoMessage {
         madeData();
         EventBus.getDefault().register(this);
         displayBriefMemory();
-        //红米7设备imei为:: 865367043276309
-        AblUtil.getPermissions(MainActivity.this);
         //设置公共参数
         String device_id = (String) SPUtils.getSp(MainActivity.this, FZConfig.KEY_DEVICE_ID, "");
         if (!"".equals(device_id)) {
diff --git a/arouter_compiler/build/libs/arouter_compiler.jar b/arouter_compiler/build/libs/arouter_compiler.jar
index 8b9d34e957f894ed29c26bb751f56236bdad7164..7f02485c25393f479431f17d22d19824b9145fdf 100644
GIT binary patch
delta 276
zcmexd_qmQYz?+$ci-CcIgW*PO*+gD7mNVN*0w<b#GS4hCoY<@grj~1gsVmleK*8X4
zVXmf+q6`eurjtL&s7!uuEw(wF@wX^Q$>LCPMi9L@LZXWW%y=sEf)mWRpccamVocUI
zaRdt#n>=R%Gh)qS!Hmg!E%m`F-dpxD106HD!O8^en#nt??7$K~tsn}ttu4U(G;6Rk
yCvUQj2lGX262WwZO*)u<WCIa*v4x1Qu=NLv|FTU1(}{M;VEVY7EtqDv&jA2)`DA(k

delta 276
zcmexd_qmQYz?+$ci-CcIgW*6&;Y40FmK)V(!4u6rnR#l>CN?XAspVSCn`$g3Ua{r_
zQo-%QTumQE85pEZCx4Jpnf%^bY;!o{Z&8qv#i8PiAbN9zL>CK~@l@soCzx?TEru7w
zn5=K&2o@+ddCml8#G1!~8I$)~>Vs9hx9npEI%aZ%l?m82lXqCzf!s0qr<FdK*0#0)
zD@?QY1k;<W<H59uO(K}Cut^8gk8B{~F18Ty6}J9h@n5znU^>w*8B8Cyvjx-a_Bj9m
CW@P{X

diff --git a/测试问题 b/测试问题
index e14041c..3191a3a 100644
--- a/测试问题
+++ b/测试问题
@@ -15,4 +15,9 @@
 
 
 ----------------------------------------------------------------------------------------------------
-安卓设备唯一标识解决方案，可完全替代移动安全联盟统一 SDK 闭源方案。https://github.com/gzu-liyujiang/Android_CN_OAID
\ No newline at end of file
+安卓设备唯一标识解决方案，可完全替代移动安全联盟统一 SDK 闭源方案。https://github.com/gzu-liyujiang/Android_CN_OAID
+
+
+
+----------------------------------------------------------------------------------------------------------
+唯一标识：https://github.com/gzu-liyujiang/Android_CN_OAID
\ No newline at end of file