Skip to content

Commit 5338696

Browse files
committed
Merge remote-tracking branch 'upstream/master' into dev
2 parents 2956bdb + ce17a4f commit 5338696

File tree

45 files changed

+654
-68
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+654
-68
lines changed

.github/workflows/nodejs.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages
3+
name: npm-publish
4+
on:
5+
push:
6+
branches:
7+
- master # Change this to your default branch
8+
jobs:
9+
npm-publish:
10+
name: npm-publish
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout repository
14+
uses: actions/checkout@master
15+
- name: Set up Node.js
16+
uses: actions/setup-node@master
17+
with:
18+
node-version: 10.0.0
19+
registry-url: https://registry.npmjs.org/
20+
- run: npm publish
21+
env: # More info about the environment variables in the README
22+
NODE_AUTH_TOKEN: ${{secrets.NPM_AUTH_TOKEN}} # You need to set this in your repo settings

.idea/codeStyles/Project.xml

Lines changed: 116 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
example/
2+
.github/

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
### v 2.4.4
2+
- android增加弹窗自定义关闭按钮
3+
4+
### v 2.4.3
5+
- iOS、android增加弹窗登录
6+
7+
### v 2.4.2
8+
- 修复bug,优化体验
9+
10+
### v 2.4.1
11+
- 修复了安卓设置隐私文字大小无效
12+
13+
### v 2.4.0
14+
- 更新了原生sdk版本
15+
- 增加获取验证码,设置前后两次获取验证码时间间隔的功能
16+
17+
### v 2.3.0
18+
1.由于RN-JCore1.6.0存在编译问题,从RN-JCore1.7.0开始,还是需要在AndroidManifest.xml中添加配置代码,具体参考 配置-2.1 Android
19+
20+
2.修复添加自定义布局问题

README.md

Lines changed: 12 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
# JVerification-React-Native
22

3-
## ChangeLog
4-
5-
1.由于RN-JCore1.6.0存在编译问题,从RN-JCore1.7.0开始,还是需要在AndroidManifest.xml中添加配置代码,具体参考 配置-2.1 Android
6-
7-
2.修复添加自定义布局问题
8-
93
## 1. 安装
104

115
```
@@ -67,42 +61,19 @@ pod install
6761
```
6862
pod deintegrate
6963
```
64+
65+
### 2.2.2 配置AppKey
7066

71-
### 2.2.2 手动方式
72-
73-
* Libraries
74-
75-
```
76-
Add Files to "your project name"
77-
node_modules/jcore-react-native/ios/RCTJCoreModule.xcodeproj
78-
node_modules/jverification-react-native/ios/RCTJVerificationModule.xcodeproj
79-
```
80-
81-
* Build Settings
82-
83-
```
84-
All --- Search Paths --- Header Search Paths --- +
85-
$(SRCROOT)/../node_modules/jcore-react-native/ios/RCTJCoreModule/
86-
$(SRCROOT)/../node_modules/jverification-react-native/ios/RCTJVerificationModule/
87-
```
88-
89-
* Build Phases
90-
91-
```
92-
libz.tbd
93-
libc++.1.tbd
94-
libresolv.tbd
95-
libsqlite3.tbd
96-
libRCTJCoreModule.a
97-
libRCTJVerificationModule.a
98-
```
99-
100-
* info.plist
101-
102-
```
103-
View controller-based status bar appearance : YES
104-
```
105-
67+
* App.js
68+
```
69+
const initParams = {
70+
'time': 5000,
71+
'appKey': 'yourAppKey', //仅iOS
72+
'channel': 'channel', //仅iOS
73+
'advertisingId': 'advertisingId', //仅iOS
74+
'isProduction': false, //仅iOS
75+
};
76+
```
10677

10778
## 3. 引用
10879

android/.idea/.gitignore

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

android/.idea/codeStyles/Project.xml

Lines changed: 116 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

android/.idea/gradle.xml

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

android/.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)