kylefang/react-native-wechat
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native-wechat.git synced 2026-04-28 12:24:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

ios: remove deprecated method loadImageWithTag

Browse Source 
Fixes: https://github.com/weflex/react-native-wechat/issues/81
This commit is contained in:
yorkie
2016-07-20 18:41:53 +08:00
parent 3acd9a4528
commit 8ee1b9e34c
6 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Example/ios/Example.xcodeproj/project.pbxproj
View File

@@ -545,7 +545,7 @@
DEAD_CODE_STRIPPING = NO;
HEADER_SEARCH_PATHS = (
"$(inherited)",
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(SRCROOT)/../node_modules/react-native/React/**",
);
INFOPLIST_FILE = Example/Info.plist;
@@ -565,7 +565,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
HEADER_SEARCH_PATHS = (
"$(inherited)",
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(SRCROOT)/../node_modules/react-native/React/**",
);
INFOPLIST_FILE = Example/Info.plist;

BIN
Example/ios/Example.xcodeproj/project.xcworkspace/xcuserdata/yorkieliu.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

5
Example/ios/Example.xcodeproj/xcuserdata/yorkieliu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
type = "1"
version = "2.0">
</Bucket>

1
ios/RCTWeChat.h
View File

@@ -12,6 +12,7 @@
// define share type constants
#define RCTWXShareTypeNews @"news"
#define RCTWXShareTypeThumbImageUrl @"thumbImage"
#define RCTWXShareTypeImageUrl @"imageUrl"
#define RCTWXShareTypeImageFile @"imageFile"
#define RCTWXShareTypeImageResource @"imageResource"

29
ios/RCTWeChat.m
View File

@@ -8,9 +8,9 @@
#import "RCTWeChat.h"
#import "WXApiObject.h"
#import "Base/RCTEventDispatcher.h"
#import "Base/RCTBridge.h"
#import "Base/RCTLog.h"
#import "RCTEventDispatcher.h"
#import "RCTBridge.h"
#import "RCTLog.h"
#import "RCTImageLoader.h"
#import "RCTImageUtils.h"
@@ -237,15 +237,14 @@ RCT_EXPORT_METHOD(shareToSession:(NSDictionary *)data
callBack:callback];
} else if ([type isEqualToString:RCTWXShareTypeImageFile] || [type isEqualToString:RCTWXShareTypeImageResource]) {
NSString * imageURL = aData[RCTWXShareImageUrl];
[self.bridge.imageLoader loadImageWithTag:imageURL callback:^(NSError *error, UIImage *image) {
NSURLRequest *imageRequest = [NSURLRequest requestWithURL:aData[RCTWXShareImageUrl]];
[self.bridge.imageLoader loadImageWithURLRequest:imageRequest callback:^(NSError *error, UIImage *image) {
if (image == nil){
callback(@[@"fail to load image resource"]);
} else {
WXImageObject *imageObject = [WXImageObject object];
imageObject.imageData = RCTGetImageData([image CGImage], 1.0F);
imageObject.imageData = UIImagePNGRepresentation(image);
[self shareToWeixinWithMediaMessage:aScene
Title:title
Description:description
@@ -255,10 +254,9 @@ RCT_EXPORT_METHOD(shareToSession:(NSDictionary *)data
ThumbImage:aThumbImage
MediaTag:mediaTagName
callBack:callback];
}
}];
} else if ([type isEqualToString:RCTWXShareTypeFile]) {
NSString * filePath = aData[@"filePath"];
NSString * fileExtension = aData[@"fileExtension"];
@@ -286,13 +284,12 @@ RCT_EXPORT_METHOD(shareToSession:(NSDictionary *)data
- (void)shareToWeixinWithData:(NSDictionary *)aData scene:(int)aScene callback:(RCTResponseSenderBlock)aCallBack
{
NSString *imageUrl = aData[@"thumbImage"];
NSString *imageUrl = aData[RCTWXShareTypeThumbImageUrl];
if (imageUrl.length && _bridge.imageLoader) {
[_bridge.imageLoader loadImageWithTag:imageUrl size:CGSizeMake(100, 100) scale:1 resizeMode:RCTResizeModeStretch progressBlock:nil completionBlock:
^(NSError *error, UIImage *image) {
[self shareToWeixinWithData:aData thumbImage:image scene:aScene callBack:aCallBack];
}
];
NSURLRequest *imageRequest = [NSURLRequest requestWithURL:aData[RCTWXShareTypeThumbImageUrl]];
[_bridge.imageLoader loadImageWithURLRequest:imageRequest size:CGSizeMake(100, 100) scale:1 clipped:FALSE resizeMode:RCTResizeModeStretch progressBlock:nil completionBlock:^(NSError *error, UIImage *image) {
[self shareToWeixinWithData:aData thumbImage:image scene:aScene callBack:aCallBack];
}];
} else {
[self shareToWeixinWithData:aData thumbImage:nil scene:aScene callBack:aCallBack];
}

8
ios/RCTWeChat.xcodeproj/project.pbxproj
View File

@@ -219,8 +219,8 @@
buildSettings = {
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../../react-native/React/**",
"$(SRCROOT)/../../react-native/Libraries/Image/**",
"$(SRCROOT)/../node_modules/react-native/React/**",
"$(SRCROOT)/../node_modules/react-native/Libraries/Image/**",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
@@ -237,8 +237,8 @@
buildSettings = {
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../../react-native/React/**",
"$(SRCROOT)/../../react-native/Libraries/Image/**",
"$(SRCROOT)/../node_modules/react-native/React/**",
"$(SRCROOT)/../node_modules/react-native/Libraries/Image/**",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",