Merge branch 'develop' into 2x

FlutterAds · Dec 7, 2021 · 56bdcf7 · 56bdcf7
2 parents 25384c1 + 08b5740
commit 56bdcf7
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2.4.1 [2021-12-07]
+* 修复 iOS 编译问题
+
 ## 2.4.0 [2021-12-05]
 * 新增 `信息流` 广告
 * 优化 `Banner` 广告内部增加宽高设置，不在需要外部嵌套一层约束组件
@@ -35,6 +38,9 @@
 * 2.x.x 是 Null Safety 版本
 * 现在阶段会同时维护这 2 个版本，再往后可能仅维护一个版本
 
+## 1.4.1 [2021-12-07]
+* 修复 iOS 编译问题
+
 ## 1.4.0 [2021-12-05]
 * 新增 `信息流` 广告
 * 优化 `Banner` 广告内部增加宽高设置，不在需要外部嵌套一层约束组件

diff --git a/README.md b/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.4.0-success></a>
-<a href="https://github.com/FlutterAds/flutter_qq_ads"><img src=https://img.shields.io/badge/null_safety-v2.4.0-success></a>
+<a href="https://github.com/FlutterAds/flutter_qq_ads"><img src=https://img.shields.io/badge/version-v1.4.1-success></a>
+<a href="https://github.com/FlutterAds/flutter_qq_ads"><img src=https://img.shields.io/badge/null_safety-v2.4.1-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>
@@ -36,8 +36,8 @@
 
 ``` Dart
 dependencies:
-  flutter_qq_ads: ^1.4.0 # 非 Null Safety 版本
-  flutter_qq_ads: ^2.4.0 # Null Safety 版本
+  flutter_qq_ads: ^1.4.1 # 非 Null Safety 版本
+  flutter_qq_ads: ^2.4.1 # Null Safety 版本
 ```
 
 ### 初始化广告

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -4,7 +4,7 @@ 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: 2.4.0+14
+version: 2.4.1+16
 
 environment:
   sdk: ">=2.12.0 <3.0.0"

diff --git a/ios/Classes/Page/FAQAdBannerView.h b/ios/Classes/Page/FAQAdBannerView.h
@@ -8,11 +8,11 @@
 #import "FAQBaseAdPage.h"
 #import "FlutterQqAdsPlugin.h"
 @interface FAQAdBannerView : FAQBaseAdPage<FlutterPlatformView>
-@property (strong,nonatomic) FlutterQqAdsPlugin *plugin;
-- (instancetype)initWithFrame:(CGRect)frame
-               viewIdentifier:(int64_t)viewId
-                    arguments:(id _Nullable)args
-              binaryMessenger:(NSObject<FlutterBinaryMessenger>* _Nullable)messenger plugin:(FlutterQqAdsPlugin* _Nullable) plugin;
+@property (strong,nonatomic,nonnull) FlutterQqAdsPlugin *plugin;
+- (nonnull instancetype)initWithFrame:(CGRect)frame
+                       viewIdentifier:(int64_t)viewId
+                            arguments:(id _Nullable)args
+                      binaryMessenger:(NSObject<FlutterBinaryMessenger>* _Nullable)messenger plugin:(FlutterQqAdsPlugin* _Nullable) plugin;
 
-- (UIView*)view;
+- (nonnull UIView*)view;
 @end
diff --git a/ios/Classes/Page/FAQBaseAdPage.h b/ios/Classes/Page/FAQBaseAdPage.h
@@ -11,30 +11,30 @@
 #import "FAQAdRewardEvent.h"
 #import "FAQAdEventAction.h"
 // 广告位id
-static NSString *const kPosId=@"posId";
+static NSString * _Nonnull const kPosId=@"posId";
 
 // 基础广告页面
 @interface FAQBaseAdPage : NSObject
 // 广告位id
-@property (weak,nonatomic) NSString *posId;
+@property (weak,nonatomic,nullable) NSString *posId;
 // 事件消息
-@property (strong, nonatomic) FlutterEventSink eventSink;
+@property (strong, nonatomic,nonnull) FlutterEventSink eventSink;
 // Window
-@property (strong,nonatomic) UIWindow *mainWin;
+@property (strong,nonatomic,nonnull) UIWindow *mainWin;
 // 根控制器
-@property (strong,nonatomic) UIViewController *rootController;
+@property (strong,nonatomic,nonnull) UIViewController *rootController;
 // 屏幕宽度
 @property CGFloat width;
 // 屏幕高度
 @property CGFloat height;
 // 显示广告
-- (void) showAd:(FlutterMethodCall *)call eventSink:(nonnull FlutterEventSink) events;
+- (void) showAd:(nonnull FlutterMethodCall *)call eventSink:(nonnull FlutterEventSink) events;
 // 加载广告
-- (void) loadAd:(FlutterMethodCall *) call;
+- (void) loadAd:(nonnull FlutterMethodCall *) call;
 // 发送广告事件
--(void) sendEvent:(FAQAdEvent *) event;
+-(void) sendEvent:(nonnull FAQAdEvent *) event;
 // 发送广告事件
--(void) sendEventAction:(NSString *) action;
+-(void) sendEventAction:(nonnull NSString *) action;
 // 发送广告错误事件
--(void) sendErrorEvent:(NSInteger) errCode withErrMsg:(NSString*) errMsg;
+-(void) sendErrorEvent:(NSInteger) errCode withErrMsg:(nonnull NSString*) errMsg;
 @end
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.4.0'
+  s.version          = '2.4.1'
   s.summary          = '一款优质的 Flutter 广告插件（腾讯广告、广点通、优量汇）'
   s.description      = <<-DESC
   一款优质的 Flutter 广告插件（腾讯广告、广点通、优量汇）.

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_qq_ads
 description: FlutterAds 致力于构建优质的 Flutter 广告插件，这是其中一款基于「腾讯广告、广点通、优量汇」SDK 的插件
-version: 2.4.0
+version: 2.4.1
 homepage: https://github.com/FlutterAds
 
 environment: