Merge pull request #135 from skill20/dev-2.x

修复setup 接口不会回调问题

Author: skill20

CHANGELOG.md

@@ -1,3 +1,5 @@
+## 2.1.4
++ 修复：修复setup 接口不会回调问题
 ## 2.1.2
 + 升级：升级 android 认证 2.7.2 jcore 2.8.2，ios 2.7.1
 ## 2.1.0

README.md

@@ -19,7 +19,7 @@ dependencies:
 
 ```
 dependencies:
-  jverify: 2.1.2
+  jverify: 2.1.4
 ```
 
 ### 配置

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

@@ -587,7 +587,7 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
         Object privacyNavColor = valueForKey(uiconfig, "privacyNavColor");
         Object privacyNavTitleTextColor = valueForKey(uiconfig, "privacyNavTitleTextColor");
         Object privacyNavTitleTextSize = valueForKey(uiconfig, "privacyNavTitleTextSize");
-        Object privacyNavReturnBtnImage = valueForKey(uiconfig, "privacyNavReturnBtnImage");
+        Object privacyNavReturnBtnPath = valueForKey(uiconfig, "privacyNavReturnBtnImage");
         Object privacyNavTitleTitle1 = valueForKey(uiconfig, "privacyNavTitleTitle1");
         Object privacyNavTitleTitle2 = valueForKey(uiconfig, "privacyNavTitleTitle2");
 
@@ -890,12 +890,10 @@ private void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder)
             builder.setAppPrivacyNavTitle2((String) privacyNavTitleTitle2);
         }
 
-        if (privacyNavReturnBtnImage != null) {
-            int res_id = getResourceByReflect((String) privacyNavReturnBtnImage);
+        if (privacyNavReturnBtnPath != null) {
+            int res_id = getResourceByReflect((String) privacyNavReturnBtnPath);
             if (res_id > 0) {
-                ImageView view = new ImageView(context);
-                view.setImageResource(res_id);
-                builder.setPrivacyNavReturnBtn(view);
+                builder.setPrivacyNavReturnBtnPath((String) privacyNavReturnBtnPath);
             }
         }
 

example/android/app/src/main/res/drawable-xxhdpi-v4/back.png

@@ -381,7 +381,7 @@ class _MyAppState extends State<MyApp> {
         uiConfig.privacyNavTitleTitle = "ios lai le"; //only ios
         uiConfig.privacyNavTitleTitle1 = "协议11 web页标题";
         uiConfig.privacyNavTitleTitle2 = "协议22 web页标题";
-        uiConfig.privacyNavReturnBtnImage = "return_bg"; //图片必须存在;
+        uiConfig.privacyNavReturnBtnImage = "back"; //图片必须存在;
 
         //弹框模式
         // JVPopViewConfig popViewConfig = JVPopViewConfig();

example/lib/main.dart

@@ -776,9 +776,9 @@ enum JVTextAlignmentType { left, right, center }
 
 /// 监听返回类
 class JVListenerEvent {
-  int code; //返回码，具体事件返回码请查看（https://docs.jiguang.cn/jverification/client/android_api/）
-  String message; //事件描述、事件返回值等
-  String operator; //成功时为对应运营商，CM代表中国移动，CU代表中国联通，CT代表中国电信。失败时可能为null
+  int?      code; //返回码，具体事件返回码请查看（https://docs.jiguang.cn/jverification/client/android_api/）
+  String? message; //事件描述、事件返回值等
+  String? operator; //成功时为对应运营商，CM代表中国移动，CU代表中国联通，CT代表中国电信。失败时可能为null
 
   JVListenerEvent.fromJson(Map<dynamic, dynamic> json)
       : code = json['code'],

lib/jverify.dart

@@ -1,6 +1,6 @@
 name: jverify
 description: JIGUANG Official Jverifycation SDK flutter plugin project.
-version: 2.1.2
+version: 2.1.4
 homepage: https://www.jiguang.cn
 
 environment: