Merge branch 'develop' into 2x

Author: BytesZero

.github/workflows/flutter.yml

@@ -24,7 +24,6 @@ jobs:
     - uses: actions/setup-java@v1
       with:
         java-version: '8.x'
-    
     # Setup the flutter environment.
     - uses: subosito/flutter-action@v1
       with:

.github/workflows/publish_apk.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Setup Permission
         run: sudo chown -R $USER $PWD
       - name: Build APK
-        run: cd example && flutter build apk --target-platform android-arm
+        run: cd example && flutter build apk
       - name: Upload to Pgyer
         run: |
           result=$(curl -F 'file=@example/build/app/outputs/apk/release/app-release.apk' -F '_api_key=${{ secrets.PGYER_API_KEY }}' https://www.pgyer.com/apiv2/app/upload)

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.3.0 [2021-09-26]
+* 修复同时引入 [flutter_pangle_ads](https://github.com/FlutterAds/flutter_pangle_ads) 依赖时 iOS 无法编译的问题 #11
+* 优化底层架构
+* 更新 Android SDK `v4.410.1280`
+
 ## 2.2.0 [2021-09-01]
 * 新增 Banner 广告
 * 项目增加 CI/CD 检查和自动发布，提高项目质量
@@ -24,6 +29,11 @@
 * 2.x.x 是 Null Safety 版本
 * 现在阶段会同时维护这 2 个版本，再往后可能仅维护一个版本
 
+## 1.3.0 [2021-09-26]
+* 修复同时引入 [flutter_pangle_ads](https://github.com/FlutterAds/flutter_pangle_ads) 依赖时 iOS 无法编译的问题 #11
+* 优化底层架构
+* 更新 Android SDK `v4.410.1280`
+
 ## 1.2.0 [2021-09-01]
 * 新增 Banner 广告
 * 项目增加 CI/CD 检查和自动发布，提高项目质量

README.md

@@ -4,8 +4,8 @@
 <h3 align="center">一款优质的 Flutter 广告插件（腾讯广告、广点通、优量汇）</h3>
 
 <p align="center">
-<a href="https://github.com/FlutterAds/flutter_qq_ads"><img src=https://img.shields.io/badge/version-v1.2.0-success></a>
-<a href="https://github.com/FlutterAds/flutter_qq_ads"><img src=https://img.shields.io/badge/null_safety-v2.2.0-success></a>
+<a href="https://github.com/FlutterAds/flutter_qq_ads"><img src=https://img.shields.io/badge/version-v1.3.0-success></a>
+<a href="https://github.com/FlutterAds/flutter_qq_ads"><img src=https://img.shields.io/badge/null_safety-v2.3.0-success></a>
 <a href="https://github.com/FlutterAds/flutter_qq_ads"><img src=https://img.shields.io/badge/platform-iOS%20%7C%20Android-brightgreen></a>
 <a href="https://github.com/FlutterAds/flutter_qq_ads/actions/workflows/flutter.yml"><img src="https://github.com/FlutterAds/flutter_qq_ads/actions/workflows/flutter.yml/badge.svg?branch=2x"></a>
 <a href="https://github.com/FlutterAds/flutter_qq_ads"><img src=https://img.shields.io/github/stars/FlutterAds/flutter_qq_ads?color=brightgreen></a>
@@ -29,15 +29,15 @@
 - 🔲 信息流
 
 ## 下载体验
-<img src="https://www.pgyer.com/app/qrcode/fadsqq" width='100' height='100'>
+<a href="https://www.pgyer.com/app/qrcode/fadsqq"><img src="https://www.pgyer.com/app/qrcode/fadsqq" width='100' height='100'></a>
 
 ## 入门使用
 ### 引入依赖
 
 ``` Dart
 dependencies:
-  flutter_qq_ads: ^1.2.0 # 非 Null Safety 版本
-  flutter_qq_ads: ^2.2.0 # Null Safety 版本
+  flutter_qq_ads: ^1.3.0 # 非 Null Safety 版本
+  flutter_qq_ads: ^2.3.0 # Null Safety 版本
 ```
 
 ### 初始化广告
@@ -273,12 +273,15 @@ pod install
 |master|稳定分支，非 Null Safety|
 |2x|稳定分支，Null Safety|
 
+## 更新日志
+[查看 Releases 版本日志](https://github.com/FlutterAds/flutter_qq_ads/releases)
+
 ## 遇到问题
 如果你遇到问题请提 [Issues](https://github.com/FlutterAds/flutter_qq_ads/issues) 给我（提问前建议先搜索尝试，没有再提问）
 
 ## 支持开源
 
-支持开源项目最好的方式就是用 1 秒点个免费的 [Star](https://github.com/FlutterAds/flutter_qq_ads)
+支持开源项目最好的方式就是点个免费的 [Star](https://github.com/FlutterAds/flutter_qq_ads) ⭐️
 
 ## FlutterAds 系列插件
 |插件|描述|

android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.4'
     }
 }
 
@@ -38,5 +38,5 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     // 广告 SDK
-    implementation 'com.qq.e.union:union:4.400.1270'
+    implementation 'com.qq.e.union:union:4.410.1280'
 }

android/gradle.properties

@@ -1,3 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
+android.enableR8=true

android/src/main/java/com/zero/flutter_qq_ads/PluginDelegate.java

@@ -128,7 +128,7 @@ public void getPlatformVersion(MethodCall call, MethodChannel.Result result) {
     }
 
     /**
-     * 展示 Banner 广告
+     * 注册 Banner 广告
      */
     public void registerBannerView() {
         bind.getPlatformViewRegistry()

example/android/app/build.gradle

@@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
     compileSdkVersion 29
-
+    ndkVersion "21.4.7075529"
     lintOptions {
         disable 'InvalidPackage'
     }
@@ -41,11 +41,24 @@ android {
         versionName flutterVersionName
     }
 
+    //签名信息
+    signingConfigs {
+        release {
+            storeFile new File("${project.projectDir}/keystore/flutterads_key.jks")
+            storePassword "FlutterAds"
+            keyAlias 'FlutterAdsQQ'
+            keyPassword "FlutterAds"
+            //2个版本的签名
+            v1SigningEnabled true
+            v2SigningEnabled true
+        }
+    }
+
     buildTypes {
         release {
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
         }
     }
 

example/android/app/keystore/flutterads_key.jks

@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.zero.flutter_qq_ads_example">
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
@@ -10,7 +11,8 @@
         android:name="io.flutter.app.FlutterApplication"
         android:label="FlutterAds"
         android:icon="@mipmap/ic_launcher"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:replace="android:label">
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"