Merge pull request #53 from skill20/dev

修复v0.6.4 ios 版本适配bug

Author: skill20

example/lib/main.dart

@@ -369,8 +369,10 @@ class _MyAppState extends State<MyApp> {
         uiConfig.privacyNavColor =  Colors.red.value;;
         uiConfig.privacyNavTitleTextColor = Colors.blue.value;
         uiConfig.privacyNavTitleTextSize = 16;
-        uiConfig.privacyNavTitleTitle1 = "协议1 web页标题";
-        uiConfig.privacyNavTitleTitle2 = "协议2 web页标题";
+
+        uiConfig.privacyNavTitleTitle  ="ios lai le";//only ios
+        uiConfig.privacyNavTitleTitle1 = "协议11 web页标题";
+        uiConfig.privacyNavTitleTitle2 = "协议22 web页标题";
         uiConfig.privacyNavReturnBtnImage = "return_bg";//图片必须存在;
 
         /// 添加自定义的 控件 到授权界面

ios/Classes/JverifyPlugin.m

@@ -714,13 +714,13 @@ - (void)setCustomUIWithUIConfig:(JVUIConfig *)uiconfig configArguments:(NSDictio
 
     /************** 协议 web 页面 ***************/
     NSNumber *privacyNavColor = [self getValue:config key:@"privacyNavColor"];
-    if (navColor) {
+    if (privacyNavColor) {
         uiconfig.agreementNavBackgroundColor  = UIColorFromRGB([privacyNavColor intValue]);
     }
 
-    NSString *privacyNavText = [self getValue:config key:@"privacyNavTitleTitle1"];
+    NSString *privacyNavText = [self getValue:config key:@"privacyNavTitleTitle"];
     if (!privacyNavText) {
-        privacyNavText =  @"服务条款";
+        privacyNavText =  @"运营商服务条款";
     }
 
     UIColor *privacyNavTitleTextColor = UIColorFromRGB(-1);

lib/jverify.dart

@@ -533,10 +533,11 @@ class JVUIConfig {
   int privacyNavColor; // 导航栏颜色
   int privacyNavTitleTextColor; // 标题颜色
   int privacyNavTitleTextSize; // 标题大小
+  String privacyNavTitleTitle; //协议0 web页面导航栏标题 only ios
   String privacyNavTitleTitle1; // 协议1 web页面导航栏标题
   String privacyNavTitleTitle2; // 协议2 web页面导航栏标题
   String privacyNavReturnBtnImage;
-  JVIOSBarStyle  privacyStatusBarStyle; //隐私协议web页 状态栏样式设置 only iOS
+  JVIOSBarStyle privacyStatusBarStyle; //隐私协议web页 状态栏样式设置 only iOS
 
   ///隐私页
   bool privacyStatusBarColorWithNav = false; //隐私页web状态栏是否与导航栏同色 only android
@@ -552,7 +553,8 @@ class JVUIConfig {
   bool statusBarHidden = false; //授权页状态栏是否隐藏 only android
   bool virtualButtonTransparent = false; //授权页虚拟按键背景是否透明 only android
 
-  JVIOSBarStyle authStatusBarStyle = JVIOSBarStyle.StatusBarStyleDefault;//授权页状态栏样式设置 only iOS
+  JVIOSBarStyle authStatusBarStyle =
+      JVIOSBarStyle.StatusBarStyleDefault; //授权页状态栏样式设置 only iOS
 
   ///是否需要动画
   bool needStartAnim = false; //设置拉起授权页时是否需要显示默认动画
@@ -643,11 +645,13 @@ class JVUIConfig {
       "statusBarTransparent": statusBarTransparent,
       "statusBarHidden": statusBarHidden,
       "virtualButtonTransparent": virtualButtonTransparent,
-      "authStatusBarStyle":getStringFromEnum(authStatusBarStyle),
-      "privacyStatusBarStyle":getStringFromEnum(privacyStatusBarStyle),
+      "authStatusBarStyle": getStringFromEnum(authStatusBarStyle),
+      "privacyStatusBarStyle": getStringFromEnum(privacyStatusBarStyle),
 
       "needStartAnim": needStartAnim,
       "needCloseAnim": needCloseAnim,
+
+      "privacyNavTitleTitle": privacyNavTitleTitle ??= null,
     }..removeWhere((key, value) => value == null);
   }
 }
@@ -834,7 +838,7 @@ enum JVIOSLayoutItem {
 *
 * */
 enum JVIOSBarStyle {
-  StatusBarStyleDefault,    // Automatically chooses light or dark content based on the user interface style
+  StatusBarStyleDefault, // Automatically chooses light or dark content based on the user interface style
   StatusBarStyleLightContent, // Light content, for use on dark backgrounds iOS 7 以上
   StatusBarStyleDarkContent // Dark content, for use on light backgrounds  iOS 13 以上
 }