Merge branch 'master' into 2x

BytesZero · BytesZero · commit 59970e69ea48 · 2021-08-29T18:48:16.000+08:00
diff --git a/.github/workflows/flutter.yml b/.github/workflows/flutter.yml
@@ -0,0 +1,52 @@
+name: Flutter CI
+
+# This workflow is triggered on pushes to the repository.
+
+on:
+  push:
+    branches:
+    - develop
+    - master
+    - 2x
+  pull_request:
+    branches:
+      - develop
+      - 2x
+    
+jobs:
+  build:
+    # This job will run on macos virtual machine
+    runs-on: macos-11
+    steps:
+    
+    # Setup Java environment in order to build the Android app.
+    - uses: actions/checkout@v1
+    - uses: actions/setup-java@v1
+      with:
+        java-version: '8.x'
+    
+    # Setup the flutter environment.
+    - uses: subosito/flutter-action@v1
+      with:
+        channel: 'stable' # 'dev', 'alpha', default to: 'stable'
+        #flutter-version: '1.22.x' # you can also specify exact version of flutter
+    
+    # Get flutter dependencies.
+    - run: flutter pub get
+    
+    # Check for any formatting issues in the code.
+    - run: flutter format --set-exit-if-changed .
+    
+    # Statically analyze the Dart code for any errors.
+    - run: flutter analyze .
+    
+    # Run widget tests for our flutter project.
+    - run: flutter test
+    
+    #####
+    # Build app
+    #####
+    # Build apk.
+    - run: cd example && flutter build apk
+    # Build ios
+    - run: cd example && flutter build ios --no-codesign
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -0,0 +1,23 @@
+name: Publish
+
+on:
+#   push:
+#     branches:
+#     - develop
+#     - master
+  release:
+    types: [published]
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+      - name: Publish
+        uses: sakebook/actions-flutter-pub-publisher@v1.3.1
+        with:
+          credential: ${{ secrets.PUB_OAUTH_ACCESS_TOKEN }}
+          flutter_package: true
+          skip_test: false
+          dry_run: false
diff --git a/.github/workflows/publish_apk.yml b/.github/workflows/publish_apk.yml
@@ -0,0 +1,34 @@
+name: Publish APK
+
+on:
+#   push:
+#     branches:
+#     - develop
+#     - master
+#     - 2x
+  release:
+    types: [published]
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+      - name: Setup Java
+        uses: actions/setup-java@v1
+        with:
+          java-version: '8.x'
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v1
+        with:
+          channel: 'stable' # 'dev', 'alpha', default to: 'stable'
+          #flutter-version: '1.22.x'
+      # fix Permission denied
+      - name: Setup Permission
+        run: sudo chown -R $USER $PWD
+      - name: Build APK
+        run: cd example && flutter build apk --target-platform android-arm
+      - name: Upload to Pgyer
+        run: 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
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.2 [2021-08-29]
+* 开屏增加超时时间设置 'fetchDelay' #9
+* 开屏 API 变更，logo 参数由位置参数变为可选命名参数，注意修改
+
 ## 2.1.1 [2021-08-26]
 * 修复 iOS 使用 use_frameworks! 时编译的错误 #6
 
@@ -16,6 +20,10 @@
 * 2.x.x 是 Null Safety 版本
 * 现在阶段会同时维护这 2 个版本，再往后可能仅维护一个版本
 
+## 1.1.2 [2021-08-29]
+* 开屏增加超时时间设置 'fetchDelay' #9
+* 开屏 API 变更，logo 参数由位置参数变为可选命名参数，注意修改
+
 ## 1.1.1 [2021-08-26]
 * 修复 iOS 使用 use_frameworks! 时编译的错误 #6
 
diff --git a/README.md b/README.md
@@ -4,9 +4,10 @@
 <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.1.1-success></a>
-<a href="https://github.com/FlutterAds/flutter_qq_ads"><img src=https://img.shields.io/badge/null_safety-v2.1.1-success></a>
+<a href="https://github.com/FlutterAds/flutter_qq_ads"><img src=https://img.shields.io/badge/version-v1.1.2-success></a>
+<a href="https://github.com/FlutterAds/flutter_qq_ads"><img src=https://img.shields.io/badge/null_safety-v2.1.2-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=develop"></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>
 <a href="https://github.com/FlutterAds/flutter_qq_ads/blob/develop/LICENSE"><img src=https://img.shields.io/badge/license-MIT-brightgreen></a>
 </p>
@@ -27,37 +28,16 @@
 - 🔲 Banner
 - 🔲 信息流
 
+## 下载体验
+<img src="https://www.pgyer.com/app/qrcode/fadsqq" width='100' height='100'>
+
 ## 入门使用
 ### 引入依赖
 
-- 版本约定
-  * 1.x.x 是非 Null Safety 版本，对应 `master` 分支
-  * 2.x.x 是 Null Safety 版本，对应 `2x` 分支
-
-  > 现在阶段会同时维护这 2 个版本，再往后可能仅维护一个空安全版本
-
-- Pub 引入
-
 ``` Dart
 dependencies:
-  flutter_qq_ads: ^1.1.1 # 非 Null Safety 版本
-  flutter_qq_ads: ^2.1.1 # Null Safety 版本
-```
-
-- Git 引入
-
-``` Dart
-flutter_qq_ads:
-  git: 
-    url: git@github.com:FlutterAds/flutter_qq_ads.git
-    ref: master
-```
-
-- 克隆后本地引入
-
-``` Dart
-flutter_qq_ads:
-  path: [与主项目的相对路径 | 插件的绝对路径]
+  flutter_qq_ads: ^1.1.2 # 非 Null Safety 版本
+  flutter_qq_ads: ^2.1.2 # Null Safety 版本
 ```
 
 ### 初始化广告
@@ -66,45 +46,19 @@ flutter_qq_ads:
 /// [appId] 应用媒体ID
 FlutterQqAds.initAd(appId);
 ```
-### 设置广告事件监听
-
-``` Dart
-FlutterQqAds.onEventListener((event) {
-  // 普通广告事件
-  String _adEvent = 'adId:${event.adId} action:${event.action}';
-  if (event is AdErrorEvent) {
-    // 错误事件
-    _adEvent += ' errCode:${event.errCode} errMsg:${event.errMsg}';
-  } else if (event is AdRewardEvent) {
-    // 激励事件
-    _adEvent +=
-        ' transId:${event.transId} customData:${event.customData} userId:${event.userId}';
-  }
-  print('onEventListener:$_adEvent');
-});
-```
-### 事件列表
-|事件|说明|
-|-|-|
-|onAdLoaded|广告加载成功|
-|onAdPresent|广告填充|
-|onAdExposure|广告曝光|
-|onAdClosed|广告关闭（开屏计时结束或者用户点击关闭）|
-|onAdClicked|广告点击|
-|onAdSkip|广告跳过|
-|onAdComplete|广告播放或计时完毕|
-|onAdError|广告错误|
-|onAdReward|获得广告激励|
-
-> 这里做了统一的抽象，iOS 和 Android 原生 SDK 名称不同，如果觉得对应不上，可以提 [Issues](https://github.com/FlutterAds/flutter_qq_ads/issues)（一定要加上 log 截图）
 ### 开屏广告
 
 - 半屏广告 + Logo
 
 ``` Dart
 /// [posId] 广告位 id
 /// [logo] 如果传值则展示底部logo，不传不展示，则全屏展示
-FlutterQqAds.showSplashAd(posId, 'flutterads_logo');
+/// [fetchDelay] 拉取广告的超时时间，默认值 3 秒，取值范围[1.5~5]秒
+FlutterQqAds.showSplashAd(
+    AdsConfig.splashId,
+    logo: 'flutterads_logo',
+    fetchDelay: 3,
+  );
 ```
 - [Logo 设置的最佳实践（必看）](https://github.com/FlutterAds/flutter_qq_ads/blob/develop/doc/SETTING_LOGO.md)
 
@@ -166,6 +120,38 @@ FlutterQqAds.showRewardVideoAd(
     userId: 'userId',
   );
 ```
+
+### 设置广告事件监听
+
+``` Dart
+FlutterQqAds.onEventListener((event) {
+  // 普通广告事件
+  String _adEvent = 'adId:${event.adId} action:${event.action}';
+  if (event is AdErrorEvent) {
+    // 错误事件
+    _adEvent += ' errCode:${event.errCode} errMsg:${event.errMsg}';
+  } else if (event is AdRewardEvent) {
+    // 激励事件
+    _adEvent +=
+        ' transId:${event.transId} customData:${event.customData} userId:${event.userId}';
+  }
+  print('onEventListener:$_adEvent');
+});
+```
+### 事件列表
+|事件|说明|
+|-|-|
+|onAdLoaded|广告加载成功|
+|onAdPresent|广告填充|
+|onAdExposure|广告曝光|
+|onAdClosed|广告关闭（开屏计时结束或者用户点击关闭）|
+|onAdClicked|广告点击|
+|onAdSkip|广告跳过|
+|onAdComplete|广告播放或计时完毕|
+|onAdError|广告错误|
+|onAdReward|获得广告激励|
+
+> 这里做了统一的抽象，iOS 和 Android 原生 SDK 名称不同，如果觉得对应不上，可以提 [Issues](https://github.com/FlutterAds/flutter_qq_ads/issues)（一定要加上 log 截图）
 ## 其他配置
 ### 信任HTTP请求
 苹果公司在iOS9中升级了应用网络通信安全策略，默认推荐开发者使用HTTPS协议来进行网络通信，并限制HTTP协议的请求。为了避免出现无法拉取到广告的情况，我们推荐开发者在info.plist文件中增加如下配置来实现广告的网络访问
diff --git a/android/src/main/java/com/zero/flutter_qq_ads/PluginDelegate.java b/android/src/main/java/com/zero/flutter_qq_ads/PluginDelegate.java
@@ -39,6 +39,8 @@ public static PluginDelegate getInstance() {
     public static final String KEY_POSID = "posId";
     // logo 参数
     public static final String KEY_LOGO = "logo";
+    // fetchDelay 参数
+    public static final String KEY_FETCH_DELAY = "fetchDelay";
 
     /**
      * 插件代理构造函数构造函数
@@ -144,9 +146,11 @@ public void initAd(MethodCall call, MethodChannel.Result result) {
     public void showSplashAd(MethodCall call, MethodChannel.Result result) {
         String posId = call.argument(KEY_POSID);
         String logo = call.argument(KEY_LOGO);
+        double fetchDelay = call.argument(KEY_FETCH_DELAY);
         Intent intent = new Intent(activity, AdSplashActivity.class);
         intent.putExtra(KEY_POSID, posId);
         intent.putExtra(KEY_LOGO, logo);
+        intent.putExtra(KEY_FETCH_DELAY, fetchDelay);
         activity.startActivity(intent);
         result.success(true);
     }
diff --git a/android/src/main/java/com/zero/flutter_qq_ads/page/AdSplashActivity.java b/android/src/main/java/com/zero/flutter_qq_ads/page/AdSplashActivity.java
@@ -55,8 +55,10 @@ private void initData() {
         // 获取参数
         posId = getIntent().getStringExtra(PluginDelegate.KEY_POSID);
         String logo = getIntent().getStringExtra(PluginDelegate.KEY_LOGO);
+        double fetchDelay = getIntent().getDoubleExtra(PluginDelegate.KEY_FETCH_DELAY,0);
+        int absFetchDelay= (int) (fetchDelay*1000);
         // 创建开屏广告
-        SplashAD splashAD = new SplashAD(this, posId, this, 0);
+        SplashAD splashAD = new SplashAD(this, posId, this, absFetchDelay);
         if (TextUtils.isEmpty(logo)) {
             // logo 为空则加载全屏广告
             ad_logo.setVisibility(View.GONE);
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -206,7 +206,11 @@ Future<bool> init() async {
 /// [logo] 展示如果传递则展示logo，不传递不展示
 Future<void> showSplashAd([String? logo]) async {
   try {
-    bool result = await FlutterQqAds.showSplashAd(AdsConfig.splashId, logo);
+    bool result = await FlutterQqAds.showSplashAd(
+      AdsConfig.splashId,
+      logo: logo,
+      fetchDelay: 3,
+    );
     _result = "展示开屏广告${result ? '成功' : '失败'}";
   } on PlatformException catch (e) {
     _result = "展示开屏广告失败 code:${e.code} msg:${e.message} details:${e.details}";
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -4,10 +4,10 @@ description: FlutterAds 优量汇广告 SDK 插件示例
 # The following line prevents the package from being accidentally published to
 # pub.dev using `pub publish`. This is preferred for private packages.
 publish_to: "none" # Remove this line if you wish to publish to pub.dev
-version: 1.0.1+6
+version: 2.1.2+8
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
   flutter:
diff --git a/ios/Classes/Page/SplashPage.m b/ios/Classes/Page/SplashPage.m
@@ -18,11 +18,14 @@ @implementation SplashPage
 // 加载广告
 -(void)loadAd:(FlutterMethodCall *)call{
     NSString* logo=call.arguments[@"logo"];
+    int fetchDelay=[call.arguments[@"fetchDelay"] intValue];
     // logo 判断为空，则全屏展示
     self.fullScreenAd=[logo isKindOfClass:[NSNull class]]||[logo length]==0;
     // 初始化开屏广告
     self.splashAd=[[GDTSplashAd alloc] initWithPlacementId:self.posId];
     self.splashAd.delegate=self;
+    // 设置超时时长
+    self.splashAd.fetchDelay=fetchDelay;
     // 加载全屏广告
     if(self.fullScreenAd){
         [self.splashAd loadFullScreenAd];
diff --git a/ios/flutter_qq_ads.podspec b/ios/flutter_qq_ads.podspec
@@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'flutter_qq_ads'
-  s.version          = '2.1.1'
+  s.version          = '2.1.2'
   s.summary          = '一款优质的 Flutter 广告插件（腾讯广告、广点通、优量汇）'
   s.description      = <<-DESC
   一款优质的 Flutter 广告插件（腾讯广告、广点通、优量汇）.
@@ -20,4 +20,6 @@ Pod::Spec.new do |s|
   s.static_framework = true
   # 广点通的 SDK 最低支持 9.0 所以，这里设置 9.0
   s.ios.deployment_target = '9.0'
+  # Flutter.framework does not contain a i386 slice.
+  s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
 end
diff --git a/lib/flutter_qq_ads.dart b/lib/flutter_qq_ads.dart
@@ -35,12 +35,15 @@ class FlutterQqAds {
   /// 展示开屏广告
   /// [posId] 广告位 id
   /// [logo] 如果传值则展示底部logo，不传不展示，则全屏展示
-  static Future<bool> showSplashAd(String posId, [String? logo]) async {
+  /// [fetchDelay] 拉取广告的超时时间，默认值 3 秒，取值范围[1.5~5]秒
+  static Future<bool> showSplashAd(String posId,
+      {String? logo, double fetchDelay = 3}) async {
     final bool result = await _methodChannel.invokeMethod(
       'showSplashAd',
       {
         'posId': posId,
         'logo': logo,
+        'fetchDelay': fetchDelay,
       },
     );
     return result;
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_qq_ads
 description: FlutterAds 致力于构建优质的 Flutter 广告插件，这是其中一款基于「腾讯广告、广点通、优量汇」SDK 的插件
-version: 2.1.1
+version: 2.1.2
 homepage: https://github.com/FlutterAds
 
 environment:
diff --git a/test/ads_config.dart b/test/ads_config.dart
diff --git a/test/flutter_qq_ads_test.dart b/test/flutter_qq_ads_test.dart
