🔥 Remove thumbnail and format files (#662)

ios/Classes/FluwxDelegate.m

@@ -20,9 +20,8 @@
     return instance;
 }
 
-- (void) registerWxAPI:(NSString *)appId universalLink:(NSString *)universalLink {
+- (void)registerWxAPI:(NSString *)appId universalLink:(NSString *)universalLink {
     [WXApi registerApp:appId universalLink:universalLink];
 }
 
-
 @end

ios/Classes/FluwxPlugin.m

@@ -12,7 +12,6 @@
 NSString *const fluwxKeyTitle = @"title";
 NSString *const fluwxKeyImage = @ "image";
 NSString *const fluwxKeyImageData = @ "imageData";
-NSString *const fluwxKeyThumbnail = @"thumbnail";
 NSString *const fluwxKeyDescription = @"description";
 NSString *const fluwxKeyMsgSignature = @"msgSignature";
 NSString *const fluwxKeyThumbData = @"thumbData";
@@ -29,8 +28,6 @@ NSString *const fluwxKeyTimeline = @"timeline";
 NSString *const fluwxKeySession = @"session";
 NSString *const fluwxKeyFavorite = @"favorite";
 
-NSString *const fluwxKeyCompressThumbnail = @"compressThumbnail";
-
 NSString *const keySource = @"source";
 NSString *const keySuffix = @"suffix";
 
@@ -39,7 +36,9 @@ CGFloat thumbnailWidth;
 NSUInteger defaultThumbnailSize = 32 * 1024;
 
 @interface FluwxPlugin()<WXApiDelegate,WechatAuthAPIDelegate>
-@property (strong,nonatomic)NSString *extMsg;
+
+@property (strong, nonatomic)NSString *extMsg;
+
 @end
 
 typedef void(^FluwxWXReqRunnable)(void);
@@ -66,7 +65,6 @@ BOOL handleOpenURLByFluwx = YES;
 
 NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 
-
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
     _fluwxRegistrar = registrar;
     FlutterMethodChannel *channel =
@@ -96,7 +94,6 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 }
 
 - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
-
     if ([@"registerApp" isEqualToString:call.method]) {
         [self registerApp:call result:result];
     } else if ([@"isWeChatInstalled" isEqualToString:call.method]) {
@@ -119,9 +116,9 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
         [self handleautoDeductV2:call result:result];
     } else if ([@"openBusinessView" isEqualToString:call.method]) {
         [self handleOpenBusinessView:call result:result];
-    }else if([@"authByPhoneLogin" isEqualToString:call.method]){
+    } else if ([@"authByPhoneLogin" isEqualToString:call.method]) {
         [self handleAuthByPhoneLogin:call result:result];
-    }else if([@"getExtMsg" isEqualToString:call.method]){
+    } else if ([@"getExtMsg" isEqualToString:call.method]) {
         [self handelGetExtMsgWithCall:call result:result];
     } else if ([call.method hasPrefix:@"share"]) {
         [self handleShare:call result:result];
@@ -133,24 +130,23 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
         [self handleOpenRankListCall:call result:result];
     } else if ([@"openUrl" isEqualToString:call.method]) {
         [self handleOpenUrlCall:call result:result];
-    } else if([@"openWeChatInvoice" isEqualToString:call.method]) {
+    } else if ([@"openWeChatInvoice" isEqualToString:call.method]) {
         [self openWeChatInvoice:call result:result];
-    } else if([@"selfCheck" isEqualToString:call.method]) {
-        #ifndef __OPTIMIZE__
-        [WXApi checkUniversalLinkReady:^(WXULCheckStep step, WXCheckULStepResult* result) {
+    } else if ([@"selfCheck" isEqualToString:call.method]) {
+#ifndef __OPTIMIZE__
+        [WXApi checkUniversalLinkReady:^(WXULCheckStep step, WXCheckULStepResult *result) {
             NSString *log = [NSString stringWithFormat:@"%@, %u, %@, %@", @(step), result.success, result.errorInfo, result.suggestion];
             [self logToFlutterWithDetail:log];
         }];
-        #endif
+#endif
         result(nil);
-    } else if([@"attemptToResumeMsgFromWx" isEqualToString:call.method]){
+    } else if ([@"attemptToResumeMsgFromWx" isEqualToString:call.method]) {
         if (_attemptToResumeMsgFromWxRunnable != nil) {
             _attemptToResumeMsgFromWxRunnable();
             _attemptToResumeMsgFromWxRunnable = nil;
         }
         result(nil);
-    }
-    else if ([@"payWithFluwx" isEqualToString:call.method]) {
+    } else if ([@"payWithFluwx" isEqualToString:call.method]) {
 #ifndef NO_PAY
         [self handlePayment:call result:result];
 #else
@@ -162,8 +158,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 #else
         result(@NO);
 #endif
-    }
-    else {
+    } else {
         result(FlutterMethodNotImplemented);
     }
 }
@@ -173,7 +168,10 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
     NSString *appId = call.arguments[@"appId"];
     
     if ([FluwxStringUtil isBlank:appId]) {
-        result([FlutterError errorWithCode:@"invalid app id" message:@"are you sure your app id is correct ? " details:appId]);
+        result([FlutterError
+                errorWithCode:@"invalid app id"
+                message:@"are you sure your app id is correct ? "
+                details:appId]);
         return;
     }
     
@@ -189,7 +187,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 }
 
 - (void)registerApp:(FlutterMethodCall *)call result:(FlutterResult)result {
-    NSNumber* doOnIOS =call.arguments[@"iOS"];
+    NSNumber *doOnIOS = call.arguments[@"iOS"];
     
     if (![doOnIOS boolValue]) {
         result(@NO);
@@ -198,21 +196,27 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
     
     NSString *appId = call.arguments[@"appId"];
     if ([FluwxStringUtil isBlank:appId]) {
-        result([FlutterError errorWithCode:@"invalid app id" message:@"are you sure your app id is correct ? " details: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 ([FluwxStringUtil isBlank:universalLink]) {
-        result([FlutterError errorWithCode:@"invalid universal link" message:@"are you sure your universal link is correct ? " details:universalLink]);
+        result([FlutterError
+                errorWithCode:@"invalid universal link"
+                message:@"are you sure your universal link is correct ? "
+                details:universalLink]);
         return;
     }
     
     BOOL isWeChatRegistered = [WXApi registerApp:appId universalLink:universalLink];
     
     // If registration fails, we can return immediately
-    if(!isWeChatRegistered){
+    if (!isWeChatRegistered) {
         result(@(isWeChatRegistered));
         _isRunning = NO;
         return;
@@ -245,7 +249,6 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
     NSString *url = call.arguments[@"url"];
     NSString *corpId = call.arguments[@"corpId"];
     
-
     WXOpenCustomerServiceReq *req = [[WXOpenCustomerServiceReq alloc] init];
     req.corpid = corpId; //企业ID
     req.url = url;       //客服URL
@@ -255,17 +258,15 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 }
 
 - (void)checkSupportOpenBusinessView:(FlutterMethodCall *)call result:(FlutterResult)result {
-    if(![WXApi isWXAppInstalled]){
+    if (![WXApi isWXAppInstalled]) {
         result([FlutterError errorWithCode:@"WeChat Not Installed" message:@"Please install the WeChat first" details:nil]);
-    }else {
+    } else {
         result(@(true));
     }
 }
 
 #ifndef NO_PAY
 - (void)handlePayment:(FlutterMethodCall *)call result:(FlutterResult)result {
-
-
     NSNumber *timestamp = call.arguments[@"timeStamp"];
     
     NSString *partnerId = call.arguments[@"partnerId"];
@@ -276,7 +277,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
     NSString *sign = call.arguments[@"sign"];
     [FluwxDelegate defaultManager].extData = call.arguments[@"extData"];
     
-    NSString * appId = call.arguments[@"appId"];
+    NSString *appId = call.arguments[@"appId"];
     PayReq *req = [[PayReq alloc] init];
     req.openID = (appId == (id) [NSNull null]) ? nil : appId;
     req.partnerId = partnerId;
@@ -309,7 +310,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 - (void)handleLaunchMiniProgram:(FlutterMethodCall *)call result:(FlutterResult)result {
     NSString *userName = call.arguments[@"userName"];
     NSString *path = call.arguments[@"path"];
-//    WXMiniProgramType *miniProgramType = call.arguments[@"miniProgramType"];
+    //WXMiniProgramType *miniProgramType = call.arguments[@"miniProgramType"];
     
     NSNumber *typeInt = call.arguments[@"miniProgramType"];
     WXMiniProgramType miniProgramType = WXMiniProgramTypeRelease;
@@ -319,7 +320,6 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
         miniProgramType = WXMiniProgramTypePreview;
     }
     
-
     WXLaunchMiniProgramReq *launchMiniProgramReq = [WXLaunchMiniProgramReq object];
     launchMiniProgramReq.userName = userName;
     launchMiniProgramReq.path = (path == (id) [NSNull null]) ? nil : path;
@@ -339,11 +339,11 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
     NSString *reserved = [params valueForKey:@"reserved"];
     
     WXSubscribeMsgReq *req = [WXSubscribeMsgReq new];
-    #if __LP64__
+#if __LP64__
     req.scene = [scene unsignedIntValue];
-    #else
+#else
     req.scene = [scene unsignedLongValue];
-    #endif
+#endif
     req.templateId = templateId;
     req.reserved = reserved;
     req.openID = appId;
@@ -367,7 +367,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 
 - (void)handleautoDeductV2:(FlutterMethodCall *)call result:(FlutterResult)result {
     NSMutableDictionary *paramsFromDart = call.arguments[@"queryInfo"];
-//    [paramsFromDart removeObjectForKey:@"businessType"];
+    //    [paramsFromDart removeObjectForKey:@"businessType"];
     WXOpenBusinessWebViewReq *req = [[WXOpenBusinessWebViewReq alloc] init];
     NSNumber *businessType = call.arguments[@"businessType"];
     req.businessType = [businessType unsignedIntValue];
@@ -393,14 +393,17 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 
 - (void)handelGetExtMsgWithCall:(FlutterMethodCall *)call result:(FlutterResult)result {
     result([FluwxDelegate defaultManager].extMsg);
-    [FluwxDelegate defaultManager].extMsg=nil;
+    [FluwxDelegate defaultManager].extMsg = nil;
 }
 
 
 // Deprecated since iOS 9
 // See https://developer.apple.com/documentation/uikit/uiapplicationdelegate/1623073-application?language=objc
 // Use `application:openURL:options:` instead.
-- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation {
+- (BOOL)application:(UIApplication *)application
+            openURL:(NSURL *)url
+  sourceApplication:(NSString *)sourceApplication
+         annotation:(id)annotation {
     // Since flutter has minimum iOS version requirement of 11.0, we don't need to change the implementation here.
     return [WXApi handleOpenURL:url delegate:self];
 }
@@ -415,26 +418,24 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 
 // Available on iOS 9.0 and later
 // See https://developer.apple.com/documentation/uikit/uiapplicationdelegate/1623112-application?language=objc
-- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<NSString *, id> *)options {
+- (BOOL)application:(UIApplication *)app
+            openURL:(NSURL *)url
+             options:(NSDictionary<NSString *, id> *)options {
     // ↓ previous solution -- according to document, this may fail if the WXApi hasn't registered yet.
     // return [WXApi handleOpenURL:url delegate:self];
     
     if (_isRunning) {
         // registered -- directly handle open url request by WXApi
         return [WXApi handleOpenURL:url delegate:self];
-    }else {
+    } else {
         // unregistered -- cache open url request and handle it once WXApi is registered
         __weak typeof(self) weakSelf = self;
         _cachedOpenUrlRequest = ^() {
             __strong typeof(weakSelf) strongSelf = weakSelf;
             [WXApi handleOpenURL:url delegate:strongSelf];
         };
-// Let's hold this until the PR contributor send feedback.
-//        if ([url.absoluteString contains:[self fetchWeChatAppId]]){
-//            return YES;
-//        } else {
-//            return NO;
-//        }
+        // Let's hold this until the PR contributor send feedback.
+        //return [url.absoluteString contains:[self fetchWeChatAppId]];
         
         // simply return YES to indicate that we can handle open url request later
         return NO;
@@ -442,14 +443,14 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 }
 
 #ifndef SCENE_DELEGATE
-- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray * _Nonnull))restorationHandler{
+- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray *_Nonnull))restorationHandler{
     // TODO: (if need) cache userActivity and handle it once WXApi is registered
     return [WXApi handleOpenUniversalLink:userActivity delegate:self];
 }
 #endif
 
 #ifdef SCENE_DELEGATE
-- (void)scene:(UIScene *)scene continueUserActivity:(NSUserActivity *)userActivity  API_AVAILABLE(ios(13.0)){
+- (void)scene:(UIScene *)scene continueUserActivity:(NSUserActivity *)userActivity API_AVAILABLE(ios(13.0)) {
     // TODO: (if need) cache userActivity and handle it once WXApi is registered
     [WXApi handleOpenUniversalLink:userActivity delegate:self];
 }
@@ -460,7 +461,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
     OpenWebviewReq *req = [[OpenWebviewReq alloc] init];
     req.url = call.arguments[@"url"];
     [WXApi sendReq:req
-        completion:^(BOOL success){
+        completion:^(BOOL success) {
         result(@(success));
     }];
 }
@@ -469,7 +470,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
                         result:(FlutterResult)result {
     OpenRankListReq *req = [[OpenRankListReq alloc] init];
     [WXApi sendReq:req
-        completion:^(BOOL success){
+        completion:^(BOOL success) {
         result(@(success));
     }];
 }
@@ -485,7 +486,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 }
 
 - (void)logToFlutterWithDetail:(NSString *) detail {
-    if(_channel != nil){
+    if (_channel != nil) {
         NSDictionary *result = @{
             @"detail":detail
         };
@@ -521,35 +522,27 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 }
 
 - (void)shareImage:(FlutterMethodCall *)call result:(FlutterResult)result {
-    dispatch_queue_t globalQueue = dispatch_get_global_queue(0, 0);
-    dispatch_async(globalQueue, ^{
+    NSNumber *scene = call.arguments[fluwxKeyScene];
     
     NSDictionary *sourceImage = call.arguments[keySource];
     
     FlutterStandardTypedData *flutterImageData = sourceImage[@"uint8List"];
     NSData *imageData = nil;
-        
-      
-        if (flutterImageData != nil){
+    if (flutterImageData != nil) {
         imageData = flutterImageData.data;
     }
     
-
-        NSString * imageDataHash = sourceImage[@"imgDataHash"];
-       
-        dispatch_async(dispatch_get_main_queue(), ^{
-
+    NSString *imageDataHash = sourceImage[@"imgDataHash"];
     
     FlutterStandardTypedData *flutterThumbData = call.arguments[fluwxKeyThumbData];
     NSData *thumbData = nil;
-          
-            
-            if (![flutterThumbData isKindOfClass:[NSNull class]]){
+    if (![flutterThumbData isKindOfClass:[NSNull class]]) {
         thumbData = flutterThumbData.data;
     }
     
-            
-            NSNumber *scene = call.arguments[fluwxKeyScene];
+    dispatch_queue_t globalQueue = dispatch_get_global_queue(0, 0);
+    dispatch_async(globalQueue, ^{
+        dispatch_async(dispatch_get_main_queue(), ^{
             [self sendImageData:imageData
                     ImgDataHash:imageDataHash
                         TagName:call.arguments[fluwxKeyMediaTagName]
@@ -563,38 +556,29 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
                   ThumbDataHash:call.arguments[fluwxKeyThumbDataHash]
                      completion:^(BOOL done) {
                 result(@(done));
-                                    }
-            ];
-
+            }];
         });
         
     });
 }
 
 - (void)shareWebPage:(FlutterMethodCall *)call result:(FlutterResult)result {
-
-    dispatch_queue_t globalQueue = dispatch_get_global_queue(0, 0);
-    dispatch_async(globalQueue, ^{
-
-        UIImage *thumbnailImage = [self getCommonThumbnail:call];
-
-        dispatch_async(dispatch_get_main_queue(), ^{
     NSString *webPageUrl = call.arguments[@"webPage"];
     NSNumber *scene = call.arguments[fluwxKeyScene];
     
     FlutterStandardTypedData *flutterThumbData = call.arguments[fluwxKeyThumbData];
     NSData *thumbData = nil;
-          
-            
-            if (![flutterThumbData isKindOfClass:[NSNull class]]){
+    if (![flutterThumbData isKindOfClass:[NSNull class]]) {
         thumbData = flutterThumbData.data;
     }
     
+    dispatch_queue_t globalQueue = dispatch_get_global_queue(0, 0);
+    dispatch_async(globalQueue, ^{
+        dispatch_async(dispatch_get_main_queue(), ^{
             [self sendLinkURL:webPageUrl
                       TagName:call.arguments[fluwxKeyMediaTagName]
                         Title:call.arguments[fluwxKeyTitle]
                   Description:call.arguments[fluwxKeyDescription]
-                                  ThumbImage:thumbnailImage
                    MessageExt:call.arguments[fluwxKeyMessageExt]
                 MessageAction:call.arguments[fluwxKeyMessageAction]
                       InScene:[self intToWeChatScene:scene]
@@ -610,28 +594,23 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 }
 
 - (void)shareMusic:(FlutterMethodCall *)call result:(FlutterResult)result {
-    dispatch_queue_t globalQueue = dispatch_get_global_queue(0, 0);
-    dispatch_async(globalQueue, ^{
-
-        UIImage *thumbnailImage = [self getCommonThumbnail:call];
-
-        dispatch_async(dispatch_get_main_queue(), ^{
+    NSNumber *scene = call.arguments[fluwxKeyScene];
     
     FlutterStandardTypedData *flutterThumbData = call.arguments[fluwxKeyThumbData];
     NSData *thumbData = nil;
-          
-            
-            if (![flutterThumbData isKindOfClass:[NSNull class]]){
+    if (![flutterThumbData isKindOfClass:[NSNull class]]) {
         thumbData = flutterThumbData.data;
     }
-            NSNumber *scene = call.arguments[fluwxKeyScene];
+    
+    dispatch_queue_t globalQueue = dispatch_get_global_queue(0, 0);
+    dispatch_async(globalQueue, ^{
+        dispatch_async(dispatch_get_main_queue(), ^{
             [self sendMusicURL:call.arguments[@"musicUrl"]
                        dataURL:call.arguments[@"musicDataUrl"]
                MusicLowBandUrl:call.arguments[@"musicLowBandUrl"]
            MusicLowBandDataUrl:call.arguments[@"musicLowBandDataUrl"]
                          Title:call.arguments[fluwxKeyTitle]
                    Description:call.arguments[fluwxKeyDescription]
-                                   ThumbImage:thumbnailImage
                     MessageExt:call.arguments[fluwxKeyMessageExt]
                  MessageAction:call.arguments[fluwxKeyMessageAction]
                        TagName:call.arguments[fluwxKeyMediaTagName]
@@ -641,35 +620,27 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
                  ThumbDataHash:call.arguments[fluwxKeyThumbDataHash]
                     completion:^(BOOL done) {
                 result(@(done));
-                                   }
-            ];
+            }];
         });
     });
 }
 
 - (void)shareVideo:(FlutterMethodCall *)call result:(FlutterResult)result {
-    dispatch_queue_t globalQueue = dispatch_get_global_queue(0, 0);
-    dispatch_async(globalQueue, ^{
-
-        UIImage *thumbnailImage = [self getCommonThumbnail:call];
-
-        dispatch_async(dispatch_get_main_queue(), ^{
-
     NSNumber *scene = call.arguments[fluwxKeyScene];
     
     FlutterStandardTypedData *flutterThumbData = call.arguments[fluwxKeyThumbData];
     NSData *thumbData = nil;
-          
-            
-            if (![flutterThumbData isKindOfClass:[NSNull class]]){
+    if (![flutterThumbData isKindOfClass:[NSNull class]]) {
         thumbData = flutterThumbData.data;
     }
     
+    dispatch_queue_t globalQueue = dispatch_get_global_queue(0, 0);
+    dispatch_async(globalQueue, ^{
+        dispatch_async(dispatch_get_main_queue(), ^{
             [self sendVideoURL:call.arguments[@"videoUrl"]
                VideoLowBandUrl:call.arguments[@"videoLowBandUrl"]
                          Title:call.arguments[fluwxKeyTitle]
                    Description:call.arguments[fluwxKeyDescription]
-                                   ThumbImage:thumbnailImage
                     MessageExt:call.arguments[fluwxKeyMessageExt]
                  MessageAction:call.arguments[fluwxKeyMessageAction]
                        TagName:call.arguments[fluwxKeyMediaTagName]
@@ -685,10 +656,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 }
 
 - (void)shareFile:(FlutterMethodCall *)call result:(FlutterResult)result {
-    dispatch_queue_t globalQueue = dispatch_get_global_queue(0, 0);
-    dispatch_async(globalQueue, ^{
     NSDictionary *sourceFile = call.arguments[keySource];
-        UIImage *thumbnailImage = [self getCommonThumbnail:call];
     NSString *fileExtension;
     NSString *suffix = sourceFile[keySuffix];
     fileExtension = suffix;
@@ -698,22 +666,21 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
     }
     
     NSData *data = [self getNsDataFromWeChatFile:sourceFile];
-
-        dispatch_async(dispatch_get_main_queue(), ^{
     NSNumber *scene = call.arguments[fluwxKeyScene];
     
     FlutterStandardTypedData *flutterThumbData = call.arguments[fluwxKeyThumbData];
     NSData *thumbData = nil;
-          
-            
-            if (![flutterThumbData isKindOfClass:[NSNull class]]){
+    if (![flutterThumbData isKindOfClass:[NSNull class]]) {
         thumbData = flutterThumbData.data;
     }
+    
+    dispatch_queue_t globalQueue = dispatch_get_global_queue(0, 0);
+    dispatch_async(globalQueue, ^{
+        dispatch_async(dispatch_get_main_queue(), ^{
             [self sendFileData:data
                  fileExtension:fileExtension
                          Title:call.arguments[fluwxKeyTitle]
                    Description:call.arguments[fluwxKeyDescription]
-                                   ThumbImage:thumbnailImage
                        InScene:[self intToWeChatScene:scene]
                   MsgSignature:call.arguments[fluwxKeyMsgSignature]
                      ThumbData:thumbData
@@ -726,31 +693,20 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 }
 
 - (void)shareMiniProgram:(FlutterMethodCall *)call result:(FlutterResult)result {
-    dispatch_queue_t globalQueue = dispatch_get_global_queue(0, 0);
-    dispatch_async(globalQueue, ^{
-
-
-        dispatch_async(dispatch_get_main_queue(), ^{
-
+    NSNumber *scene = call.arguments[fluwxKeyScene];
     
     FlutterStandardTypedData *flutterThumbData = call.arguments[fluwxKeyThumbData];
-            FlutterStandardTypedData *hdImageDataPayload = call.arguments[@"hdImageData"];
-            
     NSData *thumbData = nil;
-          
-            NSData *hdImageData = nil;
-            
-            if (![flutterThumbData isKindOfClass:[NSNull class]]){
+    if (![flutterThumbData isKindOfClass:[NSNull class]]) {
         thumbData = flutterThumbData.data;
     }
     
-            if (![hdImageDataPayload isKindOfClass:[NSNull class]]){
+    FlutterStandardTypedData *hdImageDataPayload = call.arguments[@"hdImageData"];
+    NSData *hdImageData = nil;
+    if (![hdImageDataPayload isKindOfClass:[NSNull class]]) {
         hdImageData = hdImageDataPayload.data;
     }
     
-            
-            NSNumber *scene = call.arguments[fluwxKeyScene];
-
     NSNumber *typeInt = call.arguments[@"miniProgramType"];
     WXMiniProgramType miniProgramType = WXMiniProgramTypeRelease;
     if ([typeInt isEqualToNumber:@1]) {
@@ -758,7 +714,9 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
     } else if ([typeInt isEqualToNumber:@2]) {
         miniProgramType = WXMiniProgramTypePreview;
     }
-
+    dispatch_queue_t globalQueue = dispatch_get_global_queue(0, 0);
+    dispatch_async(globalQueue, ^{
+        dispatch_async(dispatch_get_main_queue(), ^{
             [self sendMiniProgramWebpageUrl:call.arguments[@"webPageUrl"]
                                    userName:call.arguments[@"userName"]
                                        path:call.arguments[@"path"]
@@ -776,35 +734,11 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
                               ThumbDataHash:call.arguments[fluwxKeyThumbDataHash]
                                  completion:^(BOOL done) {
                 result(@(done));
-                                                }
-            ];
-
+            }];
         });
-
     });
 }
 
-
-- (UIImage *)getCommonThumbnail:(FlutterMethodCall *)call {
-    NSDictionary *thumbnail = call.arguments[fluwxKeyThumbnail];
-    if (thumbnail == nil || thumbnail == (id) [NSNull null]) {
-        return nil;
-    }
-
-    NSString *suffix = thumbnail[@"suffix"];
-    NSNumber *compress = call.arguments[fluwxKeyCompressThumbnail];
-
-    NSData *thumbnailData = [self getNsDataFromWeChatFile:thumbnail];
-    UIImage *thumbnailImage = [self getThumbnailFromNSData:thumbnailData size:defaultThumbnailSize isPNG:[self isPNG:suffix] compress:[compress boolValue]];
-    return thumbnailImage;
-}
-
-//enum ImageSchema {
-//    NETWORK,
-//    ASSET,
-//    FILE,
-//    BINARY,
-//}
 - (NSData *)getNsDataFromWeChatFile:(NSDictionary *)weChatFile {
     NSNumber *schema = weChatFile[@"schema"];
     
@@ -829,10 +763,11 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 
 - (UIImage *)getThumbnailFromNSData:(NSData *)data size:(NSUInteger)size isPNG:(BOOL)isPNG compress:(BOOL)compress {
     UIImage *uiImage = [UIImage imageWithData:data];
-    if (compress)
+    if (compress) {
         return [ThumbnailHelper compressImage:uiImage toByte:size isPNG:isPNG];
-    else
+    } else {
         return uiImage;
+    }
 }
 
 - (NSData *)getThumbnailDataFromNSData:(NSData *)data size:(NSUInteger)size compress:(BOOL)compress {
@@ -877,7 +812,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 }
 
 - (enum WXScene)intToWeChatScene:(NSNumber *)value {
-//    enum WeChatScene { SESSION, TIMELINE, FAVORITE }
+    //    enum WeChatScene { SESSION, TIMELINE, FAVORITE }
     if ([value isEqual:@0]) {
         return WXSceneSession;
     } else if ([value isEqual:@1]) {
@@ -889,29 +824,24 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
     }
 }
 
-
 - (void)managerDidRecvLaunchFromWXReq:(LaunchFromWXReq *)request {
     [FluwxDelegate defaultManager].extMsg = request.message.messageExt;
-//    LaunchFromWXReq *launchFromWXReq = (LaunchFromWXReq *)request;
-//
-//           if (_isRunning) {
-//               [FluwxDelegate defaultManager].extMsg = request.message.messageExt;
-//           } else {
-//               __weak typeof(self) weakSelf = self;
-//               _initialWXReqRunnable = ^() {
-//                   __strong typeof(weakSelf) strongSelf = weakSelf;
-//                   [FluwxDelegate defaultManager].extMsg = request.message.messageExt
-//               };
-//           }
+    //    LaunchFromWXReq *launchFromWXReq = (LaunchFromWXReq *)request;
+    //
+    //           if (_isRunning) {
+    //               [FluwxDelegate defaultManager].extMsg = request.message.messageExt;
+    //           } else {
+    //               __weak typeof(self) weakSelf = self;
+    //               _initialWXReqRunnable = ^() {
+    //                   __strong typeof(weakSelf) strongSelf = weakSelf;
+    //                   [FluwxDelegate defaultManager].extMsg = request.message.messageExt
+    //               };
+    //           }
 }
 
-
 - (void)onResp:(BaseResp *)resp {
     if ([resp isKindOfClass:[SendMessageToWXResp class]]) {
-
         SendMessageToWXResp *messageResp = (SendMessageToWXResp *) resp;
-
-
         NSDictionary *result = @{
             description: messageResp.description == nil ? @"" : messageResp.description,
             errStr: messageResp.errStr == nil ? @"" : messageResp.errStr,
@@ -919,13 +849,10 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
             fluwxType: @(messageResp.type),
             country: messageResp.country == nil ? @"" : messageResp.country,
             lang: messageResp.lang == nil ? @"" : messageResp.lang};
-        if(_channel != nil){
+        if (_channel != nil) {
             [_channel invokeMethod:@"onShareResponse" arguments:result];
         }
-
-
     } else if ([resp isKindOfClass:[SendAuthResp class]]) {
-
         SendAuthResp *authResp = (SendAuthResp *) resp;
         NSDictionary *result = @{
             description: authResp.description == nil ? @"" : authResp.description,
@@ -939,39 +866,30 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
             
         };
         
-        if(_channel != nil){
+        if (_channel != nil) {
             [_channel invokeMethod:@"onAuthResponse" arguments:result];
         }
-
     } else if ([resp isKindOfClass:[AddCardToWXCardPackageResp class]]) {
-
+        // pass
     } else if ([resp isKindOfClass:[WXChooseCardResp class]]) {
-
+        // pass
     } else if ([resp isKindOfClass:[WXChooseInvoiceResp class]]) {
         //TODO 处理发票返回，并回调Dart
         
         WXChooseInvoiceResp *chooseInvoiceResp = (WXChooseInvoiceResp *) resp;
-
-
         NSArray *array =  chooseInvoiceResp.cardAry;
-
         NSMutableArray *mutableArray = [NSMutableArray arrayWithCapacity:array.count];
-
-
         for (int i = 0; i< array.count; i++) {
             WXInvoiceItem *item =  array[i];
-
-
             NSDictionary *dict = @{@"app_id":item.appID, @"encrypt_code":item.encryptCode, @"card_id":item.cardId};
             [mutableArray addObject:dict];
         }
         
         NSError *error = nil;
-
-        NSData *jsonData = [NSJSONSerialization dataWithJSONObject:mutableArray options:NSJSONWritingPrettyPrinted error: &error];
-
+        NSData *jsonData = [NSJSONSerialization dataWithJSONObject:mutableArray
+                                                           options:NSJSONWritingPrettyPrinted
+                                                             error: &error];
         NSString *cardItemList = @"";
-
         if ([jsonData length] && error == nil) {
             cardItemList = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
         }
@@ -984,46 +902,39 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
             @"cardItemList":cardItemList
         };
         
-        if(_channel != nil){
-
+        if (_channel != nil) {
             [_channel invokeMethod:@"onOpenWechatInvoiceResponse" arguments:result];
-
         }
     } else if ([resp isKindOfClass:[WXSubscribeMsgResp class]]) {
-
         WXSubscribeMsgResp *subscribeMsgResp = (WXSubscribeMsgResp *) resp;
         NSMutableDictionary *result = [NSMutableDictionary dictionary];
         NSString *openid = subscribeMsgResp.openId;
-        if(openid != nil && openid != NULL && ![openid isKindOfClass:[NSNull class]]){
+        if (openid != nil && openid != NULL && ![openid isKindOfClass:[NSNull class]]) {
             result[@"openid"] = openid;
         }
         
         NSString *templateId = subscribeMsgResp.templateId;
-        if(templateId != nil && templateId != NULL && ![templateId isKindOfClass:[NSNull class]]){
+        if (templateId != nil && templateId != NULL && ![templateId isKindOfClass:[NSNull class]]) {
             result[@"templateId"] = templateId;
         }
         
         NSString *action = subscribeMsgResp.action;
-        if(action != nil && action != NULL && ![action isKindOfClass:[NSNull class]]){
+        if (action != nil && action != NULL && ![action isKindOfClass:[NSNull class]]) {
             result[@"action"] = action;
         }
         
         NSString *reserved = subscribeMsgResp.action;
-        if(reserved != nil && reserved != NULL && ![reserved isKindOfClass:[NSNull class]]){
+        if (reserved != nil && reserved != NULL && ![reserved isKindOfClass:[NSNull class]]) {
             result[@"reserved"] = reserved;
         }
         
         UInt32 scene = subscribeMsgResp.scene;
         result[@"scene"] = @(scene);
-        if(_channel != nil){
+        if (_channel != nil) {
             [_channel invokeMethod:@"onSubscribeMsgResp" arguments:result];
         }
-
     } else if ([resp isKindOfClass:[WXLaunchMiniProgramResp class]]) {
-
         WXLaunchMiniProgramResp *miniProgramResp = (WXLaunchMiniProgramResp *) resp;
-
-
         NSDictionary *commonResult = @{
             description: miniProgramResp.description == nil ? @"" : miniProgramResp.description,
             errStr: miniProgramResp.errStr == nil ? @"" : miniProgramResp.errStr,
@@ -1035,20 +946,13 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
         if (miniProgramResp.extMsg != nil) {
             result[@"extMsg"] = miniProgramResp.extMsg;
         }
-
-
-//        @"extMsg":miniProgramResp.extMsg == nil?@"":miniProgramResp.extMsg
-
-        if(_channel != nil){
+        if (_channel != nil) {
             [_channel invokeMethod:@"onLaunchMiniProgramResponse" arguments:result];
-
         }
-
     } else if ([resp isKindOfClass:[WXInvoiceAuthInsertResp class]]) {
-
+        // pass
     } else if ([resp isKindOfClass:[WXOpenBusinessWebViewResp class]]) {
         WXOpenBusinessWebViewResp *businessResp = (WXOpenBusinessWebViewResp *) resp;
-
         NSDictionary *result = @{
             description: [FluwxStringUtil nilToEmpty:businessResp.description],
             errStr: [FluwxStringUtil nilToEmpty:resp.errStr],
@@ -1057,13 +961,10 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
             @"resultInfo": [FluwxStringUtil nilToEmpty:businessResp.result],
             @"businessType": @(businessResp.businessType),
         };
-        if(_channel != nil){
+        if (_channel != nil) {
             [_channel invokeMethod:@"onWXOpenBusinessWebviewResponse" arguments:result];
         }
-
-    } else if ([resp isKindOfClass:[WXOpenCustomerServiceResp class]])
-    {
-
+    } else if ([resp isKindOfClass:[WXOpenCustomerServiceResp class]]) {
         WXOpenCustomerServiceResp *customerResp = (WXOpenCustomerServiceResp *) resp;
         NSDictionary *result = @{
             description: [FluwxStringUtil nilToEmpty:customerResp.description],
@@ -1072,14 +973,11 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
             fluwxType: @(customerResp.type),
             @"extMsg":[FluwxStringUtil nilToEmpty:customerResp.extMsg]
         };
-        if(_channel != nil){
+        if (_channel != nil) {
             [_channel invokeMethod:@"onWXOpenBusinessWebviewResponse" arguments:result];
         }
-
         // 相关错误信息
-    }else if ([resp isKindOfClass:[WXOpenBusinessViewResp class]])
-    {
-
+    } else if ([resp isKindOfClass:[WXOpenBusinessViewResp class]]) {
         WXOpenBusinessViewResp *openBusinessViewResp = (WXOpenBusinessViewResp *) resp;
         NSDictionary *result = @{
             description: [FluwxStringUtil nilToEmpty:openBusinessViewResp.description],
@@ -1089,19 +987,16 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
             fluwxType: @(openBusinessViewResp.type),
             @"extMsg":[FluwxStringUtil nilToEmpty:openBusinessViewResp.extMsg]
         };
-        if(_channel != nil){
+        if (_channel != nil) {
             [_channel invokeMethod:@"onOpenBusinessViewResponse" arguments:result];
         }
-
         // 相关错误信息
     }
 #ifndef NO_PAY
     else if ([resp isKindOfClass:[WXPayInsuranceResp class]]) {
-
+        // pass
     } else if ([resp isKindOfClass:[PayResp class]]) {
-
         PayResp *payResp = (PayResp *) resp;
-
         NSDictionary *result = @{
             description: [FluwxStringUtil nilToEmpty:payResp.description],
             errStr: [FluwxStringUtil nilToEmpty:resp.errStr],
@@ -1111,18 +1006,18 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
             @"returnKey": [FluwxStringUtil nilToEmpty:payResp.returnKey],
         };
         [FluwxDelegate defaultManager].extData = nil;
-        if(_channel != nil){
+        if (_channel != nil) {
             [_channel invokeMethod:@"onPayResponse" arguments:result];
         }
     } else if ([resp isKindOfClass:[WXNontaxPayResp class]]) {
-
+        // pass
     }
 #endif
 }
 
 - (void)onReq:(BaseReq *)req {
     if ([req isKindOfClass:[GetMessageFromWXReq class]]) {
-
+        // pass
     } else if ([req isKindOfClass:[ShowMessageFromWXReq class]]) {
         // ShowMessageFromWXReq -- android spec
         ShowMessageFromWXReq *showMessageFromWXReq = (ShowMessageFromWXReq *) req;
@@ -1135,7 +1030,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
         [result setValue:showMessageFromWXReq.country forKey:@"country"];
         
         // Cache extMsg for later use (by calling 'getExtMsg')
-        [FluwxDelegate defaultManager].extMsg= wmm.messageExt;
+        [FluwxDelegate defaultManager].extMsg = wmm.messageExt;
         
         if (_isRunning) {
             [_channel invokeMethod:@"onWXShowMessageFromWX" arguments:result];
@@ -1146,7 +1041,6 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
                 [strongSelf->_channel invokeMethod:@"onWXShowMessageFromWX" arguments:result];
             };
         }
-
     } else if ([req isKindOfClass:[LaunchFromWXReq class]]) {
         // ShowMessageFromWXReq -- ios spec
         LaunchFromWXReq *launchFromWXReq = (LaunchFromWXReq *) req;
@@ -1159,7 +1053,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
         [result setValue:launchFromWXReq.country forKey:@"country"];
         
         // Cache extMsg for later use (by calling 'getExtMsg')
-        [FluwxDelegate defaultManager].extMsg= wmm.messageExt;
+        [FluwxDelegate defaultManager].extMsg = wmm.messageExt;
         
         if (_isRunning) {
             [_channel invokeMethod:@"onWXLaunchFromWX" arguments:result];
@@ -1171,19 +1065,16 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
             };
         }
     }
-
 }
 
 - (void)sendText:(NSString *)text
          InScene:(enum WXScene)scene
       completion:(void (^ __nullable)(BOOL success))completion {
-
     SendMessageToWXReq *req = [[SendMessageToWXReq alloc] init];
     req.scene = scene;
     req.bText = YES;
     req.text = text;
-      [WXApi sendReq:req
-          completion:completion];
+    [WXApi sendReq:req completion:completion];
 }
 
 - (void)sendImageData:(NSData *)imageData
@@ -1226,7 +1117,6 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
             TagName:(NSString *)tagName
               Title:(NSString *)title
         Description:(NSString *)description
-         ThumbImage:(UIImage *)thumbImage
          MessageExt:(NSString *)messageExt
       MessageAction:(NSString *)messageAction
             InScene:(enum WXScene)scene
@@ -1261,7 +1151,6 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
  MusicLowBandDataUrl:(NSString *)musicLowBandDataUrl
                Title:(NSString *)title
          Description:(NSString *)description
-          ThumbImage:(UIImage *)thumbImage
           MessageExt:(NSString *)messageExt
        MessageAction:(NSString *)messageAction
              TagName:(NSString *)tagName
@@ -1304,7 +1193,6 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
      VideoLowBandUrl:(NSString *)videoLowBandUrl
                Title:(NSString *)title
          Description:(NSString *)description
-          ThumbImage:(UIImage *)thumbImage
           MessageExt:(NSString *)messageExt
        MessageAction:(NSString *)messageAction
              TagName:(NSString *)tagName
@@ -1319,7 +1207,8 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
     message.messageExt = (messageExt == (id) [NSNull null]) ? nil : messageExt;
     message.messageAction = (messageAction == (id) [NSNull null]) ? nil : messageAction;
     message.mediaTagName = (tagName == (id) [NSNull null]) ? nil : tagName;
-    [message setThumbImage:thumbImage];
+    message.thumbData = (thumbData == (id) [NSNull null]) ? nil : thumbData;
+    message.thumbDataHash = (thumbDataHash == (id) [NSNull null]) ? nil : thumbDataHash;
     
     WXVideoObject *ext = [WXVideoObject object];
     if ([FluwxStringUtil isBlank:videoURL]) {
@@ -1329,26 +1218,22 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
     }
     message.mediaObject = ext;
     
-    SendMessageToWXReq *req = [self requestWithText:nil
-                                                   OrMediaMessage:message
-                                                            bText:NO
-                                                          InScene:scene];
+    SendMessageToWXReq *req = [self requestWithText:nil OrMediaMessage:message bText:NO InScene:scene];
     [WXApi sendReq:req completion:completion];
 }
 
 - (void)sendEmotionData:(NSData *)emotionData
-             ThumbImage:(UIImage *)thumbImage
                 InScene:(enum WXScene)scene
            MsgSignature:(NSString *)msgSignature
               ThumbData:(NSData *)thumbData
           ThumbDataHash:(NSString*)thumbDataHash
              completion:(void (^ __nullable)(BOOL success))completion {
     WXMediaMessage *message = [WXMediaMessage message];
-    [message setThumbImage:thumbImage];
+    message.thumbData = (thumbData == (id) [NSNull null]) ? nil : thumbData;
+    message.thumbDataHash = (thumbDataHash == (id) [NSNull null]) ? nil : thumbDataHash;
     
     WXEmoticonObject *ext = [WXEmoticonObject object];
     ext.emoticonData = emotionData;
-
     message.mediaObject = ext;
     
     NSString *signature = (msgSignature == (id) [NSNull null]) ? nil : msgSignature;
@@ -1356,10 +1241,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
         message.msgSignature = signature;
     }
     
-    SendMessageToWXReq *req = [self requestWithText:nil
-                                                   OrMediaMessage:message
-                                                            bText:NO
-                                                          InScene:scene];
+    SendMessageToWXReq *req = [self requestWithText:nil OrMediaMessage:message bText:NO InScene:scene];
     [WXApi sendReq:req completion:completion];
 }
 
@@ -1367,7 +1249,6 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
        fileExtension:(NSString *)extension
                Title:(NSString *)title
          Description:(NSString *)description
-          ThumbImage:(UIImage *)thumbImage
              InScene:(enum WXScene)scene
         MsgSignature:(NSString *)msgSignature
            ThumbData:(NSData *)thumbData
@@ -1376,12 +1257,12 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
     WXMediaMessage *message = [WXMediaMessage message];
     message.title = title;
     message.description = description;
-    [message setThumbImage:thumbImage];
+    message.thumbData = (thumbData == (id) [NSNull null]) ? nil : thumbData;
+    message.thumbDataHash = (thumbDataHash == (id) [NSNull null]) ? nil : thumbDataHash;
     
     WXFileObject *ext = [WXFileObject object];
     ext.fileExtension = extension;
     ext.fileData = fileData;
-
     message.mediaObject = ext;
     
     NSString *signature = (msgSignature == (id) [NSNull null]) ? nil : msgSignature;
@@ -1389,10 +1270,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
         message.msgSignature = signature;
     }
     
-    SendMessageToWXReq *req = [self requestWithText:nil
-                                                   OrMediaMessage:message
-                                                            bText:NO
-                                                          InScene:scene];
+    SendMessageToWXReq *req = [self requestWithText:nil OrMediaMessage:message bText:NO InScene:scene];
     [WXApi sendReq:req completion:completion];
 }
 
@@ -1416,11 +1294,8 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
     ext.webpageUrl = (webpageUrl == (id) [NSNull null]) ? nil : webpageUrl;
     ext.userName = (userName == (id) [NSNull null]) ? nil : userName;
     ext.path = (path == (id) [NSNull null]) ? nil : path;
-    
     ext.withShareTicket = withShareTicket;
-    
     ext.hdImageData = hdImageData;
-
     ext.miniProgramType = programType;
     
     WXMediaMessage *message = [self messageWithTitle:(title == (id) [NSNull null]) ? nil : title
@@ -1430,16 +1305,11 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
                                        MessageAction:(messageAction == (id) [NSNull null]) ? nil : messageAction
                                             MediaTag:(tagName == (id) [NSNull null]) ? nil : tagName
                                         MsgSignature:(msgSignature == (id) [NSNull null]) ? nil : msgSignature
-                                           ThumbData: thumbData
+                                           ThumbData:(thumbData == (id) [NSNull null] ? nil : thumbData)
                                        ThumbDataHash:(thumbDataHash == (id) [NSNull null]) ? nil : thumbDataHash
-
     ];
     
-    SendMessageToWXReq *req = [self requestWithText:nil
-                                                   OrMediaMessage:message
-                                                            bText:NO
-                                                          InScene:scene];
-
+    SendMessageToWXReq *req = [self requestWithText:nil OrMediaMessage:message bText:NO InScene:scene];
     [WXApi sendReq:req completion:completion];
 }
 
@@ -1450,7 +1320,6 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
                Description:(NSString *)description
                 MessageExt:(NSString *)messageExt
              MessageAction:(NSString *)action
-                ThumbImage:(UIImage *)thumbImage
                    InScene:(enum WXScene)scene
               MsgSignature:(NSString *)msgSignature
                  ThumbData:(NSData *)thumbData
@@ -1468,19 +1337,16 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
                                        MessageAction:action
                                             MediaTag:nil
                                         MsgSignature:(msgSignature == (id) [NSNull null]) ? nil : msgSignature
-                                           ThumbData: thumbData
+                                           ThumbData:(thumbData == (id) [NSNull null]) ? nil : thumbData
                                        ThumbDataHash:(thumbDataHash == (id) [NSNull null]) ? nil : thumbDataHash
     ];
     
-    SendMessageToWXReq *req = [self requestWithText:nil
-                                                   OrMediaMessage:message
-                                                            bText:NO
-                                                          InScene:scene];
+    SendMessageToWXReq *req = [self requestWithText:nil OrMediaMessage:message bText:NO InScene:scene];
     [WXApi sendReq:req completion:completion];
-
 }
 
-- (void)addCardsToCardPackage:(NSArray *)cardIds cardExts:(NSArray *)cardExts
+- (void)addCardsToCardPackage:(NSArray *)cardIds
+                     cardExts:(NSArray *)cardExts
                    completion:(void (^ __nullable)(BOOL success))completion {
     NSMutableArray *cardItems = [NSMutableArray array];
     for (NSString *cardId in cardIds) {
@@ -1514,10 +1380,8 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
     chooseCardReq.signType = signType;
     chooseCardReq.timeStamp = timestamp;
     [WXApi sendReq:chooseCardReq completion:completion];
-
 }
 
-
 - (void)sendAuthRequestScope:(NSString *)scope
                        State:(NSString *)state
                       OpenID:(NSString *)openID
@@ -1528,7 +1392,6 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
     req.state = state;
     req.openID = openID;
     
-
     return [WXApi sendAuthReq:req
                viewController:viewController
                      delegate:self
@@ -1570,9 +1433,9 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
     chooseInvoiceReq.cardSign = cardSign;
     chooseInvoiceReq.nonceStr = nonceStr;
     chooseInvoiceReq.signType = signType;
-//    chooseCardReq.cardType = @"INVOICE";
+    //    chooseCardReq.cardType = @"INVOICE";
     chooseInvoiceReq.timeStamp = timestamp;
-//    chooseCardReq.canMultiSelect = 1;
+    //    chooseCardReq.canMultiSelect = 1;
     [WXApi sendReq:chooseInvoiceReq completion:completion];
 }
 
@@ -1624,17 +1487,17 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
 }
 
 - (void)onQrcodeScanned {
-    if(_channel != nil){
+    if (_channel != nil) {
         [_channel invokeMethod:@"onQRCodeScanned" arguments:@{@"errCode": @0}];
     }
 }
 
 - (void)onAuthGotQrcode:(UIImage *)image {
     NSData *imageData = UIImagePNGRepresentation(image);
-//    if (imageData == nil) {
-//        imageData = UIImageJPEGRepresentation(image, 1);
-//    }
-  if(_channel != nil){
+    //    if (imageData == nil) {
+    //        imageData = UIImageJPEGRepresentation(image, 1);
+    //    }
+    if (_channel != nil) {
         [_channel invokeMethod:@"onAuthGotQRCode" arguments:@{@"errCode": @0, @"qrCode": imageData}];
     }
 }
@@ -1645,7 +1508,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
     if (authCode != nil) {
         result[@"authCode"] = authCode;
     }
-    if(_channel != nil){
+    if (_channel != nil) {
         [_channel invokeMethod:@"onAuthByQRCodeFinished" arguments:result];
     }
 }
@@ -1658,8 +1521,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
                             MediaTag:(NSString *)tagName
                         MsgSignature:(NSString *)msgSignature
                            ThumbData:(NSData *)thumbData
-                       ThumbDataHash:(NSString*)thumbDataHash
-{
+                       ThumbDataHash:(NSString*)thumbDataHash {
     WXMediaMessage *message = [WXMediaMessage message];
     message.title = title;
     message.description = description;
@@ -1669,7 +1531,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
     message.mediaTagName = tagName;
     message.thumbData = thumbData;
     message.thumbDataHash = thumbDataHash;
-    if(msgSignature != nil ){
+    if (msgSignature != nil) {
         message.msgSignature = msgSignature;
     }
     return message;
@@ -1682,21 +1544,23 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
     SendMessageToWXReq *req = [[SendMessageToWXReq alloc] init];
     req.bText = bText;
     req.scene = scene;
-    if (bText)
+    if (bText) {
         req.text = text;
-    else
+    } else {
         req.message = message;
+    }
     return req;
 }
 
--(NSString*)fetchWeChatAppId{
-    NSDictionary *infoDic = [[NSBundle mainBundle] infoDictionary];
-    NSArray* types = infoDic[@"CFBundleURLTypes"];
-    for(NSDictionary* dic in types){
-        if([@"weixin" isEqualToString:dic[@"CFBundleURLName"]]){
-            return dic[@"CFBundleURLSchemes"][0];
+- (NSString*)fetchWeChatAppId {
+    NSDictionary *infoDict = [[NSBundle mainBundle] infoDictionary];
+    NSArray *types = infoDict[@"CFBundleURLTypes"];
+    for (NSDictionary *dict in types) {
+        if ([@"weixin" isEqualToString:dict[@"CFBundleURLName"]]) {
+            return dict[@"CFBundleURLSchemes"][0];
         }
     }
     return nil;
 }
+
 @end

ios/Classes/FluwxStringUtil.m

@@ -8,24 +8,17 @@
 @implementation FluwxStringUtil
 
 + (BOOL)isBlank:(NSString *)string {
-
     if (string == nil) {
-
         return YES;
-
     }
-
-
     if ([string isKindOfClass:[NSNull class]]) {
-
         return YES;
-
     }
     return [[string stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] length] == 0;
-
 }
 
 + (NSString *)nilToEmpty:(NSString *)string {
     return string == nil ? @"" : string;
 }
+
 @end

ios/Classes/ThumbnailHelper.h

@@ -6,11 +6,12 @@
 
 
 @interface ThumbnailHelper : NSObject
-+ (UIImage *)compressImage:(UIImage *)image toByte:(NSUInteger)maxLength isPNG:(BOOL)isPNG;
 
++ (UIImage *)compressImage:(UIImage *)image toByte:(NSUInteger)maxLength isPNG:(BOOL)isPNG;
 
 /// NSData 压缩后转NSData
 /// @param imageData 来源data
 /// @param maxLength 压缩目标值，压缩结果在maxLength的0.9~1之间
 + (NSData *)compressImageData:(NSData *)imageData toByte:(NSUInteger)maxLength;
+
 @end

ios/Classes/ThumbnailHelper.m

@@ -11,7 +11,7 @@
     // Compress by quality
     CGFloat compression = 1;
     NSData *data = imageData;
-    NSLog(@"压缩前 %lu  %lu  ",(unsigned long)data.length,maxLength);
+    NSLog(@"压缩前 %lu %lu", (unsigned long)data.length,maxLength);
     if (data.length < maxLength) return data;
     
     UIImage *image = [UIImage imageWithData:imageData];
@@ -29,7 +29,7 @@
         }
     }
     
-    NSLog(@"压缩第一次 %lu  %lu  ",(unsigned long)data.length,maxLength);
+    NSLog(@"压缩第一次 %lu %lu", (unsigned long)data.length,maxLength);
     if (data.length < maxLength) return data;
     
     UIImage *resultImage;
@@ -50,7 +50,7 @@
         data = UIImageJPEGRepresentation(resultImage, compression);
     }
     
-    NSLog(@"压缩第二次%lu  %lu  ",(unsigned long)data.length,maxLength);
+    NSLog(@"压缩第二次 %lu %lu", (unsigned long)data.length,maxLength);
     return data;
 }
 
@@ -130,4 +130,5 @@
     UIGraphicsEndImageContext();
     return newImage;
 }
+
 @end

ios/Classes/public/FluwxDelegate.h

@@ -15,4 +15,5 @@
 + (instancetype)defaultManager;
 
 - (void)registerWxAPI:(NSString *)appId universalLink:(NSString *)universalLink;
+
 @end