Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
## 2.1.9
+ 新增:授权界面视频背景
+ 新增:登录按钮字体加粗
+ 新增:登录按钮相对底部偏移量
+ 新增:隐私协议页面导航栏字体加粗
+ 新增:slogan相对底部偏移量
+ 新增:slogan字体加粗
+ 新增:手机号码字体加粗
+ 新增:隐私条款相对底部偏移量
+ 新增:隐私条款文字加粗
+ 新增:隐私条款文字下划线
+ 新增:logo相对底部偏移量
+ 新增:导航栏标题字体加粗
+ 新增:手机号码相对底部偏移量
## 2.1.8
+ 升级:android 认证 2.7.4,ios 2.7.5
+ 升级:android Jcore 2.9.0
Expand Down
44 changes: 44 additions & 0 deletions android/src/main/java/com/jiguang/jverify/JverifyPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,7 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
Object navColor = valueForKey(uiconfig, "navColor");
Object navText = valueForKey(uiconfig, "navText");
Object navTextColor = valueForKey(uiconfig, "navTextColor");
Object navTextBold = valueForKey(uiconfig, "navTextBold");
Object navReturnImgPath = valueForKey(uiconfig, "navReturnImgPath");
Object navHidden = valueForKey(uiconfig, "navHidden");
Object navReturnBtnHidden = valueForKey(uiconfig, "navReturnBtnHidden");
Expand All @@ -545,22 +546,27 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
Object logoOffsetY = valueForKey(uiconfig, "logoOffsetY");
Object logoOffsetX = valueForKey(uiconfig, "logoOffsetX");
Object logoHidden = valueForKey(uiconfig, "logoHidden");
Object logoOffsetBottomY = valueForKey(uiconfig, "logoOffsetBottomY");

Object numberColor = valueForKey(uiconfig, "numberColor");
Object numberSize = valueForKey(uiconfig, "numberSize");
Object numberTextBold = valueForKey(uiconfig, "numberTextBold");
Object numFieldOffsetY = valueForKey(uiconfig, "numFieldOffsetY");
Object numFieldOffsetX = valueForKey(uiconfig, "numFieldOffsetX");
Object numberFieldOffsetBottomY = valueForKey(uiconfig, "numberFieldOffsetBottomY");
Object numberFieldWidth = valueForKey(uiconfig, "numberFieldWidth");
Object numberFieldHeight = valueForKey(uiconfig, "numberFieldHeight");


Object logBtnText = valueForKey(uiconfig, "logBtnText");
Object logBtnOffsetY = valueForKey(uiconfig, "logBtnOffsetY");
Object logBtnOffsetX = valueForKey(uiconfig, "logBtnOffsetX");
Object logBtnBottomOffsetY = valueForKey(uiconfig, "logBtnBottomOffsetY");
Object logBtnWidth = valueForKey(uiconfig, "logBtnWidth");
Object logBtnHeight = valueForKey(uiconfig, "logBtnHeight");
Object logBtnTextSize = valueForKey(uiconfig, "logBtnTextSize");
Object logBtnTextColor = valueForKey(uiconfig, "logBtnTextColor");
Object logBtnTextBold = valueForKey(uiconfig, "logBtnTextBold");
Object logBtnBackgroundPath = valueForKey(uiconfig, "logBtnBackgroundPath");

Object uncheckedImgPath = valueForKey(uiconfig, "uncheckedImgPath");
Expand All @@ -578,6 +584,7 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
Object privacyTextCenterGravity = valueForKey(uiconfig, "privacyTextCenterGravity");
Object privacyText = valueForKey(uiconfig, "privacyText");
Object privacyTextSize = valueForKey(uiconfig, "privacyTextSize");
Object privacyTextBold = valueForKey(uiconfig, "privacyTextBold");
Object privacyCheckboxHidden = valueForKey(uiconfig, "privacyCheckboxHidden");
Object privacyCheckboxSize = valueForKey(uiconfig, "privacyCheckboxSize");
Object privacyWithBookTitleMark = valueForKey(uiconfig, "privacyWithBookTitleMark");
Expand All @@ -590,10 +597,13 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
Object sloganBottomOffsetY = valueForKey(uiconfig, "sloganBottomOffsetY");
Object sloganTextSize = valueForKey(uiconfig, "sloganTextSize");
Object sloganHidden = valueForKey(uiconfig, "sloganHidden");
Object sloganTextBold = valueForKey(uiconfig, "sloganTextBold");
Object privacyUnderlineText = valueForKey(uiconfig, "privacyUnderlineText");

Object privacyNavColor = valueForKey(uiconfig, "privacyNavColor");
Object privacyNavTitleTextColor = valueForKey(uiconfig, "privacyNavTitleTextColor");
Object privacyNavTitleTextSize = valueForKey(uiconfig, "privacyNavTitleTextSize");
Object privacyNavTitleTextBold = valueForKey(uiconfig, "privacyNavTitleTextBold");
Object privacyNavReturnBtnPath = valueForKey(uiconfig, "privacyNavReturnBtnImage");
Object privacyNavTitleTitle1 = valueForKey(uiconfig, "privacyNavTitleTitle1");
Object privacyNavTitleTitle2 = valueForKey(uiconfig, "privacyNavTitleTitle2");
Expand Down Expand Up @@ -720,6 +730,9 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
if (navTextColor != null) {
builder.setNavTextColor(exchangeObject(navTextColor));
}
if (navTextBold != null) {
builder.setNavTextBold((Boolean) navTextBold);
}
if (navReturnImgPath != null) {
builder.setNavReturnImgPath((String) navReturnImgPath);
}
Expand All @@ -746,8 +759,14 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
builder.setLogoImgPath((String) logoImgPath);
}
}
if (logoOffsetBottomY != null) {
builder.setLogoOffsetBottomY((Integer) logoOffsetBottomY);
}

/************** number ***************/
if (numberFieldOffsetBottomY != null) {
builder.setNumberFieldOffsetBottomY((Integer) numberFieldOffsetBottomY);
}
if (numFieldOffsetY != null) {
builder.setNumFieldOffsetY((Integer) numFieldOffsetY);
}
Expand All @@ -766,6 +785,9 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
if (numberSize != null) {
builder.setNumberSize((Number) numberSize);
}
if (numberTextBold != null) {
builder.setNumberTextBold((Boolean) numberTextBold);
}


/************** slogan ***************/
Expand All @@ -775,6 +797,9 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
if (sloganOffsetX != null) {
builder.setSloganOffsetX((Integer) sloganOffsetX);
}
if (sloganBottomOffsetY != null) {
builder.setSloganBottomOffsetY((Integer) sloganBottomOffsetY);
}
if (sloganTextSize != null) {
builder.setSloganTextSize((Integer) sloganTextSize);
}
Expand All @@ -784,6 +809,9 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
if (sloganHidden != null) {
builder.setSloganHidden((Boolean) sloganHidden);
}
if (sloganTextBold != null) {
builder.setSloganTextBold((Boolean) sloganTextBold);
}


/************** login btn ***************/
Expand All @@ -793,6 +821,9 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
if (logBtnOffsetX != null) {
builder.setLogBtnOffsetX((Integer) logBtnOffsetX);
}
if (logBtnBottomOffsetY != null) {
builder.setLogBtnBottomOffsetY((Integer) logBtnBottomOffsetY);
}
if (logBtnWidth != null) {
builder.setLogBtnWidth((Integer) logBtnWidth);
}
Expand All @@ -808,6 +839,9 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
if (logBtnTextColor != null) {
builder.setLogBtnTextColor(exchangeObject(logBtnTextColor));
}
if (logBtnTextBold != null) {
builder.setLogBtnTextBold((Boolean) logBtnTextBold);
}
if (logBtnBackgroundPath != null) {
int res_id = getResourceByReflect((String) logBtnBackgroundPath);
if (res_id > 0) {
Expand Down Expand Up @@ -857,6 +891,12 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
privacyTextList.addAll(Arrays.asList("", "", "", ""));
builder.setPrivacyText(privacyTextList.get(0), privacyTextList.get(1));
}
if (privacyTextBold != null) {
builder.setPrivacyTextBold((Boolean) privacyTextBold);
}
if (privacyUnderlineText != null) {
builder.setPrivacyUnderlineText((Boolean) privacyUnderlineText);
}

builder.setPrivacyTextCenterGravity((Boolean) privacyTextCenterGravity);
builder.setPrivacyWithBookTitleMark((Boolean) privacyWithBookTitleMark);
Expand Down Expand Up @@ -919,6 +959,10 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
// builder.setAppPrivacyNavTitle2((String) privacyNavTitleTitle2);
// }

if (privacyNavTitleTextBold != null) {
builder.setPrivacyNavTitleTextBold((Boolean) privacyNavTitleTextBold);
}

if (privacyNavReturnBtnPath != null) {
int res_id = getResourceByReflect((String) privacyNavReturnBtnPath);
if (res_id > 0) {
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed example/android/app/src/main/res/drawable/logo.png
Binary file not shown.
1 change: 1 addition & 0 deletions example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ class _MyAppState extends State<MyApp> {
uiConfig.logBtnText = "登录按钮";
uiConfig.logBtnTextColor = Colors.brown.value;
uiConfig.logBtnTextSize = 16;
uiConfig.logBtnTextBold = true;
uiConfig.loginBtnNormalImage = "login_btn_normal"; //图片必须存在
uiConfig.loginBtnPressedImage = "login_btn_press"; //图片必须存在
uiConfig.loginBtnUnableImage = "login_btn_unable"; //图片必须存在
Expand Down
25 changes: 24 additions & 1 deletion lib/jverify.dart
Original file line number Diff line number Diff line change
Expand Up @@ -469,45 +469,52 @@ class JVUIConfig {
bool navHidden = false;
bool navReturnBtnHidden = false;
bool navTransparent = false;
bool? navTextBold;

/// logo
int? logoWidth;
int? logoHeight;
int? logoOffsetX;
int? logoOffsetY;
int? logoOffsetBottomY;
JVIOSLayoutItem? logoVerticalLayoutItem;
bool? logoHidden;
String? logoImgPath;

/// 号码
int? numberColor;
int? numberSize;
bool? numberTextBold;
int? numFieldOffsetX;
int? numFieldOffsetY;
int? numberFieldWidth;
int? numberFieldHeight;
JVIOSLayoutItem? numberVerticalLayoutItem;
int? numberFieldOffsetBottomY;

/// slogan
int? sloganOffsetX;
int? sloganOffsetY;
int? sloganBottomOffsetY;
JVIOSLayoutItem? sloganVerticalLayoutItem;
int? sloganTextColor;
int? sloganTextSize;
int? sloganWidth;
int? sloganHeight;

bool? sloganTextBold;
bool sloganHidden = false;

/// 登录按钮
int? logBtnOffsetX;
int? logBtnOffsetY;
int? logBtnBottomOffsetY;
int? logBtnWidth;
int? logBtnHeight;
JVIOSLayoutItem? logBtnVerticalLayoutItem;
String? logBtnText;
int? logBtnTextSize;
int? logBtnTextColor;
bool? logBtnTextBold;
String? logBtnBackgroundPath;
String? loginBtnNormalImage; // only ios
String? loginBtnPressedImage; // only ios
Expand Down Expand Up @@ -536,11 +543,15 @@ class JVUIConfig {
List<JVPrivacy>? privacyItem;
bool privacyWithBookTitleMark = true; //设置隐私条款运营商协议名是否加书名号
bool privacyTextCenterGravity = false; //隐私条款文字是否居中对齐(默认左对齐)
int? privacyTopOffsetY;
bool? privacyTextBold;
bool? privacyUnderlineText; //设置隐私条款文字字体是否加下划线

/// 隐私协议 web 页 UI 配置
int? privacyNavColor; // 导航栏颜色
int? privacyNavTitleTextColor; // 标题颜色
int? privacyNavTitleTextSize; // 标题大小
bool? privacyNavTitleTextBold; // 标题字体加粗
String? privacyNavTitleTitle; //协议0 web页面导航栏标题 only ios
String? privacyNavTitleTitle1; // 协议1 web页面导航栏标题
String? privacyNavTitleTitle2; // 协议2 web页面导航栏标题
Expand Down Expand Up @@ -586,6 +597,7 @@ class JVUIConfig {
"navColor": navColor ??= null,
"navText": navText ??= null,
"navTextColor": navTextColor ??= null,
"navTextBold": navTextBold ??= null,
"navReturnImgPath": navReturnImgPath ??= null,
"navHidden": navHidden,
"navReturnBtnHidden": navReturnBtnHidden,
Expand All @@ -595,23 +607,28 @@ class JVUIConfig {
"logoHeight": logoHeight ??= null,
"logoOffsetY": logoOffsetY ??= null,
"logoOffsetX": logoOffsetX ??= null,
"logoOffsetBottomY": logoOffsetBottomY ??= null,
"logoVerticalLayoutItem": getStringFromEnum(logoVerticalLayoutItem),
"logoHidden": logoHidden ??= null,
"numberColor": numberColor ??= null,
"numberSize": numberSize ??= null,
"numberTextBold": numberTextBold ??= null,
"numFieldOffsetY": numFieldOffsetY ??= null,
"numFieldOffsetX": numFieldOffsetX ??= null,
"numberFieldOffsetBottomY": numberFieldOffsetBottomY ??= null,
"numberFieldWidth": numberFieldWidth ??= null,
"numberFieldHeight": numberFieldHeight ??= null,
"numberVerticalLayoutItem": getStringFromEnum(numberVerticalLayoutItem),
"logBtnText": logBtnText ??= null,
"logBtnOffsetY": logBtnOffsetY ??= null,
"logBtnOffsetX": logBtnOffsetX ??= null,
"logBtnBottomOffsetY": logBtnBottomOffsetY ??= null,
"logBtnWidth": logBtnWidth ??= null,
"logBtnHeight": logBtnHeight ??= null,
"logBtnVerticalLayoutItem": getStringFromEnum(logBtnVerticalLayoutItem),
"logBtnTextSize": logBtnTextSize ??= null,
"logBtnTextColor": logBtnTextColor ??= null,
"logBtnTextBold": logBtnTextBold ??= null,
"logBtnBackgroundPath": logBtnBackgroundPath ??= null,
"loginBtnNormalImage": loginBtnNormalImage ??= null,
"loginBtnPressedImage": loginBtnPressedImage ??= null,
Expand All @@ -622,9 +639,12 @@ class JVUIConfig {
"privacyHintToast": privacyHintToast,
"privacyOffsetY": privacyOffsetY ??= null,
"privacyOffsetX": privacyOffsetX ??= null,
"privacyTopOffsetY": privacyTopOffsetY ??= null,
"privacyVerticalLayoutItem": getStringFromEnum(privacyVerticalLayoutItem),
"privacyText": privacyText ??= null,
"privacyTextSize": privacyTextSize ??= null,
"privacyTextBold": privacyTextBold ??= null,
"privacyUnderlineText": privacyUnderlineText ??= null,
"clauseName": clauseName ??= null,
"clauseUrl": clauseUrl ??= null,
"clauseBaseColor": clauseBaseColor ??= null,
Expand All @@ -634,11 +654,13 @@ class JVUIConfig {
"sloganOffsetY": sloganOffsetY ??= null,
"sloganTextColor": sloganTextColor ??= null,
"sloganOffsetX": sloganOffsetX ??= null,
"sloganBottomOffsetY": sloganBottomOffsetY ??= null,
"sloganVerticalLayoutItem": getStringFromEnum(sloganVerticalLayoutItem),
"sloganTextSize": sloganTextSize ??= null,
"sloganWidth": sloganWidth ??= null,
"sloganHeight": sloganHeight ??= null,
"sloganHidden": sloganHidden,
"sloganTextBold": sloganTextBold ??= null,
"privacyState": privacyState,
"privacyCheckboxInCenter": privacyCheckboxInCenter,
"privacyTextCenterGravity": privacyTextCenterGravity,
Expand All @@ -647,6 +669,7 @@ class JVUIConfig {
"privacyNavColor": privacyNavColor ??= null,
"privacyNavTitleTextColor": privacyNavTitleTextColor ??= null,
"privacyNavTitleTextSize": privacyNavTitleTextSize ??= null,
"privacyNavTitleTextBold": privacyNavTitleTextBold ??= null,
"privacyNavTitleTitle1": privacyNavTitleTitle1 ??= null,
"privacyNavTitleTitle2": privacyNavTitleTitle2 ??= null,
"privacyNavReturnBtnImage": privacyNavReturnBtnImage ??= null,
Expand Down