提交 68da2af5 authored 作者: JarvanMo's avatar JarvanMo

fix:NSNull exception

上级 50c750a8
......@@ -183,6 +183,11 @@
97C146ED1CF9000F007C117D = {
CreatedOnToolsVersion = 7.3.1;
DevelopmentTeam = 8JJXUFV6F7;
SystemCapabilities = {
com.apple.BackgroundModes = {
enabled = 1;
};
};
};
};
};
......
......@@ -46,6 +46,10 @@
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>UIBackgroundModes</key>
<array>
<string>remote-notification</string>
</array>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
......
......@@ -102,10 +102,13 @@ NSObject <FlutterPluginRegistrar> *_registrar;
NSString *scene = call.arguments[fluwxKeyScene];
BOOL done = [WXApiRequestHandler sendImageData:imageData
TagName:call.arguments[fluwxKeyMediaTagName]
MessageExt:fluwxKeyMessageExt
Action:fluwxKeyMessageAction
MessageExt:call.arguments[fluwxKeyMessageExt]
Action:call.arguments[fluwxKeyMessageAction]
ThumbImage:thumbnailImage
InScene:[StringToWeChatScene toScene:scene]];
InScene:[StringToWeChatScene toScene:scene]
title:call.arguments[fluwxKeyTitle]
description:call.arguments[fluwxKeyDescription]
];
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)});
});
......@@ -135,12 +138,20 @@ NSObject <FlutterPluginRegistrar> *_registrar;
dispatch_async(dispatch_get_main_queue(), ^{
NSString *scene = call.arguments[fluwxKeyScene];
// BOOL done = [WXApiRequestHandler sendImageData:imageData
// TagName:call.arguments[fluwxKeyMediaTagName]
// MessageExt:fluwxKeyMessageExt
// Action:fluwxKeyMessageAction
// ThumbImage:thumbnailImage
// InScene:[StringToWeChatScene toScene:scene]];
BOOL done = [WXApiRequestHandler sendImageData:imageData
TagName:call.arguments[fluwxKeyMediaTagName]
MessageExt:fluwxKeyMessageExt
Action:fluwxKeyMessageAction
MessageExt:call.arguments[fluwxKeyMessageExt]
Action:call.arguments[fluwxKeyMessageAction]
ThumbImage:thumbnailImage
InScene:[StringToWeChatScene toScene:scene]];
InScene:[StringToWeChatScene toScene:scene]
title:call.arguments[fluwxKeyTitle]
description:call.arguments[fluwxKeyDescription]];
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)});
});
......@@ -152,7 +163,7 @@ NSObject <FlutterPluginRegistrar> *_registrar;
- (void)shareWebPage:(FlutterMethodCall *)call result:(FlutterResult)result {
dispatch_queue_t globalQueue = dispatch_get_global_queue(1, 1);
dispatch_queue_t globalQueue = dispatch_get_global_queue(0, 0);
dispatch_async(globalQueue, ^{
NSString *thumbnail = call.arguments[fluwxKeyThumbnail];
......@@ -327,7 +338,7 @@ NSObject <FlutterPluginRegistrar> *_registrar;
- (NSString *)readImageFromAssets:(NSString *)imagePath {
NSArray *array = [self formatAssets:imagePath];
NSString *key;
if (array[1] == nil) {
if ([StringUtil isBlank:array[1]]) {
key = [_registrar lookupKeyForAsset:array[0]];
} else {
key = [_registrar lookupKeyForAsset:array[0] fromPackage:array[1]];
......@@ -340,7 +351,7 @@ NSObject <FlutterPluginRegistrar> *_registrar;
- (NSArray *)formatAssets:(NSString *)originPath {
NSString *path = nil;
NSString *packageName = nil;
NSString *packageName = @"";
int from = [SCHEMA_ASSETS length];
int to = [originPath length];
NSString *pathWithoutSchema = [originPath substringFromIndex:from toIndex:to];
......
......@@ -20,7 +20,9 @@
MessageExt:(NSString *)messageExt
Action:(NSString *)action
ThumbImage:(UIImage *)thumbImage
InScene:(enum WXScene)scene;
InScene:(enum WXScene)scene
title:(NSString *)title
description:(NSString *)description;
+ (BOOL)sendLinkURL:(NSString *)urlString
TagName:(NSString *)tagName
......
......@@ -6,6 +6,7 @@
//
//
#import <Foundation/Foundation.h>
#import "WXApi.h"
#import "WXApiRequestHandler.h"
#import "WXApiManager.h"
......@@ -36,13 +37,15 @@
WXImageObject *ext = [WXImageObject object];
ext.imageData = imageData;
WXMediaMessage *message = [WXMediaMessage messageWithTitle:title
Description:description
WXMediaMessage *message = [WXMediaMessage messageWithTitle:(title == (id) [NSNull null]) ?nil:title
Description:(description == (id) [NSNull null]) ?nil:description
Object:ext
MessageExt:messageExt
MessageAction:action
MessageExt:(messageExt == (id) [NSNull null]) ? nil:messageExt
MessageAction:(action == (id) [NSNull null])?nil:action
ThumbImage:thumbImage
MediaTag:tagName];
MediaTag:(tagName == (id) [NSNull null])? nil:tagName];
SendMessageToWXReq *req = [SendMessageToWXReq requestWithText:nil
OrMediaMessage:message
......@@ -63,13 +66,13 @@
WXWebpageObject *ext = [WXWebpageObject object];
ext.webpageUrl = urlString;
WXMediaMessage *message = [WXMediaMessage messageWithTitle:title
Description:description
WXMediaMessage *message = [WXMediaMessage messageWithTitle:(title == (id) [NSNull null]) ?nil:title
Description:(description == (id) [NSNull null]) ?nil:description
Object:ext
MessageExt:messageExt
MessageAction:messageAction
MessageExt:(messageExt == (id) [NSNull null]) ?nil:messageExt
MessageAction:(messageAction == (id) [NSNull null]) ?nil:messageAction
ThumbImage:thumbImage
MediaTag:tagName];
MediaTag:(tagName == (id) [NSNull null]) ?nil:tagName];
SendMessageToWXReq *req = [SendMessageToWXReq requestWithText:nil
OrMediaMessage:message
......@@ -100,13 +103,13 @@
}
WXMediaMessage *message = [WXMediaMessage messageWithTitle:title
WXMediaMessage *message = [WXMediaMessage messageWithTitle:(title == (id) [NSNull null]) ?nil:title
Description:description
Object:ext
MessageExt:messageExt
MessageAction:messageAction
MessageExt:(messageExt == (id) [NSNull null]) ?nil:messageExt
MessageAction:(messageAction == (id) [NSNull null]) ?nil:messageAction
ThumbImage:thumbImage
MediaTag:tagName];
MediaTag:(tagName == (id) [NSNull null]) ?nil:tagName];
SendMessageToWXReq *req = [SendMessageToWXReq requestWithText:nil
OrMediaMessage:message
......@@ -126,11 +129,11 @@
TagName:(NSString *)tagName
InScene:(enum WXScene)scene {
WXMediaMessage *message = [WXMediaMessage message];
message.title = title;
message.description = description;
message.messageExt = messageExt;
message.messageAction = messageAction;
message.mediaTagName = tagName;
message.title = (title == (id) [NSNull null]) ?nil:title;
message.description = (description == (id) [NSNull null]) ?nil:description;
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];
WXVideoObject *ext = [WXVideoObject object];
......@@ -211,13 +214,13 @@
ext.withShareTicket = withShareTicket;
ext.miniProgramType = programType;
WXMediaMessage *message = [WXMediaMessage messageWithTitle:title
Description:description
WXMediaMessage *message = [WXMediaMessage messageWithTitle:(title == (id) [NSNull null]) ?nil:title
Description:(description == (id) [NSNull null]) ?nil:description
Object:ext
MessageExt:messageExt
MessageAction:messageAction
MessageExt:(messageExt == (id) [NSNull null]) ?nil:messageExt
MessageAction:(messageAction == (id) [NSNull null]) ?nil:messageAction
ThumbImage:thumbImage
MediaTag:tagName];
MediaTag:(tagName == (id) [NSNull null]) ?nil:tagName];
SendMessageToWXReq *req = [SendMessageToWXReq requestWithText:nil
OrMediaMessage:message
......
......@@ -198,7 +198,6 @@ class WeChatShareMusicModel extends WeChatShareModel {
}) : this.transaction = transaction ?? "text",
this.thumbnail = thumbnail ?? "",
assert(musicUrl != null || musicLowBandUrl != null),
assert(thumbnail != null),
super(
mediaTagName: mediaTagName,
messageAction: messageAction,
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论