* android升级4.530.1400

* ios升级4.14.30 * 发布v1.2.14
gstory0404 · Jun 5, 2023 · ed7d752 · ed7d752
1 parent 08c4332
commit ed7d752
Show file tree

Hide file tree

Showing 16 changed files with 176 additions and 83 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.2.15
+* android升级4.530.1400
+* ios升级4.14.30
+
 ## 1.2.14
 * android升级4.510.1380
 * ios升级4.14.10

diff --git a/README.md b/README.md
@@ -25,21 +25,21 @@ flutter_tencentad是一款集成了腾讯优量汇广告(广点通)Android和iOS
 
 ## 本地开发环境
 ```
-[✓] Flutter (Channel stable, 3.3.10, on macOS 13.1 22C65 darwin-x64, locale zh-Hans-CN)
+[✓] Flutter (Channel stable, 3.10.3, on macOS 13.4 22F66 darwin-x64, locale zh-Hans-CN)
 [✓] Android toolchain - develop for Android devices (Android SDK version 33.0.1)
-[✓] Xcode - develop for iOS and macOS (Xcode 14.2)
+[✓] Xcode - develop for iOS and macOS (Xcode 14.3.1)
 [✓] Chrome - develop for the web
-[✓] Android Studio
-[✓] IntelliJ IDEA Ultimate Edition (version 2022.3.1)
-[✓] VS Code (version 1.74.2)
+[✓] Android Studio (version 2022.1)
+[✓] IntelliJ IDEA Ultimate Edition (version 2023.1.2)
+[✓] VS Code (version 1.78.2)
 [✓] Connected device (4 available)
-[✓] HTTP Host Availability
+[✓] Network resources
 ```
 
 ## 集成步骤
 #### 1、pubspec.yaml
 ```Dart
-flutter_tencentad: ^1.2.14
+flutter_tencentad: ^latest
 ```
 引入
 ```Dart
@@ -49,7 +49,7 @@ import 'package:flutter_tencentad/flutter_tencentad.dart';
 > bidding模式下 必需要调用对应Controller 回传竞价结果
 
 #### 2、Android
-SDK(4.500.1370)已配置插件中无需额外配置，只需要在android目录中AndroidManifest.xml配置
+需要在android目录中AndroidManifest.xml配置
 
 ⚠️插件1.1.4以后不再默认集成权限，需手动配置
 ```Java
@@ -69,7 +69,7 @@ SDK(4.500.1370)已配置插件中无需额外配置，只需要在android目录
 
 #### 3、IOS
 
-SDK(4.14.01)已配置插件中，其余根据文档配置。因为使用PlatformView，在Info.plist加入
+根据SDK文档配置。因为使用PlatformView，在Info.plist加入
 ```
  <key>io.flutter.embedded_views_preview</key>
     <true/>

diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -0,0 +1,4 @@
+include: package:flutter_lints/flutter.yaml
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options
diff --git a/android/build.gradle b/android/build.gradle
@@ -50,6 +50,6 @@ repositories {
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.qq.e.union:union:4.510.1380'
+    implementation 'com.qq.e.union:union:4.530.1400'
 //    implementation(name: 'GDTSDK.unionNormal.4.420.1290', ext: 'aar')
 }
diff --git a/example/analysis_options.yaml b/example/analysis_options.yaml
@@ -0,0 +1,29 @@
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
+
+linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at
+  # https://dart-lang.github.io/linter/lints/index.html.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
+  rules:
+    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options
diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -24,6 +24,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -2,10 +2,10 @@ PODS:
   - Flutter (1.0.0)
   - flutter_tencentad (0.0.1):
     - Flutter
-    - GDTMobSDK (= 4.14.10)
-  - GDTMobSDK (4.14.10):
-    - GDTMobSDK/GDTMobSDK (= 4.14.10)
-  - GDTMobSDK/GDTMobSDK (4.14.10)
+    - GDTMobSDK (= 4.14.30)
+  - GDTMobSDK (4.14.30):
+    - GDTMobSDK/GDTMobSDK (= 4.14.30)
+  - GDTMobSDK/GDTMobSDK (4.14.30)
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
@@ -23,8 +23,8 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
-  flutter_tencentad: ffea545fae35e1b5aeb17fb0a453a7ec629d400b
-  GDTMobSDK: 1374b9d6066b860e9d90229bd0bd46988227aa00
+  flutter_tencentad: e86382df498298ca654d56041243c1a57083a234
+  GDTMobSDK: 4cae52817d881c26f7a656fba439a0792d695933
 
 PODFILE CHECKSUM: 663715e941f9adb426e33bf9376914006f9ea95b
 

diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -230,10 +230,12 @@
 		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
 			name = "Thin Binary";
 			outputPaths = (
@@ -244,6 +246,7 @@
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);

diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist
@@ -45,5 +45,7 @@
         <true/>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </dict>
 </plist>
diff --git a/example/lib/banner_page.dart b/example/lib/banner_page.dart
@@ -29,9 +29,9 @@ class _BannerPageState extends State<BannerPage> {
         children: [
           FlutterTencentad.bannerAdView(
             //android广告id
-            androidId: "8042711873318113",
+            androidId: "2015540734459587",
             //ios广告id
-            iosId: "5004358713683949",
+            iosId: "1045045794563008",
             //广告宽 单位dp
             viewWidth: 640,
             //广告高  单位dp   宽高比应该为6.4:1
@@ -59,9 +59,9 @@ class _BannerPageState extends State<BannerPage> {
           ),
           FlutterTencentad.bannerAdView(
             //android广告id
-            androidId: "8042711873318113",
+            androidId: "2015540734459587",
             //ios广告id
-            iosId: "5004358713683949",
+            iosId: "1045045794563008",
             //广告宽 单位dp
             viewWidth: 640,
             //广告高  单位dp   宽高比应该为6.4:1

diff --git a/example/lib/express_page.dart b/example/lib/express_page.dart
@@ -34,7 +34,7 @@ class _ExpressPageState extends State<ExpressPage> {
                 //android广告id
                 androidId: "4072918853903023",
                 //ios广告id
-                iosId: "3014655729431161",
+                iosId: "5065041754863035",
                 //广告宽 单位dp
                 viewWidth: 400,
                 //广告高  单位dp
@@ -63,9 +63,9 @@ class _ExpressPageState extends State<ExpressPage> {
             Text("视频贴片"),
             FlutterTencentad.expressAdView(
               //android广告id
-              androidId: "9013670915436201",
+              androidId: "4072918853903023",
               //ios广告id
-              iosId: "3074950769039285",
+              iosId: "5065041754863035",
               viewWidth: 400,
               viewHeight: 300,
               //下载二次确认弹窗 默认false
@@ -75,9 +75,9 @@ class _ExpressPageState extends State<ExpressPage> {
             Text("动态信息流（竞价）"),
             FlutterTencentad.expressAdView(
               //android广告id
-              androidId: "4033498034524284",
+              androidId: "4072918853903023",
               //ios广告id
-              iosId: "4033278955532222",
+              iosId: "5065041754863035",
               viewWidth: 400,
               viewHeight: 300,
               //下载二次确认弹窗 默认false

diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -172,7 +172,7 @@ class _HomePageState extends State<HomePage> {
                   //android广告id
                   androidId: "5042816813706194",
                   //ios广告id
-                  iosId: "3034186385479617",
+                  iosId: "3035541744552914",
                   //用户id
                   userID: "123",
                   //奖励
@@ -221,7 +221,7 @@ class _HomePageState extends State<HomePage> {
                   //android广告id
                   androidId: "9062813863614416",
                   //ios广告id
-                  iosId: "6054482385870649",
+                  iosId: "5095940784157969",
                   //是否全屏
                   isFullScreen: false,
                   //下载二次确认弹窗 默认false
@@ -237,9 +237,9 @@ class _HomePageState extends State<HomePage> {
               onPressed: () async {
                 await FlutterTencentad.loadUnifiedInterstitialAD(
                   //android广告id
-                  androidId: "7002176717594059",
+                  androidId: "4082654735526092",
                   //ios广告id
-                  iosId: "3094084365676712",
+                  iosId: "6025576861231867",
                   isFullScreen: true,
                   //下载二次确认弹窗 默认false
                   downloadConfirm: true,
@@ -303,7 +303,7 @@ class _HomePageState extends State<HomePage> {
                   return new SplashPage(
                       isBidding: false,
                       androidId: "4052216802299999",
-                      iosId: "8064986367407648");
+                      iosId: "2065245754651975");
                 }));
               },
             ),