fix

app/build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
 dependencies {
     implementation(fileTree(mapOf("dir" to "src/main/libs", "include" to listOf("*.aar"))))
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
-//    implementation(files("src\\main\\libs\\OpenInstall_v2.8.5.jar"))
+    implementation(files("src\\main\\libs\\Baidu_ocpc_action_2_7_2.aar"))
 //    implementation("com.google.firebase:firebase-crashlytics-buildtools:3.0.2")
 //    implementation(files("src/main/libs/openinstall.jar"))
 

app/proguard-rules.pro

@@ -287,3 +287,23 @@
 -keep class com.yingmao.clash.entity.** { *; }
 -keep class com.stripe.** { *; }
 -keep class kotlin.coroutines.Continuation
+
+# sdk
+-keep class com.bun.miitmdid.** { *; }
+-keep interface com.bun.supplier.** { *; }
+# asus
+-keep class com.asus.msa.SupplementaryDID.** { *; }
+-keep class com.asus.msa.sdid.** { *; }
+# freeme
+-keep class com.android.creator.** { *; }
+-keep class com.android.msasdk.** { *; }
+# huawei
+-keep class com.huawei.hms.ads.** { *; }
+-keep interface com.huawei.hms.ads.** {*; }
+# lenovo
+-keep class com.zui.deviceidservice.** { *; }
+-keep class com.zui.opendeviceidlibrary.** { *; }
+# meizu
+-keep class com.meizu.flyme.openidsdk.** { *; }
+# nubia
+-keep class com.bun.miitmdid.provider.nubia.NubiaIdentityImpl { *; }

app/src/main/java/com/yingmao/clash/app/MainApplication.kt

@@ -12,9 +12,13 @@ import android.os.Build
 import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat.getString
 import androidx.core.content.getSystemService
+import com.baidu.mobads.action.BaiduAction
 import com.cncat.vpn.common.Global
 import com.cncat.vpn.common.compat.currentProcessName
 import com.cncat.vpn.common.log.Log
+import com.github.gzuliyujiang.oaid.DeviceID
+import com.github.gzuliyujiang.oaid.DeviceIdentifier
+import com.github.gzuliyujiang.oaid.IGetter
 
 
 import com.jakewharton.processphoenix.ProcessPhoenix
@@ -92,7 +96,7 @@ class MainApplication : Application() {
 
         fun initUtil() {
             getApp()?.let { mainApplication ->
-//                DeviceIdentifier.register(mApp);
+                DeviceIdentifier.register(mApp);
 
                 val processName = mainApplication.currentProcessName
                 mainApplication.extractGeoFiles()
@@ -105,21 +109,21 @@ class MainApplication : Application() {
                 val crashCatchHandler: CrashCatchHandler = CrashCatchHandler.getInstance() //获得单例
                 crashCatchHandler.init(mainApplication) //初始化,传入context
 
-//                if (DeviceID.supportedOAID(mainApplication)) {
-//                    // 获取OAID/AAID，异步回调
-//                    DeviceID.getOAID(mainApplication, object : IGetter {
-//                        override fun onOAIDGetComplete(result: String) {
-//                            // 不同厂商的OAID/AAID格式是不一样的，可进行MD5、SHA1之类的哈希运算统一
-//                            Log.d("onOAIDGetComplete ${result}")
-//                            OAID = result
-//                        }
-//
-//                        override fun onOAIDGetError(error: Exception) {
-//                            // 获取OAID/AAID失败
-//                            error.printStackTrace()
-//                        }
-//                    })
-//                }
+                if (DeviceID.supportedOAID(mainApplication)) {
+                    // 获取OAID/AAID，异步回调
+                    DeviceID.getOAID(mainApplication, object : IGetter {
+                        override fun onOAIDGetComplete(result: String) {
+                            // 不同厂商的OAID/AAID格式是不一样的，可进行MD5、SHA1之类的哈希运算统一
+                            Log.d("onOAIDGetComplete ${result}")
+                            OAID = result
+                        }
+
+                        override fun onOAIDGetError(error: Exception) {
+                            // 获取OAID/AAID失败
+                            error.printStackTrace()
+                        }
+                    })
+                }
                 //openinstall
 //        OpenInstall.init(applicationContext);
                 PaymentConfiguration.init(
@@ -152,8 +156,12 @@ class MainApplication : Application() {
 //        if (privacyPolicyAgreed) {
 
 //        }
-
-
+        BaiduAction.setPrintLog(true)
+        BaiduAction.init(this, 22176, "1065b122915e0248c3f94e8296f99779")
+        // 设置应用激活的间隔（默认30天）
+        BaiduAction.setActivateInterval(this, 7)
+        // 以下接口必须按照文档要求在正确位置调用，否则无法正常上传日志
+        BaiduAction.setPrivacyStatus(0)
     }
 
     fun updateActivity(language: String, locale: Locale) {