Skip to content

Commit 7398ca3

Browse files
SandyCai0927SandyCai0927
authored
Merge pull request #145 from SandyCai0927/dev-2.x
补充Android接口
2 parents b12706e + 2e1e09a commit 7398ca3

File tree

8 files changed

+83
-1
lines changed

8 files changed

+83
-1
lines changed

‎CHANGELOG.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
## 2.1.9
2+
+ 新增：授权界面视频背景
3+
+ 新增：登录按钮字体加粗
4+
+ 新增：登录按钮相对底部偏移量
5+
+ 新增：隐私协议页面导航栏字体加粗
6+
+ 新增：slogan相对底部偏移量
7+
+ 新增：slogan字体加粗
8+
+ 新增：手机号码字体加粗
9+
+ 新增：隐私条款相对底部偏移量
10+
+ 新增：隐私条款文字加粗
11+
+ 新增：隐私条款文字下划线
12+
+ 新增：logo相对底部偏移量
13+
+ 新增：导航栏标题字体加粗
14+
+ 新增：手机号码相对底部偏移量
115
## 2.1.8
216
+ 升级：android 认证 2.7.4,ios 2.7.5
317
+ 升级：android Jcore 2.9.0

‎android/src/main/java/com/jiguang/jverify/JverifyPlugin.java‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,7 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
534534
Object navColor = valueForKey(uiconfig, "navColor");
535535
Object navText = valueForKey(uiconfig, "navText");
536536
Object navTextColor = valueForKey(uiconfig, "navTextColor");
537+
Object navTextBold = valueForKey(uiconfig, "navTextBold");
537538
Object navReturnImgPath = valueForKey(uiconfig, "navReturnImgPath");
538539
Object navHidden = valueForKey(uiconfig, "navHidden");
539540
Object navReturnBtnHidden = valueForKey(uiconfig, "navReturnBtnHidden");
@@ -545,22 +546,27 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
545546
Object logoOffsetY = valueForKey(uiconfig, "logoOffsetY");
546547
Object logoOffsetX = valueForKey(uiconfig, "logoOffsetX");
547548
Object logoHidden = valueForKey(uiconfig, "logoHidden");
549+
Object logoOffsetBottomY = valueForKey(uiconfig, "logoOffsetBottomY");
548550

549551
Object numberColor = valueForKey(uiconfig, "numberColor");
550552
Object numberSize = valueForKey(uiconfig, "numberSize");
553+
Object numberTextBold = valueForKey(uiconfig, "numberTextBold");
551554
Object numFieldOffsetY = valueForKey(uiconfig, "numFieldOffsetY");
552555
Object numFieldOffsetX = valueForKey(uiconfig, "numFieldOffsetX");
556+
Object numberFieldOffsetBottomY = valueForKey(uiconfig, "numberFieldOffsetBottomY");
553557
Object numberFieldWidth = valueForKey(uiconfig, "numberFieldWidth");
554558
Object numberFieldHeight = valueForKey(uiconfig, "numberFieldHeight");
555559

556560

557561
Object logBtnText = valueForKey(uiconfig, "logBtnText");
558562
Object logBtnOffsetY = valueForKey(uiconfig, "logBtnOffsetY");
559563
Object logBtnOffsetX = valueForKey(uiconfig, "logBtnOffsetX");
564+
Object logBtnBottomOffsetY = valueForKey(uiconfig, "logBtnBottomOffsetY");
560565
Object logBtnWidth = valueForKey(uiconfig, "logBtnWidth");
561566
Object logBtnHeight = valueForKey(uiconfig, "logBtnHeight");
562567
Object logBtnTextSize = valueForKey(uiconfig, "logBtnTextSize");
563568
Object logBtnTextColor = valueForKey(uiconfig, "logBtnTextColor");
569+
Object logBtnTextBold = valueForKey(uiconfig, "logBtnTextBold");
564570
Object logBtnBackgroundPath = valueForKey(uiconfig, "logBtnBackgroundPath");
565571

566572
Object uncheckedImgPath = valueForKey(uiconfig, "uncheckedImgPath");
@@ -578,6 +584,7 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
578584
Object privacyTextCenterGravity = valueForKey(uiconfig, "privacyTextCenterGravity");
579585
Object privacyText = valueForKey(uiconfig, "privacyText");
580586
Object privacyTextSize = valueForKey(uiconfig, "privacyTextSize");
587+
Object privacyTextBold = valueForKey(uiconfig, "privacyTextBold");
581588
Object privacyCheckboxHidden = valueForKey(uiconfig, "privacyCheckboxHidden");
582589
Object privacyCheckboxSize = valueForKey(uiconfig, "privacyCheckboxSize");
583590
Object privacyWithBookTitleMark = valueForKey(uiconfig, "privacyWithBookTitleMark");
@@ -590,10 +597,13 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
590597
Object sloganBottomOffsetY = valueForKey(uiconfig, "sloganBottomOffsetY");
591598
Object sloganTextSize = valueForKey(uiconfig, "sloganTextSize");
592599
Object sloganHidden = valueForKey(uiconfig, "sloganHidden");
600+
Object sloganTextBold = valueForKey(uiconfig, "sloganTextBold");
601+
Object privacyUnderlineText = valueForKey(uiconfig, "privacyUnderlineText");
593602

594603
Object privacyNavColor = valueForKey(uiconfig, "privacyNavColor");
595604
Object privacyNavTitleTextColor = valueForKey(uiconfig, "privacyNavTitleTextColor");
596605
Object privacyNavTitleTextSize = valueForKey(uiconfig, "privacyNavTitleTextSize");
606+
Object privacyNavTitleTextBold = valueForKey(uiconfig, "privacyNavTitleTextBold");
597607
Object privacyNavReturnBtnPath = valueForKey(uiconfig, "privacyNavReturnBtnImage");
598608
Object privacyNavTitleTitle1 = valueForKey(uiconfig, "privacyNavTitleTitle1");
599609
Object privacyNavTitleTitle2 = valueForKey(uiconfig, "privacyNavTitleTitle2");
@@ -720,6 +730,9 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
720730
if (navTextColor != null) {
721731
builder.setNavTextColor(exchangeObject(navTextColor));
722732
}
733+
if (navTextBold != null) {
734+
builder.setNavTextBold((Boolean) navTextBold);
735+
}
723736
if (navReturnImgPath != null) {
724737
builder.setNavReturnImgPath((String) navReturnImgPath);
725738
}
@@ -746,8 +759,14 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
746759
builder.setLogoImgPath((String) logoImgPath);
747760
}
748761
}
762+
if (logoOffsetBottomY != null) {
763+
builder.setLogoOffsetBottomY((Integer) logoOffsetBottomY);
764+
}
749765

750766
/************** number ***************/
767+
if (numberFieldOffsetBottomY != null) {
768+
builder.setNumberFieldOffsetBottomY((Integer) numberFieldOffsetBottomY);
769+
}
751770
if (numFieldOffsetY != null) {
752771
builder.setNumFieldOffsetY((Integer) numFieldOffsetY);
753772
}
@@ -766,6 +785,9 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
766785
if (numberSize != null) {
767786
builder.setNumberSize((Number) numberSize);
768787
}
788+
if (numberTextBold != null) {
789+
builder.setNumberTextBold((Boolean) numberTextBold);
790+
}
769791

770792

771793
/************** slogan ***************/
@@ -775,6 +797,9 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
775797
if (sloganOffsetX != null) {
776798
builder.setSloganOffsetX((Integer) sloganOffsetX);
777799
}
800+
if (sloganBottomOffsetY != null) {
801+
builder.setSloganBottomOffsetY((Integer) sloganBottomOffsetY);
802+
}
778803
if (sloganTextSize != null) {
779804
builder.setSloganTextSize((Integer) sloganTextSize);
780805
}
@@ -784,6 +809,9 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
784809
if (sloganHidden != null) {
785810
builder.setSloganHidden((Boolean) sloganHidden);
786811
}
812+
if (sloganTextBold != null) {
813+
builder.setSloganTextBold((Boolean) sloganTextBold);
814+
}
787815

788816

789817
/************** login btn ***************/
@@ -793,6 +821,9 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
793821
if (logBtnOffsetX != null) {
794822
builder.setLogBtnOffsetX((Integer) logBtnOffsetX);
795823
}
824+
if (logBtnBottomOffsetY != null) {
825+
builder.setLogBtnBottomOffsetY((Integer) logBtnBottomOffsetY);
826+
}
796827
if (logBtnWidth != null) {
797828
builder.setLogBtnWidth((Integer) logBtnWidth);
798829
}
@@ -808,6 +839,9 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
808839
if (logBtnTextColor != null) {
809840
builder.setLogBtnTextColor(exchangeObject(logBtnTextColor));
810841
}
842+
if (logBtnTextBold != null) {
843+
builder.setLogBtnTextBold((Boolean) logBtnTextBold);
844+
}
811845
if (logBtnBackgroundPath != null) {
812846
int res_id = getResourceByReflect((String) logBtnBackgroundPath);
813847
if (res_id > 0) {
@@ -857,6 +891,12 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
857891
privacyTextList.addAll(Arrays.asList("", "", "", ""));
858892
builder.setPrivacyText(privacyTextList.get(0), privacyTextList.get(1));
859893
}
894+
if (privacyTextBold != null) {
895+
builder.setPrivacyTextBold((Boolean) privacyTextBold);
896+
}
897+
if (privacyUnderlineText != null) {
898+
builder.setPrivacyUnderlineText((Boolean) privacyUnderlineText);
899+
}
860900

861901
builder.setPrivacyTextCenterGravity((Boolean) privacyTextCenterGravity);
862902
builder.setPrivacyWithBookTitleMark((Boolean) privacyWithBookTitleMark);
@@ -919,6 +959,10 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
919959
// builder.setAppPrivacyNavTitle2((String) privacyNavTitleTitle2);
920960
// }
921961

962+
if (privacyNavTitleTextBold != null) {
963+
builder.setPrivacyNavTitleTextBold((Boolean) privacyNavTitleTextBold);
964+
}
965+
922966
if (privacyNavReturnBtnPath != null) {
923967
int res_id = getResourceByReflect((String) privacyNavReturnBtnPath);
924968
if (res_id > 0) {

‎example/android/app/src/main/res/drawable-hdpi/logo_cm.png‎

-3.31 KB
Binary file not shown.

‎example/android/app/src/main/res/drawable-hdpi/logo_ct.jpg‎

-10.4 KB
Binary file not shown.

‎example/android/app/src/main/res/drawable-hdpi/logo_cu.jpg‎

-58.1 KB
Binary file not shown.

‎example/android/app/src/main/res/drawable/logo.png‎

-3.31 KB
Binary file not shown.

‎example/lib/main.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@ class _MyAppState extends State<MyApp> {
332332
uiConfig.logBtnText = "登录按钮";
333333
uiConfig.logBtnTextColor = Colors.brown.value;
334334
uiConfig.logBtnTextSize = 16;
335+
uiConfig.logBtnTextBold = true;
335336
uiConfig.loginBtnNormalImage = "login_btn_normal"; //图片必须存在
336337
uiConfig.loginBtnPressedImage = "login_btn_press"; //图片必须存在
337338
uiConfig.loginBtnUnableImage = "login_btn_unable"; //图片必须存在

‎lib/jverify.dart‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,45 +469,52 @@ class JVUIConfig {
469469
bool navHidden = false;
470470
bool navReturnBtnHidden = false;
471471
bool navTransparent = false;
472+
bool? navTextBold;
472473

473474
/// logo
474475
int? logoWidth;
475476
int? logoHeight;
476477
int? logoOffsetX;
477478
int? logoOffsetY;
479+
int? logoOffsetBottomY;
478480
JVIOSLayoutItem? logoVerticalLayoutItem;
479481
bool? logoHidden;
480482
String? logoImgPath;
481483

482484
/// 号码
483485
int? numberColor;
484486
int? numberSize;
487+
bool? numberTextBold;
485488
int? numFieldOffsetX;
486489
int? numFieldOffsetY;
487490
int? numberFieldWidth;
488491
int? numberFieldHeight;
489492
JVIOSLayoutItem? numberVerticalLayoutItem;
493+
int? numberFieldOffsetBottomY;
490494

491495
/// slogan
492496
int? sloganOffsetX;
493497
int? sloganOffsetY;
498+
int? sloganBottomOffsetY;
494499
JVIOSLayoutItem? sloganVerticalLayoutItem;
495500
int? sloganTextColor;
496501
int? sloganTextSize;
497502
int? sloganWidth;
498503
int? sloganHeight;
499-
504+
bool? sloganTextBold;
500505
bool sloganHidden = false;
501506

502507
/// 登录按钮
503508
int? logBtnOffsetX;
504509
int? logBtnOffsetY;
510+
int? logBtnBottomOffsetY;
505511
int? logBtnWidth;
506512
int? logBtnHeight;
507513
JVIOSLayoutItem? logBtnVerticalLayoutItem;
508514
String? logBtnText;
509515
int? logBtnTextSize;
510516
int? logBtnTextColor;
517+
bool? logBtnTextBold;
511518
String? logBtnBackgroundPath;
512519
String? loginBtnNormalImage; // only ios
513520
String? loginBtnPressedImage; // only ios
@@ -536,11 +543,15 @@ class JVUIConfig {
536543
List<JVPrivacy>? privacyItem;
537544
bool privacyWithBookTitleMark = true; //设置隐私条款运营商协议名是否加书名号
538545
bool privacyTextCenterGravity = false; //隐私条款文字是否居中对齐（默认左对齐）
546+
int? privacyTopOffsetY;
547+
bool? privacyTextBold;
548+
bool? privacyUnderlineText; //设置隐私条款文字字体是否加下划线
539549

540550
/// 隐私协议 web 页 UI 配置
541551
int? privacyNavColor; // 导航栏颜色
542552
int? privacyNavTitleTextColor; // 标题颜色
543553
int? privacyNavTitleTextSize; // 标题大小
554+
bool? privacyNavTitleTextBold; // 标题字体加粗
544555
String? privacyNavTitleTitle; //协议0 web页面导航栏标题 only ios
545556
String? privacyNavTitleTitle1; // 协议1 web页面导航栏标题
546557
String? privacyNavTitleTitle2; // 协议2 web页面导航栏标题
@@ -586,6 +597,7 @@ class JVUIConfig {
586597
"navColor": navColor ??= null,
587598
"navText": navText ??= null,
588599
"navTextColor": navTextColor ??= null,
600+
"navTextBold": navTextBold ??= null,
589601
"navReturnImgPath": navReturnImgPath ??= null,
590602
"navHidden": navHidden,
591603
"navReturnBtnHidden": navReturnBtnHidden,
@@ -595,23 +607,28 @@ class JVUIConfig {
595607
"logoHeight": logoHeight ??= null,
596608
"logoOffsetY": logoOffsetY ??= null,
597609
"logoOffsetX": logoOffsetX ??= null,
610+
"logoOffsetBottomY": logoOffsetBottomY ??= null,
598611
"logoVerticalLayoutItem": getStringFromEnum(logoVerticalLayoutItem),
599612
"logoHidden": logoHidden ??= null,
600613
"numberColor": numberColor ??= null,
601614
"numberSize": numberSize ??= null,
615+
"numberTextBold": numberTextBold ??= null,
602616
"numFieldOffsetY": numFieldOffsetY ??= null,
603617
"numFieldOffsetX": numFieldOffsetX ??= null,
618+
"numberFieldOffsetBottomY": numberFieldOffsetBottomY ??= null,
604619
"numberFieldWidth": numberFieldWidth ??= null,
605620
"numberFieldHeight": numberFieldHeight ??= null,
606621
"numberVerticalLayoutItem": getStringFromEnum(numberVerticalLayoutItem),
607622
"logBtnText": logBtnText ??= null,
608623
"logBtnOffsetY": logBtnOffsetY ??= null,
609624
"logBtnOffsetX": logBtnOffsetX ??= null,
625+
"logBtnBottomOffsetY": logBtnBottomOffsetY ??= null,
610626
"logBtnWidth": logBtnWidth ??= null,
611627
"logBtnHeight": logBtnHeight ??= null,
612628
"logBtnVerticalLayoutItem": getStringFromEnum(logBtnVerticalLayoutItem),
613629
"logBtnTextSize": logBtnTextSize ??= null,
614630
"logBtnTextColor": logBtnTextColor ??= null,
631+
"logBtnTextBold": logBtnTextBold ??= null,
615632
"logBtnBackgroundPath": logBtnBackgroundPath ??= null,
616633
"loginBtnNormalImage": loginBtnNormalImage ??= null,
617634
"loginBtnPressedImage": loginBtnPressedImage ??= null,
@@ -622,9 +639,12 @@ class JVUIConfig {
622639
"privacyHintToast": privacyHintToast,
623640
"privacyOffsetY": privacyOffsetY ??= null,
624641
"privacyOffsetX": privacyOffsetX ??= null,
642+
"privacyTopOffsetY": privacyTopOffsetY ??= null,
625643
"privacyVerticalLayoutItem": getStringFromEnum(privacyVerticalLayoutItem),
626644
"privacyText": privacyText ??= null,
627645
"privacyTextSize": privacyTextSize ??= null,
646+
"privacyTextBold": privacyTextBold ??= null,
647+
"privacyUnderlineText": privacyUnderlineText ??= null,
628648
"clauseName": clauseName ??= null,
629649
"clauseUrl": clauseUrl ??= null,
630650
"clauseBaseColor": clauseBaseColor ??= null,
@@ -634,11 +654,13 @@ class JVUIConfig {
634654
"sloganOffsetY": sloganOffsetY ??= null,
635655
"sloganTextColor": sloganTextColor ??= null,
636656
"sloganOffsetX": sloganOffsetX ??= null,
657+
"sloganBottomOffsetY": sloganBottomOffsetY ??= null,
637658
"sloganVerticalLayoutItem": getStringFromEnum(sloganVerticalLayoutItem),
638659
"sloganTextSize": sloganTextSize ??= null,
639660
"sloganWidth": sloganWidth ??= null,
640661
"sloganHeight": sloganHeight ??= null,
641662
"sloganHidden": sloganHidden,
663+
"sloganTextBold": sloganTextBold ??= null,
642664
"privacyState": privacyState,
643665
"privacyCheckboxInCenter": privacyCheckboxInCenter,
644666
"privacyTextCenterGravity": privacyTextCenterGravity,
@@ -647,6 +669,7 @@ class JVUIConfig {
647669
"privacyNavColor": privacyNavColor ??= null,
648670
"privacyNavTitleTextColor": privacyNavTitleTextColor ??= null,
649671
"privacyNavTitleTextSize": privacyNavTitleTextSize ??= null,
672+
"privacyNavTitleTextBold": privacyNavTitleTextBold ??= null,
650673
"privacyNavTitleTitle1": privacyNavTitleTitle1 ??= null,
651674
"privacyNavTitleTitle2": privacyNavTitleTitle2 ??= null,
652675
"privacyNavReturnBtnImage": privacyNavReturnBtnImage ??= null,

0 commit comments

Comments
 (0)