Merge pull request #179 from jerryzhoujw/develop/remote_ios_warnings

example/ios/Runner.xcodeproj/project.pbxproj

@@ -14,8 +14,6 @@
 		3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
 		9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
-		9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB31CF90195004384FC /* Generated.xcconfig */; };
 		978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
 		97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -180,7 +178,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0910;
+				LastUpgradeCheck = 1130;
 				ORGANIZATIONNAME = "The Chromium Authors";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -195,10 +193,9 @@
 			};
 			buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
-				English,
 				en,
 				Base,
 			);
@@ -218,9 +215,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
-				9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */,
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
-				9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
 			);
@@ -340,12 +335,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -395,12 +392,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0910"
+   LastUpgradeVersion = "1130"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>BuildSystemType</key>
-	<string>Original</string>
+	<string>Latest</string>
 </dict>
 </plist>

ios/Classes/FluwxPlugin.m

@@ -132,7 +132,9 @@ FluwxAutoDeductHandler *_fluwxAutoDeductHandler;
     return [WXApi handleOpenURL:url delegate:[FluwxResponseHandler defaultManager]];
 }
 
-- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void(^)(NSArray<id<UIUserActivityRestoring>> * __nullable restorableObjects))restorationHandler
+- (BOOL)application:(UIApplication *)application
+continueUserActivity:(NSUserActivity *)userActivity
+ restorationHandler:(void (^)(NSArray*))restorationHandler
 {
     return [WXApi handleOpenUniversalLink:userActivity delegate:[FluwxResponseHandler defaultManager]];
 }

ios/Classes/handler/FluwxAutoDeductHandler.m

@@ -21,7 +21,6 @@
 }
 
 - (void)handleAutoDeductWithCall:(FlutterMethodCall *)call result:(FlutterResult)result {
-    NSDictionary *params = call.arguments;
     NSMutableDictionary *paramsFromDart = [NSMutableDictionary dictionaryWithDictionary:call.arguments];
     [paramsFromDart removeObjectForKey:@"businessType"];
     WXOpenBusinessWebViewReq *req = [[WXOpenBusinessWebViewReq alloc] init];

ios/Classes/handler/FluwxShareHandler.m

@@ -525,7 +525,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 
     if (indexOfPackage != JavaNotFound) {
         path = [pathWithoutSchema substringFromIndex:0 toIndex:indexOfPackage];
-        int begin = indexOfPackage + [fluwxKeyPackage length];
+        NSInteger begin = indexOfPackage + [fluwxKeyPackage length];
         packageName = [pathWithoutSchema substringFromIndex:begin toIndex:[pathWithoutSchema length]];
     } else {
         path = pathWithoutSchema;

ios/Classes/handler/NSStringWrapper.h

@@ -51,7 +51,8 @@
 
 - (int)lastIndexOfString:(NSString *)str fromIndex:(int)index;
 
-- (NSString *)substringFromIndex:(int)beginIndex toIndex:(int)endIndex;
+- (NSString *)substringFromIndex:(NSInteger)beginIndex
+                         toIndex:(NSInteger)endIndex;
 
 - (NSString *)toLowerCase;
 

ios/Classes/handler/NSStringWrapper.m

@@ -23,12 +23,12 @@
  * and a value greater than 0 if this string is lexicographically greater than the string argument.
  */
 - (int)compareTo:(NSString *)anotherString {
-    return [self compare:anotherString];
+    return (int)[self compare:anotherString];
 }
 
 /** Java-like method. Compares two strings lexicographically, ignoring case differences. */
 - (int)compareToIgnoreCase:(NSString *)str {
-    return [self compare:str options:NSCaseInsensitiveSearch];
+    return (int)[self compare:str options:NSCaseInsensitiveSearch];
 }
 
 /** Java-like method. Returns true if and only if this string contains the specified sequence of char values. */
@@ -58,7 +58,7 @@
 }
 
 - (int)indexOfChar:(unichar)ch fromIndex:(int)index {
-    int len = self.length;
+    int len = (int)self.length;
     for (int i = index; i < len; ++i) {
         if (ch == [self charAt:i]) {
             return i;
@@ -72,7 +72,7 @@
     if (range.location == NSNotFound) {
         return JavaNotFound;
     }
-    return range.location;
+    return (int)range.location;
 }
 
 - (int)indexOfString:(NSString *)str fromIndex:(int)index {
@@ -81,11 +81,11 @@
     if (range.location == NSNotFound) {
         return JavaNotFound;
     }
-    return range.location;
+    return (int)range.location;
 }
 
 - (int)lastIndexOfChar:(unichar)ch {
-    int len = self.length;
+    int len = (int)self.length;
     for (int i = len - 1; i >= 0; --i) {
         if ([self charAt:i] == ch) {
             return i;
@@ -95,7 +95,7 @@
 }
 
 - (int)lastIndexOfChar:(unichar)ch fromIndex:(int)index {
-    int len = self.length;
+    int len = (int)self.length;
     if (index >= len) {
         index = len - 1;
     }
@@ -112,7 +112,7 @@
     if (range.location == NSNotFound) {
         return JavaNotFound;
     }
-    return range.location;
+    return (int)range.location;
 }
 
 - (int)lastIndexOfString:(NSString *)str fromIndex:(int)index {
@@ -121,10 +121,11 @@
     if (range.location == NSNotFound) {
         return JavaNotFound;
     }
-    return range.location;
+    return (int)range.location;
 }
 
-- (NSString *)substringFromIndex:(int)beginIndex toIndex:(int)endIndex {
+- (NSString *)substringFromIndex:(NSInteger)beginIndex
+                         toIndex:(NSInteger)endIndex {
     if (endIndex <= beginIndex) {
         return @"";
     }

ios/Classes/public/WXApi.h

@@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
  *
  * 收到一个来自微信的处理结果。调用一次sendReq后会收到onResp。
  * 可能收到的处理结果有SendMessageToWXResp、SendAuthResp等。
- * @param resp具体的回应内容，是自动释放的
+ * @param resp 具体的回应内容，是自动释放的
  */
 - (void)onResp:(BaseResp*)resp;
 
@@ -175,7 +175,6 @@ NS_ASSUME_NONNULL_BEGIN
 + (void)startLogByLevel:(WXLogLevel)level logDelegate:(id<WXApiLogDelegate>)logDelegate;
 
 /*! @brief 停止打印log，会清理block或者delegate为空，释放block
- *  @param 
  */
 + (void)stopLog;
 @end

ios/Classes/public/WXApiObject.h

@@ -382,12 +382,10 @@ typedef void(^WXLogBolock)(NSString *log);
 @interface WXOpenBusinessWebViewReq : BaseReq
 
 /** 网页业务类型
- * @attention
  */
 @property (nonatomic, assign) UInt32 businessType;
 
 /** 网页业务参数
- * @attention
  */
 @property (nonatomic, strong, nullable) NSDictionary *queryInfoDic;
 
@@ -405,7 +403,6 @@ typedef void(^WXLogBolock)(NSString *log);
 @property (nonatomic, copy) NSString *result;
 
 /** 网页业务类型
- * @attention
  */
 @property (nonatomic, assign) UInt32 businessType;
 
@@ -1006,7 +1003,6 @@ typedef void(^WXLogBolock)(NSString *log);
 @property (nonatomic, copy, nullable) NSString *extInfo;
 
 /** extData数据
- * @note
  */
 @property (nonatomic, strong, nullable) NSData *extData;
 @end

ios/Classes/public/WXApiRequestHandler.h

@@ -10,6 +10,8 @@
 #import "WXApiObject.h"
 #import "FluwxResponseHandler.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface WXApiRequestHandler : NSObject
 
 + (void)sendText:(NSString *)text
@@ -62,7 +64,8 @@
 
 + (void)sendEmotionData:(NSData *)emotionData
              ThumbImage:(UIImage *)thumbImage
-                InScene:(enum WXScene)scene;
+                InScene:(enum WXScene)scene
+             completion:(void (^ __nullable)(BOOL success))completion;
 
 + (void)sendFileData:(NSData *)fileData
        fileExtension:(NSString *)extension
@@ -146,3 +149,5 @@
                Sign:(NSString *)sign
          completion:(void (^ __nullable)(BOOL success))completion;
 @end
+
+NS_ASSUME_NONNULL_END

ios/Classes/wechat/FluwxResponseHandler.m

@@ -57,7 +57,7 @@ FlutterMethodChannel *fluwxMethodChannel = nil;
                 description: messageResp.description == nil ? @"" : messageResp.description,
                 errStr: messageResp.errStr == nil ? @"" : messageResp.errStr,
                 errCode: @(messageResp.errCode),
-                type: messageResp.type == nil ? @2 : @(messageResp.type),
+                type: messageResp == nil ? @2 : @(messageResp.type),
                 country: messageResp.country == nil ? @"" : messageResp.country,
                 lang: messageResp.lang == nil ? @"" : messageResp.lang,
                 fluwxKeyPlatform: fluwxKeyIOS
@@ -79,7 +79,7 @@ FlutterMethodChannel *fluwxMethodChannel = nil;
                 description: authResp.description == nil ? @"" : authResp.description,
                 errStr: authResp.errStr == nil ? @"" : authResp.errStr,
                 errCode: @(authResp.errCode),
-                type: authResp.type == nil ? @1 : @(authResp.type),
+                type: authResp == nil ? @1 : @(authResp.type),
                 country: authResp.country == nil ? @"" : authResp.country,
                 lang: authResp.lang == nil ? @"" : authResp.lang,
                 fluwxKeyPlatform: fluwxKeyIOS,
@@ -135,7 +135,7 @@ FlutterMethodChannel *fluwxMethodChannel = nil;
                 description: miniProgramResp.description == nil ? @"" : miniProgramResp.description,
                 errStr: miniProgramResp.errStr == nil ? @"" : miniProgramResp.errStr,
                 errCode: @(miniProgramResp.errCode),
-                type: miniProgramResp.type == nil ? @1 : @(miniProgramResp.type),
+                type: miniProgramResp == nil ? @1 : @(miniProgramResp.type),
                 fluwxKeyPlatform: fluwxKeyIOS,
 
         };
@@ -164,7 +164,7 @@ FlutterMethodChannel *fluwxMethodChannel = nil;
             [_delegate managerDidRecvPayInsuranceResponse:(WXPayInsuranceResp *) resp];
         }
     } else if ([resp isKindOfClass:[PayResp class]]) {
-        if ([_delegate respondsToSelector:@selector(managerDidRecvPaymentResponse)]) {
+        if ([_delegate respondsToSelector:@selector(managerDidRecvPaymentResponse:)]) {
             [_delegate managerDidRecvPaymentResponse:(PayResp *) resp];
         }
 
@@ -175,7 +175,7 @@ FlutterMethodChannel *fluwxMethodChannel = nil;
                 description: [StringUtil nilToEmpty:payResp.description],
                 errStr: [StringUtil nilToEmpty:resp.errStr],
                 errCode: @(payResp.errCode),
-                type: payResp.type == nil ? @5 : @(payResp.type),
+                type: payResp == nil ? @5 : @(payResp.type),
                 @"returnKey": payResp.returnKey == nil ? @"" : payResp.returnKey,
                 fluwxKeyPlatform: fluwxKeyIOS,
         };
@@ -187,7 +187,7 @@ FlutterMethodChannel *fluwxMethodChannel = nil;
                 description: [StringUtil nilToEmpty:businessResp.description],
                 errStr: [StringUtil nilToEmpty:resp.errStr],
                 errCode: @(businessResp.errCode),
-                type: businessResp.type == nil ? @5 : @(businessResp.type),
+                type: businessResp == nil ? @5 : @(businessResp.type),
                 @"resultInfo": businessResp.result,
                 @"businessType": @(businessResp.businessType),
                 fluwxKeyPlatform: fluwxKeyIOS,

pubspec.yaml

 name: fluwx
 description: A Flutter plugin allowing developers to share or pay with natvie android & iOS Wechat SDKs.
-version: 1.2.1
+version: 1.2.1+1
 homepage: https://github.com/JarvanMo/fluwx
 
 environment: