merge

Author: hyhSuper

.github/workflows/publish.yml

@@ -0,0 +1,24 @@
+name: publish
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Publish
+        uses: sakebook/[email protected]
+        with:
+          credential: ${{ secrets.CREDENTIAL_JSON }}
+          flutter_package: false
+          skip_test: true
+          dry_run: false
+
+

.gitignore

@@ -7,4 +7,5 @@
 build/
 .idea
 .metadata
+pubspec.lock
 .last_build_id

CHANGELOG.md

@@ -1,4 +1,28 @@
-
+## 0.6.22
++ 新增：适配认证Android2.6.7 ios 2.6.6。
+## 0.6.20
++ 新增：添加iOS 授权界面弹出方式 modelTransitionStyle。
+## 0.6.18
++ 修复：修复ios needStartAnim needStartAnim 无效果的bug。
+## 0.6.16
++ 修复：修复ios 添加多个点击事件，响应的都是同一个。
+## 0.6.14
++ 优化：优化体验。
+## 0.6.11
++ 优化：ios 在不选中认证协议的时候，设置是否显示toast提示。
+## 0.6.10
++ 优化：jcore 2.2.5库获取不到的问题
+## 0.6.9
++ 优化：优化android端隐私协议不选中时点击登录按钮，设置是否显示toast提示。具体使用查看 API 文档或者 demo 样例
+## 0.6.8
++ 优化：优化android端隐私协议不选中时点击登录按钮，设置是否显示toast提示。
+## 0.6.7
++ 修复：修复已知问题
+## 0.6.6
++ 修复：修复已知问题
++ 同步 JVerification SDK ios 2.6.3 android 2.6.4 版本
+## 0.6.5
++ 修复：ios隐私页面标题获取异常及navColor问题
 ## 0.6.4
 + 新增：授权页和隐私页状态栏样式
 + 新增：授权页弹出是否使用动画

README.md

@@ -19,7 +19,7 @@ dependencies:
 
 ```
 dependencies:
-  jverify: 0.6.4
+  jverify: 0.6.22
 ```
 
 ### 配置

android/build.gradle

@@ -27,18 +27,30 @@ android {
     defaultConfig {
         minSdkVersion 17
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
-
     }
+
     lintOptions {
         disable 'InvalidPackage'
     }
+    buildTypes {
+        release {
+            minifyEnabled true
+            useProguard true
+            // library 混淆 -> 随 library 引用，自动添加到 apk 打包混淆
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'consumer-rules.pro'
+        }
+        debug {
+            minifyEnabled false
+            useProguard false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'consumer-rules.pro'
+        }
+    }
 
 
 }
 
 dependencies {
     compileOnly files('libs/flutter.jar')
-    implementation 'cn.jiguang.sdk:jverification:2.6.0'
+    implementation 'cn.jiguang.sdk:jverification:2.6.7'
     implementation 'cn.jiguang.sdk:jcore:2.2.6'
 }

android/consumer-rules.pro

@@ -0,0 +1,25 @@
+# 极光一键认证
+
+-dontoptimize
+-dontpreverify
+
+-dontwarn cn.jpush.**
+-keep class cn.jpush.** { *; }
+-dontwarn cn.jiguang.**
+-keep class cn.jiguang.** { *; }
+
+-dontwarn cn.com.chinatelecom.**
+-keep class cn.com.chinatelecom.** { *; }
+-dontwarn com.ct.**
+-keep class com.ct.** { *; }
+-dontwarn a.a.**
+-keep class a.a.** { *; }
+-dontwarn com.cmic.**
+-keep class com.cmic.** { *; }
+-dontwarn com.unicom.**
+-keep class com.unicom.** { *; }
+-dontwarn com.sdk.**
+-keep class com.sdk.** { *; }
+
+-dontwarn com.sdk.**
+-keep class com.sdk.** { *; }

android/src/main/java/com/jiguang/jverify/JverifyPlugin.java

@@ -506,6 +506,7 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
         Object navReturnImgPath = valueForKey(uiconfig, "navReturnImgPath");
         Object navHidden = valueForKey(uiconfig, "navHidden");
         Object navReturnBtnHidden = valueForKey(uiconfig, "navReturnBtnHidden");
+        Object navTransparent = valueForKey(uiconfig, "navTransparent");
 
         Object logoImgPath = valueForKey(uiconfig, "logoImgPath");
         Object logoWidth = valueForKey(uiconfig, "logoWidth");
@@ -583,6 +584,8 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
 
         Object popViewConfig = valueForKey(uiconfig, "popViewConfig");
 
+        Object privacyHintToast = valueForKey(uiconfig, "privacyHintToast");
+
         /************* 状态栏 ***************/
         if (statusBarColorWithNav != null) {
             builder.setStatusBarColorWithNav((Boolean) statusBarColorWithNav);
@@ -647,6 +650,9 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
         if (navReturnBtnHidden != null) {
             builder.setNavReturnBtnHidden((Boolean) navReturnBtnHidden);
         }
+        if (navTransparent != null) {
+            builder.setNavTransparent((Boolean) navTransparent);
+        }
         if (navColor != null) {
             builder.setNavColor(exchangeObject(navColor));
         }
@@ -850,7 +856,7 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
             }
         }
 
-        builder.enableHintToast(true, null);
+        builder.enableHintToast((Boolean)privacyHintToast, null);
         /************** 授权页弹窗模式 ***************/
         if (popViewConfig != null) {
             Map popViewConfigMap = (Map) popViewConfig;