diff --git a/android/app/src/main/res/drawable/log_btn_background.xml b/android/app/src/main/res/drawable/log_btn_background.xml new file mode 100644 index 00000000..58769a9b --- /dev/null +++ b/android/app/src/main/res/drawable/log_btn_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/drawable/uncheck.png b/android/app/src/main/res/drawable/uncheck.png index f1ff4217..4a1f3dda 100644 Binary files a/android/app/src/main/res/drawable/uncheck.png and b/android/app/src/main/res/drawable/uncheck.png differ diff --git a/lib/tools/jverify_one_click_login.dart b/lib/tools/jverify_one_click_login.dart index 78454725..1e8007dc 100644 --- a/lib/tools/jverify_one_click_login.dart +++ b/lib/tools/jverify_one_click_login.dart @@ -187,10 +187,10 @@ class JverifyOneClickLoginManage { //uiConfig.numFieldOffsetX = isiOS ? 0 : null;//(screenWidth/2 - uiConfig.numberFieldWidth/2).toInt(); uiConfig.numFieldOffsetY = isiOS ? 120 : 220; uiConfig.numberVerticalLayoutItem = JVIOSLayoutItem.ItemLogo; - uiConfig.numberColor = Colors.white.value; + uiConfig.numberColor = AppColors.mainColor.value; uiConfig.numberSize = 18; - uiConfig.sloganOffsetY = isiOS ? 120 : 260; + uiConfig.sloganOffsetY = isiOS ? 40 : 300; uiConfig.sloganVerticalLayoutItem = JVIOSLayoutItem.ItemNumber; uiConfig.sloganTextColor = Colors.black.value; uiConfig.sloganTextSize = 15; @@ -201,12 +201,12 @@ class JverifyOneClickLoginManage { uiConfig.logBtnWidth = double.parse('${1.sw - 20 * 2}').toInt(); uiConfig.logBtnHeight = 50; //uiConfig.logBtnOffsetX = isiOS ? 0 : null;//(screenWidth/2 - uiConfig.logBtnWidth/2).toInt(); - uiConfig.logBtnOffsetY = isiOS ? 140 : 330; + uiConfig.logBtnOffsetY = isiOS ? 60 : 330; uiConfig.logBtnVerticalLayoutItem = JVIOSLayoutItem.ItemNumber; uiConfig.logBtnText = '一键登录'.tr; uiConfig.logBtnTextColor = AppColors.mainColor.value; uiConfig.logBtnTextSize = 16; - uiConfig.logBtnBackgroundPath = ''; + // uiConfig.logBtnBackgroundPath = 'log_btn_background'; // uiConfig.logBtnTextBold = true; // uiConfig.loginBtnNormalImage = 'login_btn_normal'; //图片必须存在 // uiConfig.loginBtnPressedImage = 'login_btn_press'; //图片必须存在 @@ -216,12 +216,15 @@ class JverifyOneClickLoginManage { true; //only android 设置隐私条款不选中时点击登录按钮默认显示toast。 uiConfig.privacyState = false; //设置默认勾选 - uiConfig.privacyCheckboxSize = 20; - uiConfig.checkedImgPath = 'check'; //图片必须存在 - uiConfig.uncheckedImgPath = 'uncheck'; //图片必须存在 + uiConfig.privacyCheckboxSize = 22; + if (isiOS) { + uiConfig.checkedImgPath = 'check'; //图片必须存在 + uiConfig.uncheckedImgPath = 'uncheck'; //图片必须存在 + } + uiConfig.privacyCheckboxInCenter = true; uiConfig.privacyCheckboxHidden = false; - uiConfig.isAlertPrivacyVc = true; + uiConfig.isAlertPrivacyVc = false; //uiConfig.privacyOffsetX = isiOS ? (20 + uiConfig.privacyCheckboxSize) : null; uiConfig.privacyNavReturnBtnImage = 'icon_left_grey'; //图片必须存在; @@ -264,69 +267,69 @@ class JverifyOneClickLoginManage { uiConfig.privacyNavTitleTextSize = 16; //协议二次弹窗内容设置 -Android - final JVPrivacyCheckDialogConfig privacyCheckDialogConfig = - JVPrivacyCheckDialogConfig(); - privacyCheckDialogConfig.width = 250; //协议⼆次弹窗本身的宽 - privacyCheckDialogConfig.height = 100; //协议⼆次弹窗本身的⾼ - privacyCheckDialogConfig.title = '请阅读并同意一下条款'; //弹窗标题 - privacyCheckDialogConfig.offsetX = 0; // 窗口相对屏幕中心的x轴偏移量 - privacyCheckDialogConfig.offsetY = 0; // 窗口相对屏幕中心的y轴偏移量 - - privacyCheckDialogConfig.logBtnText = '同意并登录'; //弹窗登录按钮 - privacyCheckDialogConfig.titleTextSize = 24; // 弹窗标题字体大小 - privacyCheckDialogConfig.gravity = 'center'; //弹窗对齐方式 - privacyCheckDialogConfig.titleTextColor = Colors.black.value; // 弹窗标题字体颜色 - privacyCheckDialogConfig.contentTextGravity = 'left'; //协议⼆次弹窗协议内容对⻬⽅式 - privacyCheckDialogConfig.contentTextSize = 16; //协议⼆次弹窗协议内容字体⼤⼩ - // privacyCheckDialogConfig.logBtnImgPath = "login_btn_normal";//协议⼆次弹窗登录按钮的背景图⽚ - privacyCheckDialogConfig.logBtnTextColor = - Colors.black.value; //协议⼆次弹窗登录按钮的字体颜⾊ - privacyCheckDialogConfig.logBtnMarginT = 20; //协议⼆次弹窗登录按钮上边距 - privacyCheckDialogConfig.logBtnMarginB = 20; //协议⼆次弹窗登录按钮下边距 - privacyCheckDialogConfig.logBtnMarginL = 40; //协议⼆次弹窗登录按钮左边距 - privacyCheckDialogConfig.logBtnWidth = 140; //协议⼆次弹窗登录按钮宽 - privacyCheckDialogConfig.logBtnHeight = 40; //协议⼆次弹窗登录按高 - /// 添加自定义的 控件 到dialog - final List dialogWidgetList = []; - const String btnDialogWidgetid = 'jv_add_custom_dialog_button'; // 标识控件 id - final JVCustomWidget buttonDialogWidget = - JVCustomWidget(btnDialogWidgetid, JVCustomWidgetType.button); - buttonDialogWidget.title = '取消'; - buttonDialogWidget.titleFont = 16; - buttonDialogWidget.left = 80; - buttonDialogWidget.top = 180; - buttonDialogWidget.width = 140; - buttonDialogWidget.height = 40; - buttonDialogWidget.textAlignment = JVTextAlignmentType.center; - buttonDialogWidget.titleColor = Colors.black.value; - // buttonDialogWidget.btnNormalImageName = "main_btn_other"; - // buttonDialogWidget.btnPressedImageName = "main_btn_other"; - // buttonDialogWidget.backgroundColor = Colors.yellow.value; - // buttonWidget.textAlignment = JVTextAlignmentType.left; - - // 添加点击事件监听 - jverify.addClikWidgetEventListener(btnDialogWidgetid, (eventId) { - print('receive listener - click dialog widget event :$eventId'); - if (btnDialogWidgetid == eventId) { - print('receive listener - 点击【新加 dialog button】'); - } - }); - dialogWidgetList.add(buttonDialogWidget); - privacyCheckDialogConfig.widgets = dialogWidgetList; - uiConfig.privacyCheckDialogConfig = privacyCheckDialogConfig; - // iOS 二次弹窗添加取消按钮 - uiConfig.isAlertPrivacyVc = true; - uiConfig.agreementAlertViewWidgets = dialogWidgetList; - uiConfig.agreementAlertViewLogBtnTextFontSize = 16; - uiConfig.agreementAlertViewTitleTexSize = 18; - uiConfig.agreementAlertViewContentTextFontSize = 14; - final alertLeft = (screenWidth / 2 - 300 / 2).toInt(); - uiConfig.agreementAlertViewUIFrames = { - 'superViewFrame': [alertLeft, 100, 300, 220], - 'titleFrame': [20, 10, 260, 40], - 'contentFrame': [25, 70, 250, 120], - 'buttonFrame': [80, 142, 140, 40] - }; + // final JVPrivacyCheckDialogConfig privacyCheckDialogConfig = + // JVPrivacyCheckDialogConfig(); + // privacyCheckDialogConfig.width = 300; //协议⼆次弹窗本身的宽 + // privacyCheckDialogConfig.height = 220; //协议⼆次弹窗本身的⾼ + // privacyCheckDialogConfig.privacyBackgroundColor = Colors.grey.value; + // privacyCheckDialogConfig.title = '请阅读并同意一下条款'; //弹窗标题 + // privacyCheckDialogConfig.offsetX = 0; // 窗口相对屏幕中心的x轴偏移量 + // privacyCheckDialogConfig.offsetY = 0; // 窗口相对屏幕中心的y轴偏移量 + // + // privacyCheckDialogConfig.logBtnText = '同意并登录'; //弹窗登录按钮 + // privacyCheckDialogConfig.titleTextSize = 16; // 弹窗标题字体大小 + // privacyCheckDialogConfig.gravity = 'center'; //弹窗对齐方式 + // privacyCheckDialogConfig.titleTextColor = Colors.black.value; // 弹窗标题字体颜色 + // privacyCheckDialogConfig.contentTextGravity = 'left'; //协议⼆次弹窗协议内容对⻬⽅式 + // privacyCheckDialogConfig.contentTextSize = 14; //协议⼆次弹窗协议内容字体⼤⼩ + // privacyCheckDialogConfig.logBtnImgPath = + // 'log_btn_background'; //协议⼆次弹窗登录按钮的背景图⽚ + // privacyCheckDialogConfig.logBtnTextColor = + // Colors.black.value; //协议⼆次弹窗登录按钮的字体颜⾊ + // privacyCheckDialogConfig.logBtnMarginT = 40; //协议⼆次弹窗登录按钮上边距 + // privacyCheckDialogConfig.logBtnMarginB = 20; //协议⼆次弹窗登录按钮下边距 + // privacyCheckDialogConfig.logBtnMarginL = 90; //协议⼆次弹窗登录按钮左边距 + // privacyCheckDialogConfig.logBtnWidth = 140; //协议⼆次弹窗登录按钮宽 + // privacyCheckDialogConfig.logBtnHeight = 40; //协议⼆次弹窗登录按高 + // /// 添加自定义的 控件 到dialog + // final List dialogWidgetList = []; + // const String btnDialogWidgetid = 'jv_add_custom_dialog_button'; // 标识控件 id + // final JVCustomWidget buttonDialogWidget = + // JVCustomWidget(btnDialogWidgetid, JVCustomWidgetType.button); + // buttonDialogWidget.title = '取消'; + // buttonDialogWidget.titleFont = 16; + // buttonDialogWidget.left = 80; + // buttonDialogWidget.top = 180; + // buttonDialogWidget.width = 140; + // buttonDialogWidget.height = 40; + // buttonDialogWidget.textAlignment = JVTextAlignmentType.center; + // buttonDialogWidget.titleColor = Colors.black.value; + // buttonDialogWidget.btnNormalImageName = "log_btn_background"; + // buttonDialogWidget.btnPressedImageName = "log_btn_background"; + // + // // 添加点击事件监听 + // jverify.addClikWidgetEventListener(btnDialogWidgetid, (eventId) { + // print('receive listener - click dialog widget event :$eventId'); + // if (btnDialogWidgetid == eventId) { + // print('receive listener - 点击【新加 dialog button】'); + // } + // }); + // dialogWidgetList.add(buttonDialogWidget); + // privacyCheckDialogConfig.widgets = dialogWidgetList; + // uiConfig.privacyCheckDialogConfig = privacyCheckDialogConfig; + // // iOS 二次弹窗添加取消按钮 + // uiConfig.isAlertPrivacyVc = true; + // uiConfig.agreementAlertViewWidgets = dialogWidgetList; + // uiConfig.agreementAlertViewLogBtnTextFontSize = 16; + // uiConfig.agreementAlertViewTitleTexSize = 18; + // uiConfig.agreementAlertViewContentTextFontSize = 14; + // final alertLeft = (screenWidth / 2 - 300 / 2).toInt(); + // uiConfig.agreementAlertViewUIFrames = { + // 'superViewFrame': [alertLeft, 100, 300, 220], + // 'titleFrame': [20, 10, 260, 40], + // 'contentFrame': [25, 70, 250, 120], + // 'buttonFrame': [80, 142, 140, 40] + // }; /// 调用接口设置 UI jverify.setCustomAuthorizationView(false, uiConfig,