Merge pull request #74 from skill20/dev

v0.6.11 设置是否在不选中认证协议的时候是否弹出提示

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.6.11
++ 优化：ios 在不选中认证协议的时候，设置是否显示toast提示。
+## 0.6.10
++ 优化：jcore 2.2.5库获取不到的问题
 ## 0.6.9
 + 优化：优化android端隐私协议不选中时点击登录按钮，设置是否显示toast提示。具体使用查看 API 文档或者 demo 样例
 ## 0.6.8

README.md

@@ -19,7 +19,7 @@ dependencies:
 
 ```
 dependencies:
- jverify: 0.6.9
+ jverify: 0.6.11
 ```
 
 ### 配置

documents/APIs.md

@@ -499,10 +499,10 @@ jverify.getSMSCode(phone,{signId:signId,tempId:tempId}).then((map){
 |virtualButtonTransparent |boolean |设置授权页虚拟按键栏背景是否透明(android)|
 |privacyStatusBarColorWithNav |boolean |设置隐私页状态栏与导航栏同色(android)|
 |privacyStatusBarDarkMode |boolean |设置隐私页状态栏暗色模式(android)|
-|privacyHintToast |boolean |设置隐私条款不选中时点击登录按钮默认弹出toast。(android)|
 |privacyStatusBarTransparent |boolean |设置隐私页状态栏是否透明(android)|
 |privacyStatusBarHidden |boolean |设置隐私页状态栏是否隐藏(android)|
 |privacyVirtualButtonTransparent |boolean |设置隐私页虚拟按键栏背景是否透明(android)|
+|privacyHintToast |boolean |设置隐私条款不选中时点击登录按钮默认弹出toast|
 |needStartAnim |boolean |设置拉起授权页时是否需要显示默认动画|
 |needCloseAnim |boolean |设置关闭授权页时是否需要显示默认动画|
 |StatusBarStyleDefault |enum |Automatically chooses light or dark content based on the user interface style|

example/.gitignore

@@ -70,4 +70,5 @@
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
 
 **/ios/**/Podfile.lock
-**/ios/**/Runner.xcworkspace/
+**/ios/**/Runner.xcworkspace/
+.flutter-plugins-dependencies

example/ios/Runner.xcodeproj/project.pbxproj

@@ -178,7 +178,7 @@
  97C146EC1CF9000F007C117D /* Resources */,
  9705A1C41CF9048500538489 /* Embed Frameworks */,
  3B06AD1E1E4923F5004D2608 /* Thin Binary */,
- D166C758B9692330C07C5D0D /* [CP] Embed Pods Frameworks */,
+ 3EAA4E67215C408AB6EF1883 /* [CP] Embed Pods Frameworks */,
  );
  buildRules = (
  );
@@ -253,6 +253,24 @@
  shellPath = /bin/sh;
  shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
  };
+ 3EAA4E67215C408AB6EF1883 /* [CP] Embed Pods Frameworks */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
+ "${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
+ );
+ name = "[CP] Embed Pods Frameworks";
+ outputPaths = (
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+ showEnvVarsInLog = 0;
+ };
  881F7F5C9B13C6100922CDA7 /* [CP] Check Pods Manifest.lock */ = {
  isa = PBXShellScriptBuildPhase;
  buildActionMask = 2147483647;
@@ -289,24 +307,6 @@
  shellPath = /bin/sh;
  shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
  };
- D166C758B9692330C07C5D0D /* [CP] Embed Pods Frameworks */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
- "${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
- );
- name = "[CP] Embed Pods Frameworks";
- outputPaths = (
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
- showEnvVarsInLog = 0;
- };
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

example/lib/main.dart

@@ -333,7 +333,7 @@ class _MyAppState extends State<MyApp> {
  uiConfig.loginBtnPressedImage = "login_btn_press";//图片必须存在
  uiConfig.loginBtnUnableImage = "login_btn_unable";//图片必须存在
 
- uiConfig.privacyHintToast = false;//only android 设置隐私条款不选中时点击登录按钮默认显示toast。
+ uiConfig.privacyHintToast = true;//only android 设置隐私条款不选中时点击登录按钮默认显示toast。
 
  uiConfig.privacyState = true;//设置默认勾选
  uiConfig.privacyCheckboxSize = 20;

ios/Classes/JverifyPlugin.m

@@ -632,6 +632,18 @@ - (void)setCustomUIWithUIConfig:(JVUIConfig *)uiconfig configArguments:(NSDictio
  }
 
  /************** privacy ***************/
+ BOOL privacyHintToast = [[self getValue:config key:@"privacyHintToast"] boolValue];
+ if(privacyHintToast){
+ uiconfig.customPrivacyAlertViewBlock = ^(UIViewController *vc) {
+ UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"请点击同意协议" message:nil preferredStyle:UIAlertControllerStyleAlert];
+ [alert addAction:[UIAlertAction actionWithTitle:@"确定" style:UIAlertActionStyleDefault handler:nil] ];
+ [vc presentViewController:alert animated:true completion:nil];
+
+ };
+ }
+
+
+
  BOOL isCenter = [[self getValue:config key:@"privacyTextCenterGravity"] boolValue];
  NSTextAlignment alignmet = isCenter?NSTextAlignmentCenter:NSTextAlignmentLeft;
  uiconfig.privacyTextAlignment = alignmet;

ios/jverify.podspec

@@ -15,7 +15,7 @@ A new flutter plugin project.
  s.source_files = 'Classes/**/*'
  s.public_header_files = 'Classes/**/*.h'
  s.dependency 'Flutter'
- s.dependency 'JCore'
+ s.dependency 'JCore', '2.2.5'
  s.dependency 'JVerification', '2.6.3'
  s.ios.deployment_target = '8.0'
  s.static_framework = true

lib/jverify.dart

@@ -511,7 +511,7 @@ class JVUIConfig {
  String uncheckedImgPath;
  String checkedImgPath;
  int privacyCheckboxSize;
- bool privacyHintToast = true;//only android 设置隐私条款不选中时点击登录按钮默认弹出toast。
+ bool privacyHintToast = true;//设置隐私条款不选中时点击登录按钮默认弹出toast。
  bool privacyState = false; //设置隐私条款默认选中状态，默认不选中
  bool privacyCheckboxHidden = false; //设置隐私条款checkbox是否隐藏
  bool privacyCheckboxInCenter = false; //设置隐私条款checkbox是否相对协议文字纵向居中

pubspec.yaml

@@ -1,6 +1,6 @@
 name: jverify
 description: JIGUANG Official Jverifycation SDK flutter plugin project.
-version: 0.6.9
+version: 0.6.11
 author: xudong.rao <xudong.rao@outlook.com>
 homepage: https://www.jiguang.cn