Skip to content

Commit edd515f

Browse files
jaywcjlovejaywcjlove
committed
feat: Add openWXApp props.
1 parent 864d940 commit edd515f

File tree

6 files changed

+67
-17
lines changed

6 files changed

+67
-17
lines changed

‎android/src/main/java/com/uiwjs/react/wechat/RNWechatModule.java

+13
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,19 @@ public void getApiVersion(Promise promise) {
4747
promise.reject("-1", e.getMessage());
4848
}
4949
}
50+
51+
@ReactMethod
52+
public void openWXApp(Promise promise) {
53+
try {
54+
if (api == null) {
55+
throw new Exception(NOT_REGISTERED);
56+
}
57+
promise.resolve(api.openWXApp());
58+
} catch (Exception e) {
59+
promise.reject("-1", e.getMessage());
60+
}
61+
}
62+
5063
@ReactMethod
5164
public void isWXAppInstalled(Promise promise) {
5265
try {

‎example/App.js

+18-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { Component } from 'react';
2-
import { Platform, SafeAreaView, StyleSheet, Text, View } from 'react-native';
2+
import { Platform, Button, SafeAreaView, StyleSheet, Text, View } from 'react-native';
33
import Wechat from '@uiw/react-native-wechat';
44

55
export default class App extends Component {
@@ -10,19 +10,26 @@ export default class App extends Component {
1010
};
1111
async componentDidMount() {
1212
try {
13-
const reg = await Wechat.registerApp('wxd930ea5d5a258f4f');
14-
console.log('reg:', reg);
13+
const reg = await Wechat.registerApp('wx500b695a47bd364b', 'https://uiwjs.github.io/react-native-wechat/apple-app-site-association');
1514
const isInstall = await Wechat.isWXAppInstalled();
1615
const isWXAppSupportApi = await Wechat.isWXAppSupportApi();
1716
const version = await Wechat.getApiVersion();
18-
console.log('version:', version)
17+
console.log('version:', version);
1918
this.setState({
20-
isInstall, isWXAppSupportApi, version
19+
isInstall,
20+
isWXAppSupportApi,
21+
version
2122
});
2223
} catch (error) {
24+
console.log('code>', error.code);
25+
console.log('message>', error.message);
2326
console.log('error>', error);
2427
}
2528
}
29+
openWXApp = async () => {
30+
const isOpen = await Wechat.openWXApp();
31+
console.log('isOpen:', isOpen);
32+
}
2633
render() {
2734
const { isInstall, isWXAppSupportApi, version } = this.state;
2835
return (
@@ -31,13 +38,18 @@ export default class App extends Component {
3138
<Text style={styles.welcome}>☆Wechat Example☆</Text>
3239
<Text>
3340
<Text style={styles.instructions}>
34-
<Text style={{color: isInstall ? 'green' : 'red'}}>{isInstall ? '有' : '没有'}</Text>安装微信，
41+
<Text style={{color: isInstall ? 'green' : 'red'}}>{isInstall ? '已经' : '没有'}</Text>安装微信，
3542
</Text>
3643
<Text style={styles.instructions}>
3744
当前微信的版本<Text style={{color: isWXAppSupportApi ? 'green' : 'red'}}>{isWXAppSupportApi ? '支持' : '不支持'}</Text> OpenApi
3845
</Text>
3946
<Text> - v{version}</Text>
4047
</Text>
48+
<Button
49+
onPress={this.openWXApp}
50+
title="打开微信 APP"
51+
color="#841584"
52+
/>
4153
</View>
4254
</SafeAreaView>
4355
);

‎example/ios/example/LaunchScreen.storyboard

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
33
<device id="retina4_7" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
77
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
88
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
99
</dependencies>
@@ -22,7 +22,7 @@
2222
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
2323
<nil key="highlightedColor"/>
2424
</label>
25-
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="example" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
25+
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Wechat 微信" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
2626
<rect key="frame" x="0.0" y="202" width="375" height="43"/>
2727
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
2828
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

‎index.d.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,13 @@ export function registerApp(appid: string, universalLink: string): void;
1313
export function isWXAppInstalled(): Promise<boolean>;
1414
/**
1515
* 判断当前微信的版本是否支持 OpenApi
16-
* 支持返回 true，不支持返回 false
16+
* 支持返回 `true`，不支持返回 `false`
1717
*/
1818
export function isWXAppSupportApi(): Promise<boolean>;
19+
/**
20+
* 打开微信，成功返回 `true`，不支持返回 失败返回 `false`
21+
*/
22+
export function openWXApp(): Promise<boolean>;
1923
/**
2024
* 获取当前微信SDK的版本号
2125
*/

‎index.js

+8-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export default class Wechat {
66
* @param appid 通过微信开放平台，[获取appid](https://open.weixin.qq.com/)
77
* @param universalLink 参数在 iOS 中有效，Universal Link(通用链接)是苹果在 iOS9 推出的，一种能够方便的通过传统 HTTPS 链接来启动 APP 的功能，可以使用相同的网址打开网址和 APP。
88
*/
9-
static registerApp(appid, universalLink) {
9+
static registerApp(appid, universalLink = '') {
1010
if (Platform.OS === 'ios') {
1111
return NativeModules.RNWechat.registerApp(appid, universalLink);
1212
}
@@ -21,11 +21,17 @@ export default class Wechat {
2121
return NativeModules.RNWechat.isWXAppInstalled();
2222
}
2323
/**
24-
* 判断当前微信的版本是否支持OpenApi，支持返回 true，不支持返回 false
24+
* 判断当前微信的版本是否支持 OpenApi，支持返回 true，不支持返回 false
2525
*/
2626
static isWXAppSupportApi() {
2727
return NativeModules.RNWechat.isWXAppSupportApi();
2828
}
29+
/**
30+
* 打开微信，成功返回 true，不支持返回 失败返回 false
31+
*/
32+
static openWXApp() {
33+
return NativeModules.RNWechat.openWXApp();
34+
}
2935
/**
3036
* 获取当前微信SDK的版本号
3137
*/

‎ios/RNWechat.m

+20-5
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ - (instancetype)init {
1212
self = [super init];
1313
if (self) {
1414
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleOpenURL:) name:@"RCTOpenURLNotification" object:nil];
15+
// 在register之前打开log, 后续可以根据log排查问题
16+
[WXApi startLogByLevel:WXLogLevelDetail logBlock:^(NSString *log) {
17+
NSLog(@"WeChatSDK: %@", log);
18+
}];
1519
}
1620
return self;
1721
}
@@ -44,12 +48,12 @@ + (BOOL)requiresMainQueueSetup {
4448
}
4549

4650
// 注册 appid
47-
RCT_REMAP_METHOD(registerApp, :(NSString *)appid :(NSString *)universalLink resolver: (RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
48-
if ([WXApi registerApp: appid universalLink: universalLink]) {
51+
RCT_REMAP_METHOD(registerApp, appid:(NSString *)appid universalLink:(NSString*)universalLink resolver: (RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
52+
@try {
4953
self.appId = appid;
50-
resolve(@[[NSNull null]]);
51-
} else {
52-
reject(@"-10404", INVOKE_FAILED, nil);
54+
resolve(@([WXApi registerApp: appid universalLink: universalLink]));
55+
} @catch (NSException *exception) {
56+
reject(@"-10404", [NSString stringWithFormat:@"%@ %@", exception.name, exception.userInfo], nil);
5357
}
5458
}
5559

@@ -62,6 +66,17 @@ + (BOOL)requiresMainQueueSetup {
6266
}
6367
}
6468

69+
/*! @brief 打开微信
70+
* @return 成功返回YES，失败返回NO。
71+
*/
72+
RCT_EXPORT_METHOD(openWXApp: (RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
73+
if ([WXApi openWXApp]) {
74+
resolve(@YES);
75+
} else {
76+
resolve(@NO);
77+
}
78+
}
79+
6580
// 判断当前微信的版本是否支持OpenApi，支持返回YES，不支持返回NO。
6681
RCT_EXPORT_METHOD(isWXAppSupportApi: (RCTPromiseResolveBlock)resolve :(RCTPromiseRejectBlock)reject) {
6782
if ([WXApi isWXAppSupportApi]) {

0 commit comments

Comments
 (0)