Skip to content

Commit 0a29bf9

Browse files
committed
Merge remote-tracking branch 'iVanPan/master'
2 parents fc5bfe8 + 19b9ed6 commit 0a29bf9

File tree

13 files changed

+18
-14
lines changed

13 files changed

+18
-14
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ http.get(url)
266266

267267

268268
## About SDK
269-
This plugin use 3.2.0 version sdk for Android,3.2.1 version sdk for iOS. You can download lastest version sdk [here](http://wiki.open.qq.com/wiki/mobile/SDK%E4%B8%8B%E8%BD%BD)
269+
This plugin use 3.2.1 version sdk for Android,3.2.3 version sdk for iOS. You can download lastest version sdk [here](http://wiki.open.qq.com/wiki/mobile/SDK%E4%B8%8B%E8%BD%BD)
270270

271271
## Contributing
272272
Feel free to contribute
Binary file not shown.

demo/QQFavorite.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import {
55
Alert,
66
Dimensions,
77
Button,
8-
Navigator,
98
CameraRoll,
109
View
1110
} from 'react-native';
11+
import {Navigator} from 'react-native-deprecated-custom-components';
1212
import * as QQ from 'react-native-qqsdk';
1313
import NavigationBar from './navigationBar';
1414
import resolveAssetSource from 'resolveAssetSource';

demo/QQShare.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/QQZoneShare.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import {
55
Alert,
66
Dimensions,
77
Button,
8-
Navigator,
98
CameraRoll,
109
View
1110
} from 'react-native';
11+
import {Navigator} from 'react-native-deprecated-custom-components';
1212
import * as QQ from 'react-native-qqsdk';
1313
import NavigationBar from './navigationBar';
1414
import resolveAssetSource from 'resolveAssetSource';

demo/mainPage.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import {
55
Alert,
66
Dimensions,
77
Button,
8-
Navigator,
98
View
109
} from 'react-native';
10+
import {Navigator} from 'react-native-deprecated-custom-components';
1111
import * as QQ from 'react-native-qqsdk';
1212
import NavigationBar from './navigationBar';
1313
import QQShare from './QQShare';

demo/navigation.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ import React, {
33
PropTypes,
44
} from 'react';
55
import {
6-
Navigator,
76
Platform,
87
BackAndroid,
98
} from 'react-native';
10-
9+
import {Navigator} from 'react-native-deprecated-custom-components';
1110
let _navigator;
1211
export default class Navigation extends Component {
1312
static propTypes = {

ios/RCTQQSDK/RCTQQSDK.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ - (NSDictionary *)constantsToExport {
194194
}
195195

196196
- (void)shareTextToQQZone:(NSString *)text {
197-
QQApiImageArrayForQZoneObject *txtObj = [QQApiImageArrayForQZoneObject objectWithimageDataArray:nil title:text];
197+
QQApiImageArrayForQZoneObject *txtObj = [QQApiImageArrayForQZoneObject objectWithimageDataArray:nil title:text extMap:nil];
198198
SendMessageToQQReq *req = [SendMessageToQQReq reqWithContent:txtObj];
199199
QQApiSendResultCode sent = [QQApiInterface SendReqToQZone:req];
200200
[self handleSendResult:sent];

ios/RCTQQSDK/TencentOpenAPI.framework/Headers/QQApiInterfaceObject.h

+9-4
Original file line numberDiff line numberDiff line change
@@ -195,37 +195,42 @@ __attribute__((visibility("default"))) @interface QQApiURLObject : QQApiObject
195195
@interface QQApiImageArrayForQZoneObject : QQApiObject
196196

197197
@property(nonatomic,retain) NSArray* imageDataArray;///图片数组
198+
@property(nonatomic,retain) NSDictionary* extMap; // 扩展字段
198199

199200
/**
200201
初始化方法
201202
@param imageDataArray 图片数组
202203
@param title 写说说的内容,可以为空
204+
@param extMap 扩展字段
203205
*/
204-
- (id)initWithImageArrayData:(NSArray*)imageDataArray title:(NSString*)title;
206+
- (id)initWithImageArrayData:(NSArray*)imageDataArray title:(NSString*)title extMap:(NSDictionary *)extMap;
205207

206208
/**
207209
helper方法获取一个autorelease的<code>QQApiExtendObject</code>对象
208210
@param title 写说说的内容,可以为空
209211
@param imageDataArray 发送的多张图片队列
212+
@param extMap 扩展字段
210213
@return
211214
一个自动释放的<code>QQApiExtendObject</code>实例
212215
*/
213-
+ (id)objectWithimageDataArray:(NSArray*)imageDataArray title:(NSString*)title;
216+
+ (id)objectWithimageDataArray:(NSArray*)imageDataArray title:(NSString*)title extMap:(NSDictionary *)extMap;
214217

215218
@end
216219

217220
// QQApiVideoForQZoneObject
218221
/** @brief 视频对象
219222
用于分享视频到空间,走写说说路径<code>QQApiObject</code>
220223
assetURL可传ALAsset的ALAssetPropertyAssetURL,或者PHAsset的localIdentifier
224+
@param extMap 扩展字段
221225
*/
222226
@interface QQApiVideoForQZoneObject : QQApiObject
223227

224228
@property(nonatomic, retain) NSString *assetURL;
229+
@property(nonatomic,retain) NSDictionary* extMap; // 扩展字段
225230

226-
- (id)initWithAssetURL:(NSString*)assetURL title:(NSString*)title;
231+
- (id)initWithAssetURL:(NSString*)assetURL title:(NSString*)title extMap:(NSDictionary *)extMap;
227232

228-
+ (id)objectWithAssetURL:(NSString*)assetURL title:(NSString*)title;
233+
+ (id)objectWithAssetURL:(NSString*)assetURL title:(NSString*)title extMap:(NSDictionary *)extMap;
229234

230235
@end
231236

Binary file not shown.
Binary file not shown.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-native-qqsdk",
3-
"version": "0.8.0",
3+
"version": "0.8.1",
44
"description": "react-native wrapper for qq sdk",
55
"main": "index.js",
66
"scripts": {

0 commit comments

Comments
 (0)