Merge pull request #52 from hyhSuper/master

修复 iOS  slogan宽高为0的bug,  修改文档示例。

Author: hyhSuper

documents/APIs.md

@@ -281,47 +281,98 @@ jverify.setCustomAuthorizationView(false,uiConfig,widgets: widgetList);
 ##### JVUIConfig
 ```dart
 /// 自定义授权的 UI 界面
+uiConfig.privacyNavReturnBtnImage = "return_bg";//图片必须存在;
+final screenSize = MediaQuery.of(context).size;
+final screenWidth = screenSize.width;
+final screenHeight = screenSize.height;
+bool isiOS = Platform.isIOS;
+
+/// 自定义授权的 UI 界面，以下设置的图片必须添加到资源文件里，
+/// android项目将图片存放至drawable文件夹下，可使用图片选择器的文件名,例如：btn_login.xml,入参为"btn_login"。
+/// ios项目存放在 Assets.xcassets。
+///
 JVUIConfig uiConfig = JVUIConfig();
-uiConfig.navColor = Colors.red.value;
+//uiConfig.authBackgroundImage = ;
 
+//uiConfig.navHidden = true;
+uiConfig.navColor = Colors.red.value;
 uiConfig.navText = "登录";
 uiConfig.navTextColor = Colors.blue.value;
-uiConfig.navReturnImgPath = "return_bg";
+uiConfig.navReturnImgPath = "return_bg";//图片必须存在
 
-uiConfig.logoHidden = false;
+uiConfig.logoWidth = 100;
+uiConfig.logoHeight = 80;
+//uiConfig.logoOffsetX = isiOS ? 0 : null;//(screenWidth/2 - uiConfig.logoWidth/2).toInt();
 uiConfig.logoOffsetY = 10;
-uiConfig.logoWidth = 90;
-uiConfig.logoHeight = 90;
+uiConfig.logoVerticalLayoutItem = JVIOSLayoutItem.ItemSuper;
+uiConfig.logoHidden = false;
 uiConfig.logoImgPath = "logo";
 
-uiConfig.numFieldOffsetY = 120;
+uiConfig.numberFieldWidth = 200;
+uiConfig.numberFieldHeight = 40 ;
+//uiConfig.numFieldOffsetX = isiOS ? 0 : null;//(screenWidth/2 - uiConfig.numberFieldWidth/2).toInt();
+uiConfig.numFieldOffsetY = isiOS ? 20 : 120;
+uiConfig.numberVerticalLayoutItem = JVIOSLayoutItem.ItemLogo;
 uiConfig.numberColor = Colors.blue.value;
+uiConfig.numberSize = 18;
 
-uiConfig.sloganOffsetY = 150;
+uiConfig.sloganOffsetY = isiOS ? 20 : 160;
+uiConfig.sloganVerticalLayoutItem = JVIOSLayoutItem.ItemNumber;
 uiConfig.sloganTextColor = Colors.black.value;
-
-uiConfig.logBtnOffsetY = 300;
+uiConfig.sloganTextSize = 15;
+//        uiConfig.slogan
+//uiConfig.sloganHidden = 0;
+
+uiConfig.logBtnWidth = 220;
+uiConfig.logBtnHeight = 50;
+//uiConfig.logBtnOffsetX = isiOS ? 0 : null;//(screenWidth/2 - uiConfig.logBtnWidth/2).toInt();
+uiConfig.logBtnOffsetY = isiOS ? 20 : 230;
+uiConfig.logBtnVerticalLayoutItem = JVIOSLayoutItem.ItemSlogan;
 uiConfig.logBtnText = "登录按钮";
 uiConfig.logBtnTextColor = Colors.brown.value;
-uiConfig.loginBtnNormalImage = "login_btn_normal";
-uiConfig.loginBtnPressedImage = "login_btn_press";
-uiConfig.loginBtnUnableImage = "login_btn_unable";
-
-uiConfig.checkedImgPath = "check_image";
-uiConfig.uncheckedImgPath = "uncheck_image";
-uiConfig.privacyOffsetY = 80;
-
+uiConfig.logBtnTextSize = 16;
+uiConfig.loginBtnNormalImage = "login_btn_normal";//图片必须存在
+uiConfig.loginBtnPressedImage = "login_btn_press";//图片必须存在
+uiConfig.loginBtnUnableImage = "login_btn_unable";//图片必须存在
+
+
+uiConfig.privacyState = true;//设置默认勾选
+uiConfig.privacyCheckboxSize = 20;
+uiConfig.checkedImgPath = "check_image";//图片必须存在
+uiConfig.uncheckedImgPath = "uncheck_image";//图片必须存在
+uiConfig.privacyCheckboxInCenter = true;
+//uiConfig.privacyCheckboxHidden = false;
+
+//uiConfig.privacyOffsetX = isiOS ? (20 + uiConfig.privacyCheckboxSize) : null;
+uiConfig.privacyOffsetY = 15;// 距离底部距离
+uiConfig.privacyVerticalLayoutItem = JVIOSLayoutItem.ItemSuper;
 uiConfig.clauseName = "协议1";
 uiConfig.clauseUrl = "http://www.baidu.com";
 uiConfig.clauseBaseColor = Colors.black.value;
-
 uiConfig.clauseNameTwo = "协议二";
 uiConfig.clauseUrlTwo = "http://www.hao123.com";
 uiConfig.clauseColor = Colors.red.value;
-
-
-uiConfig.privacyState = true;
-
+uiConfig.privacyText = ["1极","2光","3认","4证"];
+uiConfig.privacyTextSize = 13;
+//uiConfig.privacyWithBookTitleMark = true;
+//uiConfig.privacyTextCenterGravity = false;
+uiConfig.authStatusBarStyle =  JVIOSBarStyle.StatusBarStyleDarkContent;
+uiConfig.privacyStatusBarStyle = JVIOSBarStyle.StatusBarStyleDefault;
+
+uiConfig.statusBarColorWithNav = true;
+uiConfig.virtualButtonTransparent = true;
+
+uiConfig.privacyStatusBarColorWithNav = true;
+uiConfig.privacyVirtualButtonTransparent = true;
+
+uiConfig.needStartAnim = true;
+uiConfig.needCloseAnim = true;
+
+uiConfig.privacyNavColor =  Colors.red.value;;
+uiConfig.privacyNavTitleTextColor = Colors.blue.value;
+uiConfig.privacyNavTitleTextSize = 16;
+uiConfig.privacyNavTitleTitle1 = "协议1 web页标题";
+uiConfig.privacyNavTitleTitle2 = "协议2 web页标题";
 Jverify jverify = new Jverify();
 
 ```

ios/Classes/JverifyPlugin.m

@@ -540,8 +540,8 @@ - (void)setCustomUIWithUIConfig:(JVUIConfig *)uiconfig configArguments:(NSDictio
     }else{
         JVLayoutConstraint *slogan_cons_top = JVLayoutTop([sloganOffsetY floatValue], sloganLayoutItem,NSLayoutAttributeBottom);
         JVLayoutConstraint *slogan_cons_centerx = JVLayoutCenterX([sloganOffsetX floatValue]);
-        CGFloat sloganH = sloganHeight?[sloganHeight floatValue]:20;
-        CGFloat sloganW = sloganWidth?[sloganWidth floatValue]:200;
+        CGFloat sloganH = [sloganHeight floatValue]>0?:20;
+        CGFloat sloganW = [sloganWidth floatValue]>0?:200;
         JVLayoutConstraint *slogan_cons_width = JVLayoutWidth(sloganW);
         JVLayoutConstraint *slogan_cons_height = JVLayoutHeight(sloganH);
         uiconfig.sloganConstraints = @[slogan_cons_top,slogan_cons_centerx,slogan_cons_width,slogan_cons_height];

lib/jverify.dart

@@ -488,6 +488,9 @@ class JVUIConfig {
   JVIOSLayoutItem sloganVerticalLayoutItem;
   int sloganTextColor;
   int sloganTextSize;
+  int sloganWidth;
+  int sloganHeight;
+
   bool sloganHidden = false;
 
   /// 登录按钮
@@ -613,6 +616,8 @@ class JVUIConfig {
       "sloganOffsetX": sloganOffsetX ??= null,
       "sloganVerticalLayoutItem": getStringFromEnum(sloganVerticalLayoutItem),
       "sloganTextSize": sloganTextSize ??= null,
+      "sloganWidth": sloganWidth ??= null,
+      "sloganHeight": sloganHeight ??= null,
       "sloganHidden": sloganHidden,
       "privacyState": privacyState,
       "privacyCheckboxInCenter": privacyCheckboxInCenter,