Skip to content

Commit d2e3e87

Browse files
committed
文档优化,demo优化。 android支持 ,协议栏checkbox未选中时,点击登录按钮是否弹出toast提示用户勾选协议,默认不弹。
1 parent 371ece0 commit d2e3e87

File tree

7 files changed

+28
-428
lines changed

7 files changed

+28
-428
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,3 +207,4 @@ yarn.lock
207207

208208
*.gitattributes
209209
.idea
210+
index.android.bundle

android/src/main/java/cn/jiguang/plugins/verification/JVerificationModule.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,8 @@ private void convertToConfig(ReadableMap readableMap){
339339
builder.setLogBtnTextColor(readableMap.getInt(JConstans.LOGIN_BTN_TEXT_COLOR));
340340
}
341341
if(readableMap.hasKey(JConstans.LOGIN_BTN_IMAGE_SELECTOR)){
342+
// TODO:
343+
JLogger.w("setLogBtnImgPath:"+readableMap.getString(JConstans.LOGIN_BTN_IMAGE_SELECTOR));
342344
builder.setLogBtnImgPath(readableMap.getString(JConstans.LOGIN_BTN_IMAGE_SELECTOR));
343345
}
344346
if(readableMap.hasKey(JConstans.LOGIN_BTN_X)){
@@ -385,6 +387,14 @@ private void convertToConfig(ReadableMap readableMap){
385387
builder.setPrivacyTextCenterGravity(false);
386388
}
387389
}
390+
if (readableMap.hasKey(JConstans.EnableHintToast)){
391+
boolean show = readableMap.getBoolean(JConstans.EnableHintToast);
392+
if (show == true) {
393+
builder.enableHintToast(true,null);
394+
}
395+
}
396+
397+
388398
if(readableMap.hasKey(JConstans.PRIVACY_X)){
389399
builder.setPrivacyOffsetX(dp2Pix(readableMap.getInt(JConstans.PRIVACY_X)));
390400
}

android/src/main/java/cn/jiguang/plugins/verification/common/JConstans.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ public class JConstans {
8080
public static final String PRIVACY_W = "privacyW"; //隐私条款名称外的文字栏宽度(单位:dp)
8181
public static final String PRIVACY_H = "privacyH"; //隐私条款名称外的文字栏高度度(单位:dp)
8282
public static final String PRIVACY_BOOK_SYMBOL_ENABLE = "privacyBookSymbolEnable"; //隐私条款运营商协议名是否加书名号
83+
public static final String EnableHintToast = "unAgreePrivacyHintToast"; //导航栏颜色
8384

8485
public static final String PRIVACY_CHECKBOX_HIDDEN = "privacyCheckboxHidden"; //隐私条款checkbox是否隐藏
8586
public static final String PRIVACY_CHECKBOX_SIZE = "privacyCheckboxSize"; //设置隐私条款checkbox尺寸

example/App.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -101,34 +101,34 @@ const customUIWithConfigAndroid = {
101101
navReturnHidden: false, //导航栏返回按钮是否隐藏
102102
navReturnImage: 'close', //导航栏左侧返回按钮图标
103103
//为保障显示效果,请同时设置x,y,w,h
104-
// navReturnX: 10, //导航栏左侧返回按钮图标距屏幕上端偏移(仅Android)
105-
// navReturnY: 10, //导航栏左侧返回按钮图标距屏幕左侧偏移(仅Android)
106-
// navReturnW: 30, //导航栏左侧返回按钮图标宽度(仅Android)
107-
// navReturnH: 30, //导航栏左侧返回按钮图标高度(仅Android)
104+
navReturnX: 5, //导航栏左侧返回按钮图标距屏幕上端偏移(仅Android)
105+
navReturnY: 5, //导航栏左侧返回按钮图标距屏幕左侧偏移(仅Android)
106+
navReturnW: 25, //导航栏左侧返回按钮图标宽度(仅Android)
107+
navReturnH: 25, //导航栏左侧返回按钮图标高度(仅Android)
108108

109109
logoHidden: false, //logo是否隐藏
110110
logoImage: 'umcsdk_mobile_logo', //logo(android默认为应用图标;)
111111
//为保障显示效果,请同时设置x,y,w,h
112-
logoX: 50, //logo相对于屏幕左边x轴偏移
113-
logoY: 50, //logo相对于标题栏下边缘y偏移
114-
logoW: 100, //logo宽
115-
logoH: 100, //logo高
112+
// logoX: 50, //logo相对于屏幕左边x轴偏移
113+
// logoY: 50, //logo相对于标题栏下边缘y偏移
114+
// logoW: 100, //logo宽
115+
// logoH: 100, //logo高
116116

117117
numberSize: 16, //手机号码字体大小(单位:sp)
118118
numberColor: -16777216, //手机号码字体颜色
119119
//为保障显示效果,请同时设置x,y,w,h
120-
numberX: 50, //号码栏相对于屏幕左边x轴偏移
121-
numberY: 100, //号码栏相对于标题栏下边缘y偏移
122-
numberW: 250, //号码栏宽度
123-
numberH: 25, //号码栏高度
120+
// numberX: 50, //号码栏相对于屏幕左边x轴偏移
121+
// numberY: 100, //号码栏相对于标题栏下边缘y偏移
122+
// numberW: 250, //号码栏宽度
123+
// numberH: 25, //号码栏高度
124124

125125
sloganHidden: false, //slogan是否隐藏
126126
sloganTextSize: 16, //slogan字体大小
127127
sloganTextColor: -16777216, //slogan文字颜色
128128

129129
//为保障显示效果,请同时设置x,y,w,h
130-
sloganX: 50, //slogan相对于屏幕左边x轴偏移
131-
sloganY: 150, //slogan相对于标题栏下边缘y偏移
130+
// sloganX: 50, //slogan相对于屏幕左边x轴偏移
131+
// sloganY: 150, //slogan相对于标题栏下边缘y偏移
132132

133133
loginBtnText: '登录按钮', //登录按钮文字
134134
loginBtnTextSize: 16, //登录按钮字体大小

example/android/app/src/main/assets/index.android.bundle

Lines changed: 0 additions & 412 deletions
This file was deleted.

ios/RCTJVerificationModule/RCTJVerificationModule.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,6 @@ -(JVUIConfig *)convertToCinfig: (NSDictionary *)configParams
563563
if(configParams[PRIVACY_UNCHECKED_IMAGE]){
564564
config.uncheckedImg = [self imageNamed:configParams[PRIVACY_UNCHECKED_IMAGE]];
565565
}
566-
//TODO:
567566
if ([configParams[UNCHECK_BOX_CALLBACK] isKindOfClass:[NSNumber class]]) {
568567
BOOL isNeedCallBack = [configParams[UNCHECK_BOX_CALLBACK] boolValue];
569568
if (isNeedCallBack) {
@@ -573,7 +572,7 @@ -(JVUIConfig *)convertToCinfig: (NSDictionary *)configParams
573572
}
574573
}
575574

576-
575+
577576
CGFloat privacyCheckboxW = config.uncheckedImg.size.width;
578577
CGFloat privacyCheckboxH = config.uncheckedImg.size.height;
579578
JVLayoutConstraint *constraintX = [JVLayoutConstraint constraintWithAttribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:JVLayoutItemPrivacy attribute:NSLayoutAttributeLeft multiplier:1 constant:-15];

认证SDK授权页面元素配置API说明.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@
177177
|privacyCheckedImage|String|设置复选框选中时图片。|
178178
|privacyUncheckedImage|String|设置复选框未选中时图片。|
179179
|privacyCheckEnable|boolean|设置隐私条款默认选中状态,默认不选中。|
180+
|unAgreePrivacyHintToast| boolean| 值为true,隐私条款checkBox未选中时,登录按钮可以被点击 ,点击登录按钮会有toast提示,|
180181

181182
+ iOS授权页隐私栏
182183

0 commit comments

Comments
 (0)