* android sdk升级4.611.1481

* ios sdk升级4.15.20 * android隐私权限修改 * 发布1.2.29
gstory0404 · Jan 7, 2025 · bee1aee · bee1aee
1 parent 6eb08c2
commit bee1aee
Show file tree

Hide file tree

Showing 15 changed files with 96 additions and 49 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.2.29
+* android sdk升级4.611.1481
+* ios sdk升级4.15.20
+* android隐私权限修改
+
 ## 1.2.28
 * android高版本兼容
 

diff --git a/README.md b/README.md
@@ -110,6 +110,14 @@ await FlutterTencentad.register(
         "mipaddr":false,
         //false为关闭WIFI状态下获取IP地址，不设置或者设置为true为获取
         "wipaddr":false
+        //禁用taid获取
+        "taid": false,
+        //禁用oaid获取
+        "oaid": false
+    },
+    convOptimizelnfo: {
+        //关闭应用安装监听状态
+        "hieib": false
     },
     enableCollectAppInstallStatus: false,//安卓隐私合规 是否开启收集应用安装状态
 );

diff --git a/android/build.gradle b/android/build.gradle
@@ -29,7 +29,7 @@ apply plugin: 'kotlin-android'
 
 android {
     namespace = "com.gstory.flutter_tencentad"
-    compileSdkVersion 28
+    compileSdkVersion 31
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -61,6 +61,6 @@ dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 //    implementation 'com.qq.e.union:union:4.603.1473'
-    implementation(name: 'GDTSDK.unionNormal.4.610.1480', ext: 'aar')
+    implementation(name: 'GDTSDK.unionNormal.4.611.1481', ext: 'aar')
 //    implementation 'com.qq.e.union:tools:+'
 }
diff --git a/android/libs/GDTSDK.unionNormal.4.610.1480.aar b/android/libs/GDTSDK.unionNormal.4.610.1480.aar
diff --git a/android/libs/GDTSDK.unionNormal.4.611.1481.aar b/android/libs/GDTSDK.unionNormal.4.611.1481.aar
diff --git a/android/src/main/kotlin/com/gstory/flutter_tencentad/FlutterTencentadPlugin.kt b/android/src/main/kotlin/com/gstory/flutter_tencentad/FlutterTencentadPlugin.kt
@@ -68,7 +68,8 @@ class FlutterTencentadPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
             val personalized = arguments["personalized"] as Int
             //隐私管理
             val androidPrivacy =  arguments["androidPrivacy"] as Map<String, Boolean>?
-
+            val convOptimizelnfo =  arguments["convOptimizelnfo"] as Map<String, Boolean>?
+
             val enableCollectAppInstallStatus = arguments["enableCollectAppInstallStatus"] as Boolean?
 
             //日志
@@ -86,6 +87,8 @@ class FlutterTencentadPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
                 // 建议在初始化 SDK 前进行此设置
                 GlobalSetting.setEnableCollectAppInstallStatus(enableCollectAppInstallStatus);
             }
+            //关闭应用安装监听状态
+            GlobalSetting.setConvOptimizeInfo(convOptimizelnfo)
 
             GDTAdSdk.initWithoutStart(applicationContext, appId)
             GDTAdSdk.start(object : GDTAdSdk.OnStartListener {

diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -24,7 +24,8 @@ if (flutterVersionName == null) {
 
 android {
     namespace = "com.gstory.flutter_tencentad_example"
-    compileSdk = flutter.compileSdkVersion
+//    compileSdk = flutter.compileSdkVersion
+    compileSdk = 34
     ndkVersion = flutter.ndkVersion
 
     compileOptions {
@@ -40,7 +41,8 @@ android {
         applicationId "com.gstory.flutter_tencentad_example"
 //        applicationId "com.hnnuomi.atree"
         minSdkVersion flutter.minSdkVersion
-        targetSdkVersion flutter.targetSdkVersion
+//        targetSdkVersion flutter.targetSdkVersion
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -2,8 +2,8 @@ PODS:
   - Flutter (1.0.0)
   - flutter_tencentad (0.0.1):
     - Flutter
-    - GDTMobSDK (= 4.15.10)
-  - GDTMobSDK (4.15.10)
+    - GDTMobSDK (= 4.15.20)
+  - GDTMobSDK (4.15.20)
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
@@ -21,9 +21,9 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_tencentad: 1306d98422e0cb10bcfa54e1eb4ccda24806c517
-  GDTMobSDK: 71e264496ba2ade7d9ce528f4eba1a5424a86654
+  flutter_tencentad: f83e5ab13cd0bee85f3dbb08167e5e2c1b9bb892
+  GDTMobSDK: e0938157192f17f28583601f36956500f236935c
 
 PODFILE CHECKSUM: cf0c950f7e9a456b4e325f5b8fc0f98906a3705a
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -149,6 +149,7 @@
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
+				D13D515B4A9A8C18CCE87D50 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -259,6 +260,23 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
+		D13D515B4A9A8C18CCE87D50 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -147,7 +147,8 @@ class _HomePageState extends State<HomePage> {
         personalized: FlutterTencentadPersonalized.show,
         //渠道id
         channelId: FlutterTencentadChannel.other,
-        enableCollectAppInstallStatus: false,//安卓隐私合规 是否开启收集应用安装状态
+        enableCollectAppInstallStatus: false,
+        //安卓隐私合规 是否开启收集应用安装状态
         //安卓隐私设置
         androidPrivacy: {
           //false为关闭粗略地理位置获取，不设置或者设置为true为获取
@@ -159,9 +160,17 @@ class _HomePageState extends State<HomePage> {
           //false为关闭android_id获取，不设置或者设置为true为获取
           "android_id": false,
           //false为关闭移动网络状态下获取IP地址，不设置或者设置为true为获取
-          "mipaddr":false,
+          "mipaddr": false,
           //false为关闭WIFI状态下获取IP地址，不设置或者设置为true为获取
-          "wipaddr":false
+          "wipaddr": false,
+          //禁用taid获取
+          "taid": false,
+          //禁用oaid获取
+          "oaid": false
+        },
+        convOptimizelnfo: {
+          //关闭应用安装监听状态
+          "hieib": false
         });
     _sdkVersion = await FlutterTencentad.getSDKVersion();
     setState(() {});

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -37,10 +37,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.19.0"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -68,7 +68,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.2.26"
+    version: "1.2.28"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -78,18 +78,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.5"
+    version: "10.0.7"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.8"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -134,7 +134,7 @@ packages:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
   source_span:
     dependency: transitive
     description:
@@ -147,10 +147,10 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.12.0"
   stream_channel:
     dependency: transitive
     description:
@@ -163,10 +163,10 @@ packages:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   term_glyph:
     dependency: transitive
     description:
@@ -179,10 +179,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "0.7.3"
   vector_math:
     dependency: transitive
     description:
@@ -195,10 +195,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.5"
+    version: "14.3.0"
 sdks:
-  dart: ">=3.3.0 <4.0.0"
+  dart: ">=3.4.0 <4.0.0"
   flutter: ">=3.18.0-18.0.pre.54"
diff --git a/ios/flutter_tencentad.podspec b/ios/flutter_tencentad.podspec
@@ -18,7 +18,7 @@ A new flutter plugin project.
   s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
   s.platform = :ios, '9.0'
-  s.dependency 'GDTMobSDK', '4.15.10'
+  s.dependency 'GDTMobSDK', '4.15.20'
 
   # Flutter.framework does not contain a i386 slice.
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }

diff --git a/lib/flutter_tencentad.dart b/lib/flutter_tencentad.dart
@@ -39,6 +39,7 @@ class FlutterTencentad {
     bool? debug,
     int? channelId,
     Map<String,bool>? androidPrivacy,
+    Map<String,bool>? convOptimizelnfo,
     bool? enableCollectAppInstallStatus,
   }) async {
     return await _channel.invokeMethod("register", {
@@ -47,7 +48,8 @@ class FlutterTencentad {
       "debug": debug ?? false,
       "channelId": channelId ?? FlutterTencentadChannel.other,
       "personalized": personalized ?? FlutterTencentadPersonalized.show,
-      "androidPrivacy": androidPrivacy,
+      "androidPrivacy": androidPrivacy ?? {},
+      "convOptimizelnfo": convOptimizelnfo ?? {},
       "enableCollectAppInstallStatus": enableCollectAppInstallStatus
     });
   }

diff --git a/pubspec.lock b/pubspec.lock
@@ -37,10 +37,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.19.0"
   fake_async:
     dependency: transitive
     description:
@@ -63,18 +63,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.5"
+    version: "10.0.7"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.8"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -119,7 +119,7 @@ packages:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
   source_span:
     dependency: transitive
     description:
@@ -132,10 +132,10 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.12.0"
   stream_channel:
     dependency: transitive
     description:
@@ -148,10 +148,10 @@ packages:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   term_glyph:
     dependency: transitive
     description:
@@ -164,10 +164,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "0.7.3"
   vector_math:
     dependency: transitive
     description:
@@ -180,10 +180,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.5"
+    version: "14.3.0"
 sdks:
-  dart: ">=3.3.0 <4.0.0"
+  dart: ">=3.4.0 <4.0.0"
   flutter: ">=3.18.0-18.0.pre.54"