cleanup iOS codebase

c5893b93 · JarvanMo · 40fec9c6 · 40fec9c6 · 40fec9c6 · c5893b93
--- a/ios/Classes/FluwxAuthHandler.h
+++ b/ios/Classes/FluwxAuthHandler.h
-//
-// Created by mo on 2020/3/7.
-//
-
-#import <Foundation/Foundation.h>
-#import <Flutter/Flutter.h>
-#import <fluwx/FluwxPlugin.h>
-#import <fluwx/WXApiRequestHandler.h>
-#import <WechatAuthSDK.h>
-#import <WXApi.h>
-
-@class FluwxStringUtil;
-
-@interface FluwxAuthHandler : NSObject <WechatAuthAPIDelegate>
- (instancetype)initWithRegistrar:(NSObject <FlutterPluginRegistrar> *)registrar methodChannel:(FlutterMethodChannel *)flutterMethodChannel;
-
- (void)handleAuth:(FlutterMethodCall *)call result:(FlutterResult)result;
-
- (void)authByQRCode:(FlutterMethodCall *)call result:(FlutterResult)result;
-
- (void)stopAuthByQRCode:(FlutterMethodCall *)call result:(FlutterResult)result;
-
- (void)handleAuthByPhoneLogin:(FlutterMethodCall*)call result:(FlutterResult)result;
-@end
--- a/ios/Classes/FluwxAuthHandler.m
+++ b/ios/Classes/FluwxAuthHandler.m
-//
-// Created by mo on 2020/3/7.
-//
-
-
-#import <fluwx/FluwxAuthHandler.h>
-
-@implementation FluwxAuthHandler
-
-WechatAuthSDK *_qrauth;
-FlutterMethodChannel *_fluwxMethodChannel = nil;
-
- (instancetype)initWithRegistrar:(NSObject <FlutterPluginRegistrar> *)registrar methodChannel:(FlutterMethodChannel *)flutterMethodChannel {
-    self = [super init];
-    if (self) {
-        _qrauth = [[WechatAuthSDK alloc] init];
-        _qrauth.delegate = self;
-        _fluwxMethodChannel = flutterMethodChannel;
-    }
-
-    return self;
-}
-
- (void)handleAuthByPhoneLogin:(FlutterMethodCall *)call result:(FlutterResult)result {
-    UIViewController *vc = UIApplication.sharedApplication.keyWindow.rootViewController;
-    SendAuthReq *authReq = [[SendAuthReq alloc] init];
-    authReq.scope = call.arguments[@"scope"];
-    authReq.state = (call.arguments[@"state"] == (id) [NSNull null]) ? nil : call.arguments[@"state"];
-    [WXApi sendAuthReq:authReq viewController:vc delegate:self completion:^(BOOL success) {
-        result(@(success));
-    }];
-}
-
- (void)handleAuth:(FlutterMethodCall *)call result:(FlutterResult)result {
-    NSString *openId = call.arguments[@"openId"];
-
-    [WXApiRequestHandler sendAuthRequestScope:call.arguments[@"scope"]
-                                        State:(call.arguments[@"state"] == (id) [NSNull null]) ? nil : call.arguments[@"state"]
-                                       OpenID:(openId == (id) [NSNull null]) ? nil : openId
-                                 NonAutomatic:[call.arguments[@"nonAutomatic"] boolValue]
-                                   completion:^(BOOL done) {
-                                       result(@(done));
-                                   }];
-}
-
- (void)authByQRCode:(FlutterMethodCall *)call result:(FlutterResult)result {
-    NSString *appId = call.arguments[@"appId"];
-    NSString *scope = call.arguments[@"scope"];
-    NSString *nonceStr = call.arguments[@"nonceStr"];
-    NSString *timeStamp = call.arguments[@"timeStamp"];
-    NSString *signature = call.arguments[@"signature"];
-    NSString *schemeData = (call.arguments[@"schemeData"] == (id) [NSNull null]) ? nil : call.arguments[@"schemeData"];
-
-    BOOL done = [_qrauth Auth:appId nonceStr:nonceStr timeStamp:timeStamp scope:scope signature:signature schemeData:schemeData];
-    result(@(done));
-}
-
- (void)stopAuthByQRCode:(FlutterMethodCall *)call result:(FlutterResult)result {
-    BOOL done = [_qrauth StopAuth];
-    result(@(done));
-}
-
- (void)onQrcodeScanned {
-    [_fluwxMethodChannel invokeMethod:@"onQRCodeScanned" arguments:@{@"errCode": @0}];
-}
-
- (void)onAuthGotQrcode:(UIImage *)image {
-    NSData *imageData = UIImagePNGRepresentation(image);
-//    if (imageData == nil) {
-//        imageData = UIImageJPEGRepresentation(image, 1);
-//    }
-
-    [_fluwxMethodChannel invokeMethod:@"onAuthGotQRCode" arguments:@{@"errCode": @0, @"qrCode": imageData}];
-}
-
- (void)onAuthFinish:(int)errCode AuthCode:(nullable NSString *)authCode {
-    NSDictionary *errorCode = @{@"errCode": @(errCode)};
-    NSMutableDictionary *result = [NSMutableDictionary dictionaryWithDictionary:errorCode];
-    if (authCode != nil) {
-        result[@"authCode"] = authCode;
-    }
-    [_fluwxMethodChannel invokeMethod:@"onAuthByQRCodeFinished" arguments:result];
-}
-@end
--- a/ios/Classes/FluwxPlugin.m
+++ b/ios/Classes/FluwxPlugin.m
--- a/ios/Classes/FluwxShareHandler.m
+++ b/ios/Classes/FluwxShareHandler.m
--- a/ios/Classes/SendMessageToWXReq+requestWithTextOrMediaMessage.h
+++ b/ios/Classes/SendMessageToWXReq+requestWithTextOrMediaMessage.h
-//
-//  SendMessageToWXReq+requestWithTextOrMediaMessage.h
-//  SDKSample
-//
-//  Created by Jeason on 15/7/14.
-//
-//
-
-#import <WXApiObject.h>
-
-@interface SendMessageToWXReq (requestWithTextOrMediaMessage)
-
-+ (SendMessageToWXReq *)requestWithText:(NSString *)text
-                         OrMediaMessage:(WXMediaMessage *)message
-                                  bText:(BOOL)bText
-                                InScene:(enum WXScene)scene;
-@end
--- a/ios/Classes/SendMessageToWXReq+requestWithTextOrMediaMessage.m
+++ b/ios/Classes/SendMessageToWXReq+requestWithTextOrMediaMessage.m
-//
-//  SendMessageToWXReq+requestWithTextOrMediaMessage.m
-//  SDKSample
-//
-//  Created by Jeason on 15/7/14.
-//
-//
-
-#import "SendMessageToWXReq+requestWithTextOrMediaMessage.h"
-
-@implementation SendMessageToWXReq (requestWithTextOrMediaMessage)
-
-+ (SendMessageToWXReq *)requestWithText:(NSString *)text
-                         OrMediaMessage:(WXMediaMessage *)message
-                                  bText:(BOOL)bText
-                                InScene:(enum WXScene)scene {
-    SendMessageToWXReq *req = [[SendMessageToWXReq alloc] init];
-    req.bText = bText;
-    req.scene = scene;
-    if (bText)
-        req.text = text;
-    else
-        req.message = message;
-    return req;
-}
-
-@end
--- a/ios/Classes/WXApiRequestHandler.h
+++ b/ios/Classes/WXApiRequestHandler.h
-//
-// Created by mo on 2020/3/7.
-//
-
-
-#import <Foundation/Foundation.h>
-#import <WXApiObject.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface WXApiRequestHandler : NSObject
-
-+ (void)sendText:(NSString *)text
-         InScene:(enum WXScene)scene
-      completion:(void (^ __nullable)(BOOL success))completion;
-
-+ (void)sendImageData:(NSData *)imageData
-              TagName:(NSString *)tagName
-           MessageExt:(NSString *)messageExt
-               Action:(NSString *)action
-           ThumbImage:(UIImage *)thumbImage
-              InScene:(enum WXScene)scene
-                title:(NSString *)title
-          description:(NSString *)description
-         MsgSignature:(NSString *)msgSignature
-           completion:(void (^ __nullable)(BOOL success))completion;
-
-+ (void)sendLinkURL:(NSString *)urlString
-            TagName:(NSString *)tagName
-              Title:(NSString *)title
-        Description:(NSString *)description
-         ThumbImage:(UIImage *)thumbImage
-         MessageExt:(NSString *)messageExt
-      MessageAction:(NSString *)messageAction
-            InScene:(enum WXScene)scene
-       MsgSignature:(NSString *)msgSignature
-         completion:(void (^ __nullable)(BOOL success))completion;
-
-+ (void)sendMusicURL:(NSString *)musicURL
-             dataURL:(NSString *)dataURL
-     MusicLowBandUrl:(NSString *)musicLowBandUrl
- MusicLowBandDataUrl:(NSString *)musicLowBandDataUrl
-               Title:(NSString *)title
-         Description:(NSString *)description
-          ThumbImage:(UIImage *)thumbImage
-          MessageExt:(NSString *)messageExt
-       MessageAction:(NSString *)messageAction
-             TagName:(NSString *)tagName
-             InScene:(enum WXScene)scene
-        MsgSignature:(NSString *)msgSignature
-          completion:(void (^ __nullable)(BOOL success))completion;
-
-+ (void)sendVideoURL:(NSString *)videoURL
-     VideoLowBandUrl:(NSString *)videoLowBandUrl
-               Title:(NSString *)title
-         Description:(NSString *)description
-          ThumbImage:(UIImage *)thumbImage
-          MessageExt:(NSString *)messageExt
-       MessageAction:(NSString *)messageAction
-             TagName:(NSString *)tagName
-             InScene:(enum WXScene)scene
-        MsgSignature:(NSString *)msgSignature
-          completion:(void (^ __nullable)(BOOL success))completion;
-
-+ (void)sendEmotionData:(NSData *)emotionData
-             ThumbImage:(UIImage *)thumbImage
-                InScene:(enum WXScene)scene
-           MsgSignature:(NSString *)msgSignature
-             completion:(void (^ __nullable)(BOOL success))completion;
-
-+ (void)sendFileData:(NSData *)fileData
-       fileExtension:(NSString *)extension
-               Title:(NSString *)title
-         Description:(NSString *)description
-          ThumbImage:(UIImage *)thumbImage
-             InScene:(enum WXScene)scene
-        MsgSignature:(NSString *)msgSignature
-          completion:(void (^ __nullable)(BOOL success))completion;
-
-+ (void)sendMiniProgramWebpageUrl:(NSString *)webpageUrl
-                         userName:(NSString *)userName
-                             path:(NSString *)path
-                            title:(NSString *)title
-                      Description:(NSString *)description
-                       ThumbImage:(UIImage *)thumbImage
-                      hdImageData:(NSData *)hdImageData
-                  withShareTicket:(BOOL)withShareTicket
-                  miniProgramType:(WXMiniProgramType)programType
-                       MessageExt:(NSString *)messageExt
-                    MessageAction:(NSString *)messageAction
-                          TagName:(NSString *)tagName
-                          InScene:(enum WXScene)scene
-                     MsgSignature:(NSString *)msgSignature
-                       completion:(void (^ __nullable)(BOOL success))completion;
-
-+ (void)launchMiniProgramWithUserName:(NSString *)userName
-                                 path:(NSString *)path
-                                 type:(WXMiniProgramType)miniProgramType
-                           completion:(void (^ __nullable)(BOOL success))completion;
-
-+ (void)sendAppContentData:(NSData *)data
-                   ExtInfo:(NSString *)info
-                    ExtURL:(NSString *)url
-                     Title:(NSString *)title
-               Description:(NSString *)description
-                MessageExt:(NSString *)messageExt
-             MessageAction:(NSString *)action
-                ThumbImage:(UIImage *)thumbImage
-                   InScene:(enum WXScene)scene
-              MsgSignature:(NSString *)msgSignature
-                completion:(void (^ __nullable)(BOOL success))completion;
-
-+ (void)addCardsToCardPackage:(NSArray *)cardIds cardExts:(NSArray *)cardExts
-                   completion:(void (^ __nullable)(BOOL success))completion;
-
-+ (void)sendAuthRequestScope:(NSString *)scope
-                       State:(NSString *)state
-                      OpenID:(NSString *)openID
-            InViewController:(UIViewController *)viewController
-                  completion:(void (^ __nullable)(BOOL success))completion;
-
-+ (void)sendAuthRequestScope:(NSString *)scope
-                       State:(NSString *)state
-                      OpenID:(NSString *)openID
-                NonAutomatic:(BOOL)nonAutomatic
-                  completion:(void (^ __nullable)(BOOL success))completion;
-
-
-+ (void)chooseCard:(NSString *)appid
-          cardSign:(NSString *)cardSign
-          nonceStr:(NSString *)nonceStr
-          signType:(NSString *)signType
-         timestamp:(UInt32)timestamp
-        completion:(void (^ __nullable)(BOOL success))completion;
-
-+ (void)chooseInvoice:(NSString *)appid
-            timestamp:(UInt32)timestamp
-           completion:(void (^ __nullable)(BOOL success))completion;
-
-+ (void)openUrl:(NSString *)url
-     completion:(void (^ __nullable)(BOOL success))completion;
-
-
-#ifndef NO_PAY
-+ (void)sendPayment:(NSString *)appId
-          PartnerId:(NSString *)partnerId
-           PrepayId:(NSString *)prepayId
-           NonceStr:(NSString *)nonceStr
-          Timestamp:(UInt32)timestamp
-            Package:(NSString *)package
-               Sign:(NSString *)sign
-         completion:(void (^ __nullable)(BOOL success))completion;
-#endif
-
-+ (void)openCustomerService:(NSString *)url
-                     CorpId:(NSString *)corpId
-                 completion:(void (^ __nullable)(BOOL success))completion;
-@end
-
-NS_ASSUME_NONNULL_END
--- a/ios/Classes/WXApiRequestHandler.m
+++ b/ios/Classes/WXApiRequestHandler.m
--- a/ios/Classes/WXMediaMessage+messageConstruct.h
+++ b/ios/Classes/WXMediaMessage+messageConstruct.h
-//
-//  WXMediaMessage+messageConstruct.h
-//  SDKSample
-//
-//  Created by Jeason on 15/7/14.
-//
-//
-#import <WXApiObject.h>
-
-@interface WXMediaMessage (messageConstruct)
-
-+ (WXMediaMessage *)messageWithTitle:(NSString *)title
-                         Description:(NSString *)description
-                              Object:(id)mediaObject
-                          MessageExt:(NSString *)messageExt
-                       MessageAction:(NSString *)action
-                          ThumbImage:(UIImage *)thumbImage
-                            MediaTag:(NSString *)tagName
-                        MsgSignature:(NSString *)msgSignature;
-@end
--- a/ios/Classes/WXMediaMessage+messageConstruct.m
+++ b/ios/Classes/WXMediaMessage+messageConstruct.m
-//
-//  WXMediaMessage+messageConstruct.m
-//  SDKSample
-//
-//  Created by Jeason on 15/7/14.
-//
-//
-
-#import "WXMediaMessage+messageConstruct.h"
-
-@implementation WXMediaMessage (messageConstruct)
-
-+ (WXMediaMessage *)messageWithTitle:(NSString *)title
-                         Description:(NSString *)description
-                              Object:(id)mediaObject
-                          MessageExt:(NSString *)messageExt
-                       MessageAction:(NSString *)action
-                          ThumbImage:(UIImage *)thumbImage
-                            MediaTag:(NSString *)tagName
-                        MsgSignature:(NSString *)msgSignature {
-    WXMediaMessage *message = [WXMediaMessage message];
-    message.title = title;
-    message.description = description;
-    message.mediaObject = mediaObject;
-    message.messageExt = messageExt;
-    message.messageAction = action;
-    message.mediaTagName = tagName;
-    if(msgSignature != nil ){
-        message.msgSignature = msgSignature;
-    }
-    [message setThumbImage:thumbImage];
-    return message;
-}
-@end
--- a/ios/Classes/public/FluwxShareHandler.h
+++ b/ios/Classes/public/FluwxShareHandler.h
-//
-// Created by mo on 2020/3/7.
-//
-
-#import <Foundation/Foundation.h>
-#import <Flutter/Flutter.h>
-
-@class FluwxStringUtil;
-
-@interface FluwxShareHandler : NSObject
- (instancetype)initWithRegistrar:(NSObject <FlutterPluginRegistrar> *)registrar;
-
- (void)handleShare:(FlutterMethodCall *)call result:(FlutterResult)result;
-@end