From b59b97e8e76fc9276750cd3a533a5041f3797749 Mon Sep 17 00:00:00 2001 From: Sandycai0918 Date: Fri, 10 Sep 2021 10:47:44 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=AD=97=E4=BD=93=E5=8A=A0=E7=B2=97=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/src/main/java/com/jiguang/jverify/JverifyPlugin.java | 4 ++++ example/lib/main.dart | 1 + lib/jverify.dart | 2 ++ 3 files changed, 7 insertions(+) diff --git a/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java b/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java index 79d2e5f..6438d84 100644 --- a/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java +++ b/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java @@ -561,6 +561,7 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder) 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"); @@ -808,6 +809,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) { diff --git a/example/lib/main.dart b/example/lib/main.dart index 27f69d3..07b0a5e 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -332,6 +332,7 @@ class _MyAppState extends State { 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"; //图片必须存在 diff --git a/lib/jverify.dart b/lib/jverify.dart index ac24006..4238566 100644 --- a/lib/jverify.dart +++ b/lib/jverify.dart @@ -508,6 +508,7 @@ class JVUIConfig { String? logBtnText; int? logBtnTextSize; int? logBtnTextColor; + bool? logBtnTextBold; String? logBtnBackgroundPath; String? loginBtnNormalImage; // only ios String? loginBtnPressedImage; // only ios @@ -612,6 +613,7 @@ class JVUIConfig { "logBtnVerticalLayoutItem": getStringFromEnum(logBtnVerticalLayoutItem), "logBtnTextSize": logBtnTextSize ??= null, "logBtnTextColor": logBtnTextColor ??= null, + "logBtnTextBold": logBtnTextBold ??= null, "logBtnBackgroundPath": logBtnBackgroundPath ??= null, "loginBtnNormalImage": loginBtnNormalImage ??= null, "loginBtnPressedImage": loginBtnPressedImage ??= null, From 5c5a593ab896e7496378a6f8d19315fece9c9a07 Mon Sep 17 00:00:00 2001 From: Sandycai0918 Date: Fri, 10 Sep 2021 10:54:54 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8C=89=E9=92=AE=E7=9B=B8=E5=AF=B9=E5=B1=8F?= =?UTF-8?q?=E5=B9=95=E5=BA=95=E9=83=A8y=E8=BD=B4=E5=81=8F=E7=A7=BB?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/src/main/java/com/jiguang/jverify/JverifyPlugin.java | 4 ++++ lib/jverify.dart | 2 ++ 2 files changed, 6 insertions(+) diff --git a/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java b/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java index 6438d84..cdd563a 100644 --- a/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java +++ b/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java @@ -557,6 +557,7 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder) 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"); @@ -794,6 +795,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); } diff --git a/lib/jverify.dart b/lib/jverify.dart index 4238566..d697e14 100644 --- a/lib/jverify.dart +++ b/lib/jverify.dart @@ -502,6 +502,7 @@ class JVUIConfig { /// 登录按钮 int? logBtnOffsetX; int? logBtnOffsetY; + int? logBtnBottomOffsetY; int? logBtnWidth; int? logBtnHeight; JVIOSLayoutItem? logBtnVerticalLayoutItem; @@ -608,6 +609,7 @@ class JVUIConfig { "logBtnText": logBtnText ??= null, "logBtnOffsetY": logBtnOffsetY ??= null, "logBtnOffsetX": logBtnOffsetX ??= null, + "logBtnBottomOffsetY": logBtnBottomOffsetY ??= null, "logBtnWidth": logBtnWidth ??= null, "logBtnHeight": logBtnHeight ??= null, "logBtnVerticalLayoutItem": getStringFromEnum(logBtnVerticalLayoutItem), From 154785af74f6d0480d86922025a5b9989effde55 Mon Sep 17 00:00:00 2001 From: Sandycai0918 Date: Fri, 10 Sep 2021 11:02:31 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E5=B1=95=E7=A4=BAweb=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E5=AD=97=E4=BD=93=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=8A=A0=E7=B2=97=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/src/main/java/com/jiguang/jverify/JverifyPlugin.java | 5 +++++ lib/jverify.dart | 2 ++ 2 files changed, 7 insertions(+) diff --git a/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java b/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java index cdd563a..e78e55f 100644 --- a/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java +++ b/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java @@ -596,6 +596,7 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder) 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"); @@ -927,6 +928,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) { diff --git a/lib/jverify.dart b/lib/jverify.dart index d697e14..1f479de 100644 --- a/lib/jverify.dart +++ b/lib/jverify.dart @@ -543,6 +543,7 @@ class JVUIConfig { int? privacyNavColor; // 导航栏颜色 int? privacyNavTitleTextColor; // 标题颜色 int? privacyNavTitleTextSize; // 标题大小 + bool? privacyNavTitleTextBold; // 标题字体加粗 String? privacyNavTitleTitle; //协议0 web页面导航栏标题 only ios String? privacyNavTitleTitle1; // 协议1 web页面导航栏标题 String? privacyNavTitleTitle2; // 协议2 web页面导航栏标题 @@ -651,6 +652,7 @@ class JVUIConfig { "privacyNavColor": privacyNavColor ??= null, "privacyNavTitleTextColor": privacyNavTitleTextColor ??= null, "privacyNavTitleTextSize": privacyNavTitleTextSize ??= null, + "privacyNavTitleTextBold": privacyNavTitleTextBold ??= null, "privacyNavTitleTitle1": privacyNavTitleTitle1 ??= null, "privacyNavTitleTitle2": privacyNavTitleTitle2 ??= null, "privacyNavReturnBtnImage": privacyNavReturnBtnImage ??= null, From ee7dae94bf8b8b4c43c109eb70f32908d5acfa29 Mon Sep 17 00:00:00 2001 From: Sandycai0918 Date: Fri, 10 Sep 2021 11:13:39 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E7=BD=AEsloga?= =?UTF-8?q?n=E7=9B=B8=E5=AF=B9=E4=BA=8E=E5=B1=8F=E5=B9=95=E5=BA=95?= =?UTF-8?q?=E9=83=A8=E4=B8=8B=E8=BE=B9=E7=BC=98y=E8=BD=B4=E5=81=8F?= =?UTF-8?q?=E7=A7=BB=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/src/main/java/com/jiguang/jverify/JverifyPlugin.java | 3 +++ lib/jverify.dart | 2 ++ 2 files changed, 5 insertions(+) diff --git a/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java b/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java index e78e55f..e959fbe 100644 --- a/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java +++ b/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java @@ -778,6 +778,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); } diff --git a/lib/jverify.dart b/lib/jverify.dart index 1f479de..ceb1b66 100644 --- a/lib/jverify.dart +++ b/lib/jverify.dart @@ -491,6 +491,7 @@ class JVUIConfig { /// slogan int? sloganOffsetX; int? sloganOffsetY; + int? sloganBottomOffsetY; JVIOSLayoutItem? sloganVerticalLayoutItem; int? sloganTextColor; int? sloganTextSize; @@ -639,6 +640,7 @@ class JVUIConfig { "sloganOffsetY": sloganOffsetY ??= null, "sloganTextColor": sloganTextColor ??= null, "sloganOffsetX": sloganOffsetX ??= null, + "sloganBottomOffsetY": sloganBottomOffsetY ??= null, "sloganVerticalLayoutItem": getStringFromEnum(sloganVerticalLayoutItem), "sloganTextSize": sloganTextSize ??= null, "sloganWidth": sloganWidth ??= null, From 81d2d664a85feb0608eb35a595f01320e0e24c61 Mon Sep 17 00:00:00 2001 From: Sandycai0918 Date: Fri, 10 Sep 2021 11:18:00 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E7=BD=AEsloga?= =?UTF-8?q?n=E5=AD=97=E4=BD=93=E6=98=AF=E5=90=A6=E5=8A=A0=E7=B2=97?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/src/main/java/com/jiguang/jverify/JverifyPlugin.java | 4 ++++ lib/jverify.dart | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java b/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java index e959fbe..03c5243 100644 --- a/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java +++ b/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java @@ -592,6 +592,7 @@ 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 privacyNavColor = valueForKey(uiconfig, "privacyNavColor"); Object privacyNavTitleTextColor = valueForKey(uiconfig, "privacyNavTitleTextColor"); @@ -790,6 +791,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 ***************/ diff --git a/lib/jverify.dart b/lib/jverify.dart index ceb1b66..39f2118 100644 --- a/lib/jverify.dart +++ b/lib/jverify.dart @@ -497,7 +497,7 @@ class JVUIConfig { int? sloganTextSize; int? sloganWidth; int? sloganHeight; - + bool? sloganTextBold; bool sloganHidden = false; /// 登录按钮 @@ -646,6 +646,7 @@ class JVUIConfig { "sloganWidth": sloganWidth ??= null, "sloganHeight": sloganHeight ??= null, "sloganHidden": sloganHidden, + "sloganTextBold": sloganTextBold ??= null, "privacyState": privacyState, "privacyCheckboxInCenter": privacyCheckboxInCenter, "privacyTextCenterGravity": privacyTextCenterGravity, From 1dc944d46408e55ea3e2c4a3322eb20b078e521d Mon Sep 17 00:00:00 2001 From: Sandycai0918 Date: Fri, 10 Sep 2021 12:11:30 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=A0=81=E5=AD=97=E4=BD=93=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=8A=A0=E7=B2=97=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/src/main/java/com/jiguang/jverify/JverifyPlugin.java | 4 ++++ lib/jverify.dart | 2 ++ 2 files changed, 6 insertions(+) diff --git a/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java b/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java index 03c5243..34c693e 100644 --- a/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java +++ b/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java @@ -548,6 +548,7 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder) 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 numberFieldWidth = valueForKey(uiconfig, "numberFieldWidth"); @@ -770,6 +771,9 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder) if (numberSize != null) { builder.setNumberSize((Number) numberSize); } + if (numberTextBold != null) { + builder.setNumberTextBold((Boolean) numberTextBold); + } /************** slogan ***************/ diff --git a/lib/jverify.dart b/lib/jverify.dart index 39f2118..d3a2d46 100644 --- a/lib/jverify.dart +++ b/lib/jverify.dart @@ -482,6 +482,7 @@ class JVUIConfig { /// 号码 int? numberColor; int? numberSize; + bool? numberTextBold; int? numFieldOffsetX; int? numFieldOffsetY; int? numberFieldWidth; @@ -603,6 +604,7 @@ class JVUIConfig { "logoHidden": logoHidden ??= null, "numberColor": numberColor ??= null, "numberSize": numberSize ??= null, + "numberTextBold": numberTextBold ??= null, "numFieldOffsetY": numFieldOffsetY ??= null, "numFieldOffsetX": numFieldOffsetX ??= null, "numberFieldWidth": numberFieldWidth ??= null, From 7d9a71c3133a7d1dd19e0b2c2bbc94ed4cfc8ec1 Mon Sep 17 00:00:00 2001 From: Sandycai0918 Date: Fri, 10 Sep 2021 12:18:11 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E9=9A=90=E7=A7=81=E6=9D=A1=E6=AC=BE=E7=9B=B8=E5=AF=B9=E5=AF=BC?= =?UTF-8?q?=E8=88=AA=E6=A0=8F=E4=B8=8B=E7=AB=AFy=E8=BD=B4=E5=81=8F?= =?UTF-8?q?=E7=A7=BB=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/jverify.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/jverify.dart b/lib/jverify.dart index d3a2d46..af0f1f3 100644 --- a/lib/jverify.dart +++ b/lib/jverify.dart @@ -540,6 +540,7 @@ class JVUIConfig { List? privacyItem; bool privacyWithBookTitleMark = true; //设置隐私条款运营商协议名是否加书名号 bool privacyTextCenterGravity = false; //隐私条款文字是否居中对齐（默认左对齐） + int? privacyTopOffsetY; /// 隐私协议 web 页 UI 配置 int? privacyNavColor; // 导航栏颜色 @@ -630,6 +631,7 @@ class JVUIConfig { "privacyHintToast": privacyHintToast, "privacyOffsetY": privacyOffsetY ??= null, "privacyOffsetX": privacyOffsetX ??= null, + "privacyTopOffsetY": privacyTopOffsetY ??= null, "privacyVerticalLayoutItem": getStringFromEnum(privacyVerticalLayoutItem), "privacyText": privacyText ??= null, "privacyTextSize": privacyTextSize ??= null, From 2eee1892755c4b54dbd41fdc594972cb45610604 Mon Sep 17 00:00:00 2001 From: Sandycai0918 Date: Mon, 13 Sep 2021 11:05:12 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E9=9A=90=E7=A7=81=E6=9D=A1=E6=AC=BE=E6=96=87=E5=AD=97=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E6=98=AF=E5=90=A6=E5=8A=A0=E7=B2=97=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/src/main/java/com/jiguang/jverify/JverifyPlugin.java | 4 ++++ lib/jverify.dart | 2 ++ 2 files changed, 6 insertions(+) diff --git a/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java b/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java index 34c693e..70234bd 100644 --- a/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java +++ b/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java @@ -581,6 +581,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"); @@ -877,6 +878,9 @@ 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); + } builder.setPrivacyTextCenterGravity((Boolean) privacyTextCenterGravity); builder.setPrivacyWithBookTitleMark((Boolean) privacyWithBookTitleMark); diff --git a/lib/jverify.dart b/lib/jverify.dart index af0f1f3..425d54a 100644 --- a/lib/jverify.dart +++ b/lib/jverify.dart @@ -541,6 +541,7 @@ class JVUIConfig { bool privacyWithBookTitleMark = true; //设置隐私条款运营商协议名是否加书名号 bool privacyTextCenterGravity = false; //隐私条款文字是否居中对齐（默认左对齐） int? privacyTopOffsetY; + bool? privacyTextBold; /// 隐私协议 web 页 UI 配置 int? privacyNavColor; // 导航栏颜色 @@ -635,6 +636,7 @@ class JVUIConfig { "privacyVerticalLayoutItem": getStringFromEnum(privacyVerticalLayoutItem), "privacyText": privacyText ??= null, "privacyTextSize": privacyTextSize ??= null, + "privacyTextBold": privacyTextBold ??= null, "clauseName": clauseName ??= null, "clauseUrl": clauseUrl ??= null, "clauseBaseColor": clauseBaseColor ??= null, From 514a6703b93ee1c0394867ec6f0bce52b2ae652b Mon Sep 17 00:00:00 2001 From: Sandycai0918 Date: Mon, 13 Sep 2021 11:11:53 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E9=9A=90=E7=A7=81=E6=9D=A1=E6=AC=BE=E6=96=87=E5=AD=97=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E6=98=AF=E5=90=A6=E5=8A=A0=E4=B8=8B=E5=88=92=E7=BA=BF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/src/main/java/com/jiguang/jverify/JverifyPlugin.java | 4 ++++ lib/jverify.dart | 2 ++ 2 files changed, 6 insertions(+) diff --git a/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java b/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java index 70234bd..7004a63 100644 --- a/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java +++ b/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java @@ -595,6 +595,7 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder) 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"); @@ -881,6 +882,9 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder) if (privacyTextBold != null) { builder.setPrivacyTextBold((Boolean) privacyTextBold); } + if (privacyUnderlineText != null) { + builder.setPrivacyUnderlineText((Boolean) privacyUnderlineText); + } builder.setPrivacyTextCenterGravity((Boolean) privacyTextCenterGravity); builder.setPrivacyWithBookTitleMark((Boolean) privacyWithBookTitleMark); diff --git a/lib/jverify.dart b/lib/jverify.dart index 425d54a..535efd4 100644 --- a/lib/jverify.dart +++ b/lib/jverify.dart @@ -542,6 +542,7 @@ class JVUIConfig { bool privacyTextCenterGravity = false; //隐私条款文字是否居中对齐（默认左对齐） int? privacyTopOffsetY; bool? privacyTextBold; + bool? privacyUnderlineText; //设置隐私条款文字字体是否加下划线 /// 隐私协议 web 页 UI 配置 int? privacyNavColor; // 导航栏颜色 @@ -637,6 +638,7 @@ class JVUIConfig { "privacyText": privacyText ??= null, "privacyTextSize": privacyTextSize ??= null, "privacyTextBold": privacyTextBold ??= null, + "privacyUnderlineText": privacyUnderlineText ??= null, "clauseName": clauseName ??= null, "clauseUrl": clauseUrl ??= null, "clauseBaseColor": clauseBaseColor ??= null, From 7967d6cc883fa590d834100f3294d0916c03fb75 Mon Sep 17 00:00:00 2001 From: Sandycai0918 Date: Mon, 13 Sep 2021 11:23:16 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E7=BD=AElogo?= =?UTF-8?q?=E7=9B=B8=E5=AF=B9=E4=BA=8E=E5=B1=8F=E5=B9=95=E5=BA=95=E9=83=A8?= =?UTF-8?q?y=E8=BD=B4=E5=81=8F=E7=A7=BB=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/src/main/java/com/jiguang/jverify/JverifyPlugin.java | 4 ++++ lib/jverify.dart | 2 ++ 2 files changed, 6 insertions(+) diff --git a/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java b/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java index 7004a63..26daa50 100644 --- a/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java +++ b/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java @@ -545,6 +545,7 @@ 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"); @@ -753,6 +754,9 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder) builder.setLogoImgPath((String) logoImgPath); } } + if (logoOffsetBottomY != null) { + builder.setLogoOffsetBottomY((Integer) logoOffsetBottomY); + } /************** number ***************/ if (numFieldOffsetY != null) { diff --git a/lib/jverify.dart b/lib/jverify.dart index 535efd4..a51ab03 100644 --- a/lib/jverify.dart +++ b/lib/jverify.dart @@ -475,6 +475,7 @@ class JVUIConfig { int? logoHeight; int? logoOffsetX; int? logoOffsetY; + int? logoOffsetBottomY; JVIOSLayoutItem? logoVerticalLayoutItem; bool? logoHidden; String? logoImgPath; @@ -603,6 +604,7 @@ class JVUIConfig { "logoHeight": logoHeight ??= null, "logoOffsetY": logoOffsetY ??= null, "logoOffsetX": logoOffsetX ??= null, + "logoOffsetBottomY": logoOffsetBottomY ??= null, "logoVerticalLayoutItem": getStringFromEnum(logoVerticalLayoutItem), "logoHidden": logoHidden ??= null, "numberColor": numberColor ??= null, From 6f24615e85e287e45b68a1b22a076677f9cefc09 Mon Sep 17 00:00:00 2001 From: Sandycai0918 Date: Mon, 13 Sep 2021 11:32:27 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E6=A0=87=E9=A2=98=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8A=A0=E7=B2=97=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/src/main/java/com/jiguang/jverify/JverifyPlugin.java | 4 ++++ lib/jverify.dart | 2 ++ 2 files changed, 6 insertions(+) diff --git a/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java b/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java index 26daa50..43dbee1 100644 --- a/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java +++ b/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java @@ -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"); @@ -728,6 +729,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); } diff --git a/lib/jverify.dart b/lib/jverify.dart index a51ab03..ceaf99b 100644 --- a/lib/jverify.dart +++ b/lib/jverify.dart @@ -469,6 +469,7 @@ class JVUIConfig { bool navHidden = false; bool navReturnBtnHidden = false; bool navTransparent = false; + bool? navTextBold; /// logo int? logoWidth; @@ -595,6 +596,7 @@ class JVUIConfig { "navColor": navColor ??= null, "navText": navText ??= null, "navTextColor": navTextColor ??= null, + "navTextBold": navTextBold ??= null, "navReturnImgPath": navReturnImgPath ??= null, "navHidden": navHidden, "navReturnBtnHidden": navReturnBtnHidden, From 22fb929321e1fa949904355b01fa3ebf3aa5c51c Mon Sep 17 00:00:00 2001 From: Sandycai0918 Date: Thu, 23 Sep 2021 17:38:23 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/src/main/res/drawable-hdpi/logo_cm.png | Bin 3390 -> 0 bytes .../app/src/main/res/drawable-hdpi/logo_ct.jpg | Bin 10685 -> 0 bytes .../app/src/main/res/drawable-hdpi/logo_cu.jpg | Bin 59541 -> 0 bytes .../android/app/src/main/res/drawable/logo.png | Bin 3390 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 example/android/app/src/main/res/drawable-hdpi/logo_cm.png delete mode 100644 example/android/app/src/main/res/drawable-hdpi/logo_ct.jpg delete mode 100644 example/android/app/src/main/res/drawable-hdpi/logo_cu.jpg delete mode 100644 example/android/app/src/main/res/drawable/logo.png diff --git a/example/android/app/src/main/res/drawable-hdpi/logo_cm.png b/example/android/app/src/main/res/drawable-hdpi/logo_cm.png deleted file mode 100644 index af9787e834e67afcc75e7089a680e6f11fea878c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3390 zcmV-E4Z-q>P)GKKEuqrCm*sR3Q*#hTf10DQXoYgRp)UMuuGgf6^q-D!s2ZnJ}@ZU3O_cl?##ty zY(Mnsd#H;WssCam5R-t9{fR#P=4W3iDlPvt1|E<4{vjH=%r5ZxIgn+%C>12=DHg0I zGqlz>e(5^;?)|K-V@PsK<3_1s67bW~Z++>bip7<8th#<7I--X9b{m)x0W8PMNMA%a zUH}hEfI2N5^g7Lacgo!Bxsl$zyxZ!L;=-f^5K^Euq}}xN%U3U{x?|`M)Xo$ zl2#8&N;%K3pQrM5d|xxx6$KN3vmK4Pczs1m(b5lAtXZfWrUfv`;9q{AR;$4=>|P8c z^)+j09l)7vASeeDfL%|TZqdE3Enan9d0I{uob4Tv(VGS#6$-3`k5kR{o;|cjsulQP z0jsVb~|{)StY5_M;+sLl{%^rlJFIxTqIOcAfpp75I+Iwe;mP(iLpt1>Ry zdTmt+*mpOp!8_WXNLvl=PRiWn-${b*5@dt-qy7g|iN5Q^yd6`o~)_tC&H z9uRmAwLRy|9J>OQ1_)9CltwSMqba)dbg*bL))1=H41u8?I4hz8dA~BRyns-ujWh}m zJfC>zW1#)cAyM-UN+>gCL+PA3px3CNY)-b=$3gp`xyK4l^!h_fFEn-7P?nMos(G5HM(IGlOfKrurbwyr&7HJ*vKq3u)3_N2W1hwA|cP%f0+gGd^ z1$-h|UwPGN8x!*Nk8SYb!5^Wu-wW!@!iW>0)TDqypHqsO2XK6*0+Vfo+F(r8s=@7H zAW>p3=W&A4ZHD{TRlvPBRe~Wk<%09A11@lSS?C+_g44%BNv=*jUR9JXzT*CySC)(V zLvt^@{OMt6vr&+eksq<|OsP~rsI*3DwqcY23i(ByfQ^AqjNps?e1*XSe|r25D9AF1 z$1vE3TdYvsVi8{_lj1xbEGo)?yOtEf>~u9ODJ_JZ&)oxW?W%!yj+j8H&x}k;N)p%? z>7=+z23!z{hCRul%tw(R!@n?74<9{x^CnO-d8+~7Ga}SuTb~t$Q zEF5b+170c(j&Usf;%ysjU1kKmS_!*P^+h}$OA6GOkOq)I#n+x6`$Wa=$ZPF}+ZN4* zM{eJ60pMe0X(@KUM%c2dLJY$H+J6E*Ja7saZ7zIV6NP&}kFQ7qH6H)OOF=Wi4lixn z2usV1;{RLBPS}G+@rjOMu^lY4(=||%r-!wr*|4rG8xghw?%PlWe|+x%)L4Wl;yluBM0q$?zi#V;>l8 ztI~2~`dwy}3kp?!yS{j|{m&nw{Il!iF(9#naHz8F=W9mW@7C^&F8(kD0W-k@yn`K= zJR)Oi0iyq(0R(*Xhb@HZdg+IW;SnJ|+dw(2eK@pVlqHK8T&W$1U?J?Wn z$q&9i_cvT&h(3h~xi9`p`8b@4h+xV^s$j)6^Fr%<4ZvrI>)@n`4eK+Ol!U(24F0>} zq)I~@yRBjMfBdfNfprgu+~03E!!64fgxtT+M#tO&$ccSaSwjWuD$I_0#-w1bZSQ6H?k2d$k5c(JdVJrtuc7em~1%p-{@_SxDB;0w^5_o54 zH8ixD;B;H3cznTC1;|Ru;5VDshBflB>^pWQUenOX3eG&<-(L^gHZKnAeHiRFp4d8V z-(yEjTU-zjlR^v=fUO`_g0r9fCpwas0MQB#G{o$tU;LydZYp6i%1O|uzWK#5Xza2^ z{f76SXovmBJ7Sak2yr$SwDpzUQLRRMEe`noJBQ9sl`o&_%tE%<3XyT}Jy0LzZ_bo#t3q$uO>OJiWM&IG|f*l}(fo{_|E zh$kf`Sf=NAyN9M}dEcJM3d`|4(|e*G&TZ<(1qfgS*5~G3mIjuS8Hki{2wUD`?_zBo zc-2607o|WNirH}a2OGbZ_vnnAFsuOVQ2V#2i361{;DQ8+4Y#N1t7^vO7?7pp+O*Lmb1I@B$>A0Grw zi%vuUFI8y_vI2*Hps|U_EG`i!?JRH7)qi_(SEBE{KB zchnBH0&FHe!RK=M+P^)?3xtc)t)2k#AtpZCr|I-5`^3p8aLZ=ka0S5b!iD-}wmQX%D0iX^iPyy2-J z&F!!($8k<`2P(4aJWYEK@;)a99dAZ9DEa&V_(C`Y1kzMIVW&lkH|N6p`(+`WMNsNY zRbgc@l~!oP&yth6>^u-4IanY-;Axu$SjLNh?`Qh!T6vEhk8=DVt5x##cwKxqjM+mz zTmk}p#0@`@V)vs9QcR3mI;WKS&2$njh?8(`dvaPTu3Qr6v~-SxDW1P3!s7kBMX1Io zCAlmjNeCFt7NuCpNZE~FQXWEl@SV71BRo$?utE|L5Nrj(nv9Fh$Rf*S%Krrz0Q;W` UTon;x82|tP07*qoM6N<$g1K5s;s5{u diff --git a/example/android/app/src/main/res/drawable-hdpi/logo_ct.jpg b/example/android/app/src/main/res/drawable-hdpi/logo_ct.jpg deleted file mode 100644 index fbed52e9fefdccd740de64fc296c9bde23ae2bf5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10685 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 L|6gP1e>d}QF^OG? diff --git a/example/android/app/src/main/res/drawable-hdpi/logo_cu.jpg b/example/android/app/src/main/res/drawable-hdpi/logo_cu.jpg deleted file mode 100644 index 7fcd99488eef3576342eabbab2ff547cb43fc5ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 59541 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 H{!aQI^eXwG diff --git a/example/android/app/src/main/res/drawable/logo.png b/example/android/app/src/main/res/drawable/logo.png deleted file mode 100644 index af9787e834e67afcc75e7089a680e6f11fea878c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3390 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 UTon;x82|tP07*qoM6N<$g1K5s;s5{u From f16270be56e686dfebbfe6ae77ca9479619e01ec Mon Sep 17 00:00:00 2001 From: Sandycai0918 Date: Sun, 26 Sep 2021 11:55:56 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E7=A0=81=E7=9B=B8=E5=AF=B9=E5=B1=8F=E5=B9=95=E5=BA=95?= =?UTF-8?q?=E9=83=A8=E7=9A=84=E5=81=8F=E7=A7=BB=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/src/main/java/com/jiguang/jverify/JverifyPlugin.java | 4 ++++ lib/jverify.dart | 2 ++ 2 files changed, 6 insertions(+) diff --git a/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java b/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java index 43dbee1..ce45b9b 100644 --- a/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java +++ b/android/src/main/java/com/jiguang/jverify/JverifyPlugin.java @@ -553,6 +553,7 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder) 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"); @@ -763,6 +764,9 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder) } /************** number ***************/ + if (numberFieldOffsetBottomY != null) { + builder.setNumberFieldOffsetBottomY((Integer) numberFieldOffsetBottomY); + } if (numFieldOffsetY != null) { builder.setNumFieldOffsetY((Integer) numFieldOffsetY); } diff --git a/lib/jverify.dart b/lib/jverify.dart index ceaf99b..49fb85f 100644 --- a/lib/jverify.dart +++ b/lib/jverify.dart @@ -490,6 +490,7 @@ class JVUIConfig { int? numberFieldWidth; int? numberFieldHeight; JVIOSLayoutItem? numberVerticalLayoutItem; + int? numberFieldOffsetBottomY; /// slogan int? sloganOffsetX; @@ -614,6 +615,7 @@ class JVUIConfig { "numberTextBold": numberTextBold ??= null, "numFieldOffsetY": numFieldOffsetY ??= null, "numFieldOffsetX": numFieldOffsetX ??= null, + "numberFieldOffsetBottomY": numberFieldOffsetBottomY ??= null, "numberFieldWidth": numberFieldWidth ??= null, "numberFieldHeight": numberFieldHeight ??= null, "numberVerticalLayoutItem": getStringFromEnum(numberVerticalLayoutItem), From 2e1e09aeb999d4e2a3c176c8be7611aea4a42036 Mon Sep 17 00:00:00 2001 From: Sandycai0918 Date: Sun, 26 Sep 2021 12:11:24 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0change=20log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 33ff0a5..d35e78a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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