Merge pull request #181 from xuelongqy/master

ios/Classes/handler/FluwxShareHandler.m

@@ -10,7 +10,7 @@
 #import "FluwxKeys.h"
 #import "StringToWeChatScene.h"
 #import "FluwxMethods.h"
-#import "StringUtil.h"
+#import "FluwxStringUtil.h"
 #import "ThumbnailHelper.h"
 #import "NSStringWrapper.h"
 
@@ -73,7 +73,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 
 - (void)shareImage:(FlutterMethodCall *)call result:(FlutterResult)result {
     NSString *imagePath = call.arguments[fluwxKeyImage];
-    if ([StringUtil isBlank:imagePath]) {
+    if ([FluwxStringUtil isBlank:imagePath]) {
         FlutterStandardTypedData *imageData = call.arguments[fluwxKeyImageData];
         [self shareMemoryImage:call result:result imageData:imageData.data];
     } else if ([imagePath hasPrefix:SCHEMA_ASSETS]) {
@@ -92,7 +92,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 
     NSString *thumbnail = call.arguments[fluwxKeyThumbnail];
     UIImage *thumbnailImage = nil;
-    if ([StringUtil isBlank:thumbnail]) {
+    if ([FluwxStringUtil isBlank:thumbnail]) {
         UIImage *tmp = [UIImage imageWithData:imageData];
         thumbnailImage = [ThumbnailHelper compressImage:tmp toByte:32 * 1024 isPNG:FALSE];
     } else {
@@ -140,7 +140,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 
     NSString *thumbnail = call.arguments[fluwxKeyThumbnail];
 
-    if ([StringUtil isBlank:thumbnail]) {
+    if ([FluwxStringUtil isBlank:thumbnail]) {
         thumbnail = imagePath;
     }
 
@@ -183,7 +183,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 
     NSString *thumbnail = call.arguments[fluwxKeyThumbnail];
 
-    if ([StringUtil isBlank:thumbnail]) {
+    if ([FluwxStringUtil isBlank:thumbnail]) {
         thumbnail = imagePath;
     }
 
@@ -231,7 +231,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 
     NSString *thumbnail = call.arguments[fluwxKeyThumbnail];
 
-    if ([StringUtil isBlank:thumbnail]) {
+    if ([FluwxStringUtil isBlank:thumbnail]) {
         thumbnail = imagePath;
     }
 
@@ -409,7 +409,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
         NSData *hdImageData = nil;
 
         NSString *hdImagePath = call.arguments[@"hdImagePath"];
-        if (![StringUtil isBlank:hdImagePath]) {
+        if (![FluwxStringUtil isBlank:hdImagePath]) {
             if ([hdImagePath hasPrefix:SCHEMA_ASSETS]) {
                 hdImageData = [NSData dataWithContentsOfFile:[self readImageFromAssets:hdImagePath]];
 
@@ -469,7 +469,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 
     UIImage *thumbnailImage = nil;
 
-    if ([StringUtil isBlank:thumbnail]) {
+    if ([FluwxStringUtil isBlank:thumbnail]) {
         return nil;
     }
 
@@ -504,7 +504,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 - (NSString *)readImageFromAssets:(NSString *)imagePath {
     NSArray *array = [self formatAssets:imagePath];
     NSString *key;
-    if ([StringUtil isBlank:array[1]]) {
+    if ([FluwxStringUtil isBlank:array[1]]) {
         key = [_fluwxRegistrar lookupKeyForAsset:array[0]];
     } else {
         key = [_fluwxRegistrar lookupKeyForAsset:array[0] fromPackage:array[1]];

ios/Classes/handler/FluwxWXApiHandler.m

@@ -4,7 +4,7 @@
 
 
 #import "FluwxWXApiHandler.h"
-#import "StringUtil.h"
+#import "FluwxStringUtil.h"
 #import "FluwxPlugin.h"
 #import "CallResults.h"
 #import "FluwxKeys.h"
@@ -23,14 +23,14 @@
     }
 
     NSString *appId = call.arguments[@"appId"];
-    if ([StringUtil isBlank:appId]) {
+    if ([FluwxStringUtil isBlank:appId]) {
         result([FlutterError errorWithCode:@"invalid app id" message:@"are you sure your app id is correct ? " details:appId]);
         return;
     }
 
     NSString *universalLink = call.arguments[@"universalLink"];
 
-    if ([StringUtil isBlank:universalLink]) {
+    if ([FluwxStringUtil isBlank:universalLink]) {
         result([FlutterError errorWithCode:@"invalid universal link" message:@"are you sure your universal link is correct ? " details:universalLink]);
         return;
     }

ios/Classes/helper/StringUtil.h → ios/Classes/helper/FluwxStringUtil.h

@@ -5,7 +5,7 @@
 #import <Foundation/Foundation.h>
 
 
-@interface StringUtil : NSObject
+@interface FluwxStringUtil : NSObject
 + (BOOL)isBlank:(NSString *)string;
 
 + (NSString *)nilToEmpty:(NSString *)string;

ios/Classes/helper/StringUtil.m → ios/Classes/helper/FluwxStringUtil.m

@@ -2,10 +2,10 @@
 // Created by mo on 2018/8/15.
 //
 
-#import "StringUtil.h"
+#import "FluwxStringUtil.h"
 
 
-@implementation StringUtil
+@implementation FluwxStringUtil
 
 + (BOOL)isBlank:(NSString *)string {
 

ios/Classes/public/FluwxAuthHandler.h

@@ -8,7 +8,7 @@
 #import "WXApiRequestHandler.h"
 #import "WechatAuthSDK.h"
 
-@class StringUtil;
+@class FluwxStringUtil;
 
 @interface FluwxAuthHandler : NSObject <WechatAuthAPIDelegate>
 - (instancetype)initWithRegistrar:(NSObject <FlutterPluginRegistrar> *)registrar methodChannel:(FlutterMethodChannel *)flutterMethodChannel;

ios/Classes/public/FluwxLaunchMiniProgramHandler.h

@@ -3,7 +3,7 @@
 #import "FluwxPlugin.h"
 
 
-@class StringUtil;
+@class FluwxStringUtil;
 
 @interface FluwxLaunchMiniProgramHandler : NSObject
 - (instancetype)initWithRegistrar:(NSObject <FlutterPluginRegistrar> *)registrar;

ios/Classes/public/FluwxPaymentHandler.h

@@ -7,7 +7,7 @@
 #import "FluwxPlugin.h"
 
 
-@class StringUtil;
+@class FluwxStringUtil;
 
 
 @interface FluwxPaymentHandler : NSObject

ios/Classes/public/FluwxShareHandler.h

@@ -8,7 +8,7 @@
 #import "FluwxPlugin.h"
 #import "WXApiRequestHandler.h"
 
-@class StringUtil;
+@class FluwxStringUtil;
 
 @interface FluwxShareHandler : NSObject
 - (instancetype)initWithRegistrar:(NSObject <FlutterPluginRegistrar> *)registrar;

ios/Classes/wechat/FluwxResponseHandler.m

@@ -8,7 +8,7 @@
 
 #import "FluwxResponseHandler.h"
 #import "FluwxKeys.h"
-#import "StringUtil.h"
+#import "FluwxStringUtil.h"
 #import "WXApiObject.h"
 #import "WXApi.h"
 @implementation FluwxResponseHandler
@@ -83,8 +83,8 @@ FlutterMethodChannel *fluwxMethodChannel = nil;
                 country: authResp.country == nil ? @"" : authResp.country,
                 lang: authResp.lang == nil ? @"" : authResp.lang,
                 fluwxKeyPlatform: fluwxKeyIOS,
-                @"code": [StringUtil nilToEmpty:authResp.code],
-                @"state": [StringUtil nilToEmpty:authResp.state]
+                @"code": [FluwxStringUtil nilToEmpty:authResp.code],
+                @"state": [FluwxStringUtil nilToEmpty:authResp.state]
 
         };
         [fluwxMethodChannel invokeMethod:@"onAuthResponse" arguments:result];
@@ -172,8 +172,8 @@ FlutterMethodChannel *fluwxMethodChannel = nil;
         PayResp *payResp = (PayResp *) resp;
 
         NSDictionary *result = @{
-                description: [StringUtil nilToEmpty:payResp.description],
-                errStr: [StringUtil nilToEmpty:resp.errStr],
+                description: [FluwxStringUtil nilToEmpty:payResp.description],
+                errStr: [FluwxStringUtil nilToEmpty:resp.errStr],
                 errCode: @(payResp.errCode),
                 type: payResp == nil ? @5 : @(payResp.type),
                 @"returnKey": payResp.returnKey == nil ? @"" : payResp.returnKey,
@@ -184,8 +184,8 @@ FlutterMethodChannel *fluwxMethodChannel = nil;
         WXOpenBusinessWebViewResp *businessResp = (WXOpenBusinessWebViewResp *) resp;
 
         NSDictionary *result = @{
-                description: [StringUtil nilToEmpty:businessResp.description],
-                errStr: [StringUtil nilToEmpty:resp.errStr],
+                description: [FluwxStringUtil nilToEmpty:businessResp.description],
+                errStr: [FluwxStringUtil nilToEmpty:resp.errStr],
                 errCode: @(businessResp.errCode),
                 type: businessResp == nil ? @5 : @(businessResp.type),
                 @"resultInfo": businessResp.result,

ios/Classes/wechat/WXApiRequestHandler.m

@@ -10,7 +10,7 @@
 #import "WXApiRequestHandler.h"
 #import "SendMessageToWXReq+requestWithTextOrMediaMessage.h"
 #import "WXMediaMessage+messageConstruct.h"
-#import "StringUtil.h"
+#import "FluwxStringUtil.h"
 #import "WXApiObject.h"
 
 @implementation WXApiRequestHandler
@@ -98,7 +98,7 @@
           completion:(void (^ __nullable)(BOOL success))completion {
     WXMusicObject *ext = [WXMusicObject object];
 
-    if ([StringUtil isBlank:musicURL]) {
+    if ([FluwxStringUtil isBlank:musicURL]) {
         ext.musicLowBandUrl = musicLowBandUrl;
         ext.musicLowBandDataUrl = (musicLowBandDataUrl == (id) [NSNull null]) ? nil : musicLowBandDataUrl;
     } else {
@@ -142,7 +142,7 @@
     [message setThumbImage:thumbImage];
 
     WXVideoObject *ext = [WXVideoObject object];
-    if ([StringUtil isBlank:videoURL]) {
+    if ([FluwxStringUtil isBlank:videoURL]) {
         ext.videoLowBandUrl = videoLowBandUrl;
     } else {
         ext.videoUrl = videoURL;