update qcloud sdk to 1.5.77

Author: jordanqin

QCloudFoundation/foundation/build.gradle

@@ -7,8 +7,8 @@ android {
         minSdkVersion 15
         targetSdkVersion 28
 
-        versionCode 10577
-        versionName "1.5.76"
+        versionCode 10578
+        versionName "1.5.77"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 

QCloudFoundation/qcloud-track/build.gradle

@@ -7,8 +7,8 @@ android {
         minSdkVersion 19
         targetSdkVersion 33
 
-        versionCode 10002
-        versionName "1.0.2"
+        versionCode 10003
+        versionName "1.0.3"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         consumerProguardFiles "consumer-rules.pro"
@@ -50,10 +50,7 @@ dependencies {
     compileOnly 'com.google.guava:guava:27.0.1-android'
 
     compileOnly files(
-            'libs/beacon-android-release-4.2.86.7-hf1-official.aar',
-            'libs/qimei-1.2.18.3.aar',
-            'libs/qimei-core-1.2.18.3-normal.aar',
-            'libs/qmsp-oaid2-1.0.4.aar'
+            'libs/beacon-android-release-4.2.86.7-hf1-external-official.aar',
     )
 }
 

QCloudFoundation/qcloud-track/consumer-rules.pro

@@ -1,8 +1,6 @@
 -keep class net.jpountz.lz4.** { *; }
 
 # beacon
--keep class com.tencent**qimei.** { *;}
--keep class com.tencent.qmsp.oaid2.** {*;}
 -keep class com.tencent.beacon.** { *;}
 
 # R8
@@ -14,12 +12,6 @@
 -dontwarn com.tencent.beacon.event.open.EventResult
 -dontwarn com.tencent.beacon.event.open.EventType
 
--dontwarn com.tencent.qimei.sdk.IQimeiSDK
--dontwarn com.tencent.qimei.sdk.QimeiSDK
--dontwarn com.tencent.qimei.strategy.terminal.ITerminalStrategy
--dontwarn com.tencent.qimei.codez.FalconSdk
--dontwarn com.tencent.qimei.codez.IFalconSdk
--dontwarn com.tencent.qimei.codez.shell.UserInfoType
 -dontwarn com.tencent.smtt.export.external.extension.interfaces.IX5WebViewExtension
 -dontwarn com.tencent.smtt.sdk.WebSettings
 -dontwarn com.tencent.smtt.sdk.WebView

QCloudFoundation/qcloud-track/libs/beacon-android-release-4.2.86.7-hf1-external-official.aar

@@ -23,9 +23,11 @@
 package com.tencent.qcloud.track;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
+import android.provider.Settings;
 import android.util.Log;
 
 import com.tencent.beacon.event.open.BeaconConfig;
@@ -34,13 +36,12 @@
 import com.tencent.qcloud.track.service.BeaconTrackService;
 import com.tencent.qcloud.track.service.ClsTrackService;
 import com.tencent.qcloud.track.utils.NetworkUtils;
-import com.tencent.qimei.sdk.IQimeiSDK;
-import com.tencent.qimei.sdk.QimeiSDK;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 /**
  * 数据追踪服务
@@ -92,9 +93,9 @@ public synchronized void init(Context context) {
             if (!isInitialized) {
                 this.context = context.getApplicationContext();
                 commonParams = getCommonParams();
-                // 因为默认上报简单数据到灯塔，因此默认初始化灯塔和QIMEI
+                // 因为默认上报简单数据到灯塔，因此默认初始化灯塔
                 if (BeaconTrackService.isInclude()) {
-                    initBeaconAndQimei();
+                    initBeacon();
                     simpleDataTrackService = new BeaconTrackService();
                     // 设置context
                     simpleDataTrackService.setContext(context);
@@ -230,36 +231,28 @@ public void setDebug(boolean debug) {
     }
 
     /**
-     * 初始化灯塔和qimei
+     * 初始化灯塔
      */
-    private void initBeaconAndQimei() {
+    private void initBeacon() {
         BeaconConfig.Builder builder = BeaconConfig.builder()
                 .auditEnable(false)
                 .bidEnable(false)
                 .qmspEnable(false)
                 .pagePathEnable(false)
-//                            .setNeedInitQimei(false)
                 .setNormalPollingTime(30000);
         BeaconConfig config = builder.build();
-
         BeaconReport beaconReport = BeaconReport.getInstance();
         try {
             beaconReport.setCollectProcessInfo(false); //该项设为false即关闭采集processInfo功能
         } catch (NoSuchMethodError error) {
         }
+
         // 多次初始化，或者初始化时传入的appkey和manifest.xml文件内不同，debug模式
         // 下会主动抛出异常
         try {
-            IQimeiSDK qimeiSDK = QimeiSDK.getInstance(Constants.SIMPLE_DATA_BEACON_APP_KEY);
-            qimeiSDK.getStrategy()
-                    .enableOAID(false)           // 关闭oaid采集，这里设置false
-                    .enableIMEI(false)           // 关闭imei采集，这里设置false，建议如用户授权，尽可能采集，便于复核问题
-                    .enableIMSI(false)           // 关闭imsi采集，这里设置false
-                    .enableAndroidId(false)          // 关闭android id采集，这里设置false，建议如用户授权，尽可能采集，便于复核问题
-                    .enableMAC(false)            // 关闭mac采集，这里设置false
-                    .enableCid(false)           // 关闭cid采集，这里设置false
-                    .enableProcessInfo(false)        // 关闭应用列表枚举，这里设置false，1.0.5以上版本有效
-                    .enableBuildModel(false);     // 关闭BUILD.MODEL采集，这里设置false，1.2.3以上版本有效
+            String deviceId = getSafeDeviceId();
+//            Log.d(TAG, "ostar_deviceId: " + deviceId);
+            beaconReport.setOstar(deviceId, deviceId); //必须，但可以在初始化之后设置，灯塔会缓存ostar为空的事件set之后重报
 
             beaconReport.start(context, Constants.SIMPLE_DATA_BEACON_APP_KEY, config);
         } catch (Exception e) {
@@ -304,4 +297,33 @@ private Map<String, String> getCommonParams() {
 
         return params;
     }
+
+    /**
+     * 获取安全设备标识（自动生成并缓存）
+     */
+    public String getSafeDeviceId() {
+        SharedPreferences prefs = context.getSharedPreferences("cossdk_device_info", Context.MODE_PRIVATE);
+        String storedId = prefs.getString("device_id", null);
+        if (storedId != null) {
+            return storedId;
+        }
+        String newId = createNewId();
+        prefs.edit().putString("device_id", newId).apply();
+        return newId;
+    }
+
+    /**
+     * 生成新标识的私有方法
+     */
+    private String createNewId() {
+        String androidId = Settings.Secure.getString(
+                context.getContentResolver(),
+                Settings.Secure.ANDROID_ID
+        );
+        if (androidId != null && !androidId.isEmpty()) {
+            return androidId;
+        } else {
+            return UUID.randomUUID().toString();
+        }
+    }
 }

QCloudFoundation/qcloud-track/libs/beacon-android-release-4.2.86.7-hf1-official.aar

@@ -104,7 +104,6 @@ public void setDebug(boolean debug) {
     public static boolean isInclude() {
         try {
             Class.forName("com.tencent.beacon.event.open.BeaconReport");
-            Class.forName("com.tencent.qimei.sdk.QimeiSDK");
             return true;
         } catch (ClassNotFoundException e){
             return false;