update iOS SDK 1.3.1.1

Author: zuoquan

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## V1.1.0
 
 Support null safety
+Use TPNS iOS SDK 1.3.1.1
 
 ## V1.0.7
 

example/ios/Podfile.lock

@@ -1,9 +1,9 @@
 PODS:
   - Flutter (1.0.0)
-  - TPNS-iOS (1.2.9.0)
+  - TPNS-iOS (1.3.1.1)
   - tpns_flutter_plugin (1.0.4):
     - Flutter
-    - TPNS-iOS (~> 1.2.9.0)
+    - TPNS-iOS (~> 1.3.1.1)
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)

example/lib/ios/flutter_tableview.dart

@@ -107,8 +107,8 @@ class _FlutterTableViewState extends State<FlutterTableView> {
   ////////////////////////////////////////////////////////////////////
   SectionHeaderModel currentHeaderModel;
   int totalItemCount = 0;
-  List<SectionHeaderModel> sectionHeaderList = List();
-  List<int> sectionTotalWidgetCountList = List();
+  List<SectionHeaderModel> sectionHeaderList = [];
+  List<int> sectionTotalWidgetCountList = [];
   ScrollController scrollController;
   ListView listView;
   bool insideSetStateFlag = false;
@@ -292,7 +292,6 @@ class _FlutterTableViewState extends State<FlutterTableView> {
 
   @override
   void dispose() {
-    // TODO: implement dispose
     super.dispose();
 
     if (this.widget.controller == null) {

example/lib/ios/homeTest.dart

@@ -28,6 +28,7 @@ class HomeTestBody extends StatefulWidget {
 }
 
 class HomeTestBodyState extends State<HomeTestBody> {
+  final XgFlutterPlugin tpush = new XgFlutterPlugin();
   String inputStr = "flutter";
 
   // Get row count.
@@ -95,31 +96,31 @@ class HomeTestBodyState extends State<HomeTestBody> {
   void _doAction(int section, int row) {
     if (section == 0) {
       if (row == 0) {
-        XgFlutterPlugin().setAccount(inputStr, AccountType.UNKNOWN);
+        tpush.setAccount(inputStr, AccountType.UNKNOWN);
       } else if (row == 1) {
-        XgFlutterPlugin().deleteAccount(inputStr, AccountType.UNKNOWN);
+        tpush.deleteAccount(inputStr, AccountType.UNKNOWN);
       } else if (row == 2) {
-        XgFlutterPlugin().cleanAccounts();
+        tpush.cleanAccounts();
       }
     } else if (section == 1) {
       if (row == 0) {
-        XgFlutterPlugin().addTags([inputStr]);
+        tpush.addTags([inputStr]);
       } else if (row == 1) {
-        XgFlutterPlugin().deleteTags([inputStr]);
+        tpush.deleteTags([inputStr]);
       } else if (row == 2) {
-        XgFlutterPlugin().setTags([inputStr]);
+        tpush.setTags([inputStr]);
       } else if (row == 3) {
-        XgFlutterPlugin().cleanTags();
+        tpush.cleanTags();
       }
     } else if (section == 2) {
       if (row == 0) {
-        XgFlutterPlugin().startXg("1600007893", "IX4BGYYG8L4L");
+        tpush.startXg("1600007893", "IX4BGYYG8L4L");
       } else if (row == 1) {
-        XgFlutterPlugin().stopXg();
+        tpush.stopXg();
       } else if (row == 2) {
         getXgToken();
       } else if (row == 3) {
-        XgFlutterPlugin().setBadge(int.parse(inputStr));
+        tpush.setBadge(int.parse(inputStr));
       } else if (row == 4) {
         getXgSdkVersion();
       }

example/tpns_flutter_plugin.podspec

@@ -15,7 +15,7 @@ A new flutter plugin project.
   s.source           = { :git => "https://github.com/TencentCloud/TPNS-Flutter-Plugin", :branch => "V1.1.0" }
   s.source_files = 'Classes/**/*'
   s.dependency 'Flutter'
-  s.dependency 'TPNS-iOS', '1.2.9.0'
+  s.dependency 'TPNS-iOS', '1.3.1.1'
   s.platform = :ios, '8.0'
   s.static_framework = true
 end

ios/Classes/XgFlutterPlugin.m

@@ -33,6 +33,8 @@ - (id)init {
 - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
   if ([@"xgSdkVersion" isEqualToString:call.method]) {
     result([[XGPush defaultManager] sdkVersion]);
+  } else if([@"getOtherPushToken" isEqualToString:call.method]) {
+      result([[XGPushTokenManager defaultTokenManager] deviceTokenString]);
   } else if([@"xgToken" isEqualToString:call.method]) {
       result([[XGPushTokenManager defaultTokenManager] xgTokenString]);
   } else if([@"startXg" isEqualToString:call.method]) {
@@ -174,6 +176,8 @@ - (void)deleteTags:(FlutterMethodCall*)call result:(FlutterResult)result {
 
 /**===================================V1.0.4废弃账号标签接口===================================*/
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 /// 绑定标签或账号
 - (void)bindWithIdentifier:(FlutterMethodCall*)call result:(FlutterResult)result {
     NSDictionary *configurationInfo = call.arguments;
@@ -220,6 +224,8 @@ - (void)clearAllIdentifier:(FlutterMethodCall*)call result:(FlutterResult)result
     [[XGPushTokenManager defaultTokenManager] clearAllIdentifiers:[configurationInfo[@"bindType"] integerValue]];
 }
 
+#pragma clang diagnostic pop
+
 /**==========================================================================*/
 
 
@@ -358,6 +364,8 @@ - (void)xgPushDidClearTagsError:(NSError *)error {
 
 /**=======================================================================*/
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 - (void)xgPushDidBindWithIdentifier:(NSString *)identifier type:(XGPushTokenBindType)type error:(NSError *)error {
     NSString *argumentDescribe = type == XGPushTokenBindTypeAccount ? @"绑定账号" : @"绑定标签";
     NSString *resultStr = error == nil ? @"成功" : [NSString stringWithFormat:@"失败，error:%@", error.description];
@@ -393,6 +401,7 @@ - (void)xgPushDidClearAllIdentifiers:(XGPushTokenBindType)type error:(NSError *)
     NSString *resultStr = error == nil ? @"成功" : [NSString stringWithFormat:@"失败，error:%@", error.description];
     [_channel invokeMethod:@"xgPushDidClearAllIdentifiers" arguments:[NSString stringWithFormat:@"%@%@", argumentDescribe, resultStr]];
 }
+#pragma clang diagnostic pop
 
 #pragma mark - AppDelegate
 

ios/tpns_flutter_plugin.podspec

@@ -15,7 +15,7 @@ A new flutter plugin project.
   s.source           = { :git => "https://github.com/TencentCloud/TPNS-Flutter-Plugin", :branch => "V1.1.0" }
   s.source_files = 'Classes/**/*'
   s.dependency 'Flutter'
-  s.dependency 'TPNS-iOS', '1.2.9.0'
+  s.dependency 'TPNS-iOS', '1.3.1.1'
   s.platform = :ios, '8.0'
   s.static_framework = true
 end

lib/android/xg_android_api.dart

@@ -5,7 +5,7 @@ import 'package:flutter/services.dart';
 import 'native_event_handler.dart';
 
 class XgAndroidApi {
-  final String flutter_log = "| XGPUSH | Flutter | ";
+  final String flutterLog = "| XGPUSH | Flutter | ";
   static MethodChannel? _channel;
   NativeEventHandler? _eventHandler;
 

lib/tpns_flutter_plugin.dart

@@ -99,15 +99,10 @@ class XgFlutterPlugin {
     return xgToken;
   }
 
-  /// 获取安卓厂商 token，当前仅对安卓有效
+  /// 获取厂商Token，区别于tpns token
   static Future<String?> get otherPushToken async {
-    if (Platform.isIOS) {
-
-    } else {
-      final String otherPushToken = await _channel.invokeMethod(
-          'getOtherPushToken');
-      return otherPushToken;
-    }
+    final String otherPushToken = await _channel.invokeMethod('getOtherPushToken');
+    return otherPushToken;
   }
 
   /// 获取安卓厂商品牌，当前仅对安卓有效
@@ -380,7 +375,7 @@ class XgFlutterPlugin {
     }
   }
 
-/*******************************************请不要再使用以上账号和标签接口****************************************************/
+//*******************************************请不要再使用以上账号和标签接口****************************************************/
 
 /* ======信鸽callback====== */
 

test/tpns_flutter_plugin_test.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:tpns_flutter_plugin/tpns_flutter_plugin.dart';
+// import 'package:tpns_flutter_plugin/tpns_flutter_plugin.dart';
 
 void main() {
   const MethodChannel channel = MethodChannel('tpns_flutter_plugin');