Skip to content

C
clx-fluwx
提交 68da2af5 authored 作者: JarvanMo's avatar JarvanMo
浏览文件
操作

fix:NSNull exception

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