From 0cf5fccdf4cadef0bdaafd73d633c8d5ee17eb07 Mon Sep 17 00:00:00 2001 From: "qingqing.wang" Date: Mon, 15 Jun 2020 13:50:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?v0.6.10=20=E4=BF=AE=E6=94=B9ios=E4=BE=9D?= =?UTF-8?q?=E8=B5=96jcore=E7=89=88=E6=9C=AC2.2.5=E6=89=BE=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E5=BA=93=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 +++ README.md | 2 +- example/.flutter-plugins-dependencies | 1 - ios/jverify.podspec | 2 +- pubspec.yaml | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 example/.flutter-plugins-dependencies diff --git a/CHANGELOG.md b/CHANGELOG.md index 7628814..9db72ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ + +## 0.6.10 ++ 优化：jcore 2.2.5库获取不到的问题 ## 0.6.9 + 优化：优化android端隐私协议不选中时点击登录按钮，设置是否显示toast提示。具体使用查看 API 文档或者 demo 样例 ## 0.6.8 diff --git a/README.md b/README.md index d0f5fae..b470c47 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ dependencies: ``` dependencies: - jverify: 0.6.9 + jverify: 0.6.10 ``` ### 配置 diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies deleted file mode 100644 index a6e67ad..0000000 --- a/example/.flutter-plugins-dependencies +++ /dev/null @@ -1 +0,0 @@ -{"_info":"// This is a generated file; do not edit or check into version control.","dependencyGraph":[{"name":"jverify","dependencies":[]}]} \ No newline at end of file diff --git a/ios/jverify.podspec b/ios/jverify.podspec index 7132e6c..421be70 100644 --- a/ios/jverify.podspec +++ b/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 diff --git a/pubspec.yaml b/pubspec.yaml index a6f7702..7142ba0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: jverify description: JIGUANG Official Jverifycation SDK flutter plugin project. -version: 0.6.9 +version: 0.6.10 author: xudong.rao homepage: https://www.jiguang.cn From d208736167424b60ddcf937d3ac7e366a612fce2 Mon Sep 17 00:00:00 2001 From: wangqingqing Date: Wed, 17 Jun 2020 11:04:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?ios=20=E4=B8=8D=E9=80=89=E6=8B=A9=E5=90=8C?= =?UTF-8?q?=E6=84=8F=E5=8D=8F=E8=AE=AE=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=98=AF=E5=90=A6=E5=BC=B9=E5=87=BAtoast?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 ++- README.md | 2 +- documents/APIs.md | 2 +- example/.gitignore | 3 ++- example/lib/main.dart | 2 +- ios/Classes/JverifyPlugin.m | 12 ++++++++++++ lib/jverify.dart | 2 +- pubspec.yaml | 2 +- 8 files changed, 21 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9db72ae..9c3ca44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ - +## 0.6.11 ++ 优化：ios 在不选中认证协议的时候，设置是否显示toast提示。 ## 0.6.10 + 优化：jcore 2.2.5库获取不到的问题 ## 0.6.9 diff --git a/README.md b/README.md index b470c47..0529bdc 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ dependencies: ``` dependencies: - jverify: 0.6.10 + jverify: 0.6.11 ``` ### 配置 diff --git a/documents/APIs.md b/documents/APIs.md index f18db10..c1f37c2 100644 --- a/documents/APIs.md +++ b/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| diff --git a/example/.gitignore b/example/.gitignore index eff2200..5275690 100644 --- a/example/.gitignore +++ b/example/.gitignore @@ -70,4 +70,5 @@ !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages **/ios/**/Podfile.lock -**/ios/**/Runner.xcworkspace/ \ No newline at end of file +**/ios/**/Runner.xcworkspace/ +.flutter-plugins-dependencies \ No newline at end of file diff --git a/example/lib/main.dart b/example/lib/main.dart index 9576e59..e01a6ed 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -333,7 +333,7 @@ class _MyAppState extends State { 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; diff --git a/ios/Classes/JverifyPlugin.m b/ios/Classes/JverifyPlugin.m index f759d5b..b172a02 100644 --- a/ios/Classes/JverifyPlugin.m +++ b/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; diff --git a/lib/jverify.dart b/lib/jverify.dart index a839002..08eba5d 100644 --- a/lib/jverify.dart +++ b/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是否相对协议文字纵向居中 diff --git a/pubspec.yaml b/pubspec.yaml index 7142ba0..635f756 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: jverify description: JIGUANG Official Jverifycation SDK flutter plugin project. -version: 0.6.10 +version: 0.6.11 author: xudong.rao homepage: https://www.jiguang.cn From 440380ed69fc0d69f64fc9d03f3d9e34fbc5c3ca Mon Sep 17 00:00:00 2001 From: wangqingqing Date: Wed, 17 Jun 2020 11:04:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?ios=20=E4=B8=8D=E9=80=89=E6=8B=A9=E5=90=8C?= =?UTF-8?q?=E6=84=8F=E5=8D=8F=E8=AE=AE=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=98=AF=E5=90=A6=E5=BC=B9=E5=87=BAtoast?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 +- README.md | 2 +- documents/APIs.md | 2 +- example/.gitignore | 3 +- example/ios/Runner.xcodeproj/project.pbxproj | 38 ++++++++++---------- example/lib/main.dart | 2 +- ios/Classes/JverifyPlugin.m | 12 +++++++ lib/jverify.dart | 2 +- pubspec.yaml | 2 +- 9 files changed, 40 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9db72ae..9c3ca44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ - +## 0.6.11 ++ 优化：ios 在不选中认证协议的时候，设置是否显示toast提示。 ## 0.6.10 + 优化：jcore 2.2.5库获取不到的问题 ## 0.6.9 diff --git a/README.md b/README.md index b470c47..0529bdc 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ dependencies: ``` dependencies: - jverify: 0.6.10 + jverify: 0.6.11 ``` ### 配置 diff --git a/documents/APIs.md b/documents/APIs.md index f18db10..c1f37c2 100644 --- a/documents/APIs.md +++ b/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| diff --git a/example/.gitignore b/example/.gitignore index eff2200..5275690 100644 --- a/example/.gitignore +++ b/example/.gitignore @@ -70,4 +70,5 @@ !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages **/ios/**/Podfile.lock -**/ios/**/Runner.xcworkspace/ \ No newline at end of file +**/ios/**/Runner.xcworkspace/ +.flutter-plugins-dependencies \ No newline at end of file diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 99011b5..9827f94 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/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 */ diff --git a/example/lib/main.dart b/example/lib/main.dart index 9576e59..e01a6ed 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -333,7 +333,7 @@ class _MyAppState extends State { 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; diff --git a/ios/Classes/JverifyPlugin.m b/ios/Classes/JverifyPlugin.m index f759d5b..b172a02 100644 --- a/ios/Classes/JverifyPlugin.m +++ b/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; diff --git a/lib/jverify.dart b/lib/jverify.dart index a839002..08eba5d 100644 --- a/lib/jverify.dart +++ b/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是否相对协议文字纵向居中 diff --git a/pubspec.yaml b/pubspec.yaml index 7142ba0..635f756 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: jverify description: JIGUANG Official Jverifycation SDK flutter plugin project. -version: 0.6.10 +version: 0.6.11 author: xudong.rao homepage: https://www.jiguang.cn