Merge pull request #30 from jpush/dev

v0.6.0

Author: raoxudong

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.6.0
++ 新增：SDK 初始化回调监听
++ 新增：授权页弹窗模式
++ 修复：授权页无法唤起问题
++ 同步 JVerification SDK 2.5.2 版本
 ## 0.5.2
 + 修复：授权登录回调通知 bug
 ## 0.5.1

README.md

@@ -8,7 +8,7 @@
 ```yaml
 //pub 集成
 dependencies:
-  jverify: 0.5.2
+  jverify: 0.6.0
 
 
 //github 集成  

android/build.gradle

@@ -39,6 +39,6 @@ android {
 
 dependencies {
     compileOnly files('libs/flutter.jar')
-    implementation 'cn.jiguang.sdk:jverification:2.5.0'
-    implementation 'cn.jiguang.sdk:jcore:2.1.2'
+    implementation 'cn.jiguang.sdk:jverification:2.5.2'
+    implementation 'cn.jiguang.sdk:jcore:2.1.6'
 }

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

@@ -33,7 +33,9 @@
 import cn.jiguang.verifysdk.api.JVerificationInterface;
 import cn.jiguang.verifysdk.api.JVerifyUIClickCallback;
 import cn.jiguang.verifysdk.api.JVerifyUIConfig;
+import cn.jiguang.verifysdk.api.LoginSettings;
 import cn.jiguang.verifysdk.api.PreLoginListener;
+import cn.jiguang.verifysdk.api.RequestCallback;
 import cn.jiguang.verifysdk.api.VerifyListener;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
@@ -116,7 +118,18 @@ public void onMethodCall(MethodCall call, Result result) {
   /** SDK 初始换  */
   private void setup(MethodCall call,Result result){
     Log.d(TAG,"Action - setup:");
-    JVerificationInterface.init(context);
+
+    Object timeout =  getValueByKey(call,"timeout");
+    JVerificationInterface.init(context, (Integer)timeout, new RequestCallback<String>() {
+      @Override
+      public void onResult(int code, String message) {
+        Map<String,Object> map = new HashMap<>();
+        map.put(j_code_key,code);
+        map.put(j_msg_key,message);
+        // 通过 channel 返回
+        channel.invokeMethod("onReceiveSDKSetupCallBackEvent",map);
+      }
+    });
   }
 
   /** SDK设置debug模式 */
@@ -286,8 +299,24 @@ private void loginAuthInterface(final Boolean isSync, MethodCall call, final Res
     Log.d(TAG,"Action - loginAuthInterface:");
 
     Object autoFinish =  getValueByKey(call,"autoDismiss");
+    Integer timeOut = call.argument("timeout");
+
+    LoginSettings settings = new LoginSettings();
+    settings.setAutoFinish((Boolean)autoFinish);
+    settings.setTimeout(timeOut);
+    settings.setAuthPageEventListener(new AuthPageEventListener() {
+      @Override
+      public void onEvent(int cmd, String msg) {
+        Log.d(TAG,"Action - AuthPageEventListener: cmd = " + cmd);
+        /// 事件
+        final HashMap jsonMap = new HashMap();
+        jsonMap.put(j_code_key, cmd);
+        jsonMap.put(j_msg_key, msg);
+        channel.invokeMethod("onReceiveAuthPageEvent", jsonMap);
+      }
+    });
 
-    JVerificationInterface.loginAuth(context, (Boolean) autoFinish, new VerifyListener() {
+    JVerificationInterface.loginAuth(context, settings, new VerifyListener() {
       @Override
       public void onResult(int code, String content, String operator) {
         if (code == 6000){
@@ -307,16 +336,6 @@ public void onResult(int code, String content, String operator) {
           result.success(map);
         }
       }
-    }, new AuthPageEventListener() {
-      @Override
-      public void onEvent(int cmd, String msg) {
-        Log.d(TAG,"Action - AuthPageEventListener: cmd = " + cmd);
-        /// 事件
-        final HashMap jsonMap = new HashMap();
-        jsonMap.put(j_code_key, cmd);
-        jsonMap.put(j_msg_key, msg);
-        channel.invokeMethod("onReceiveAuthPageEvent", jsonMap);
-      }
     });
   }
 
@@ -325,6 +344,12 @@ private  void dismissLoginAuthView(MethodCall call, Result result) {
     Log.d(TAG,"Action - dismissLoginAuthView:");
 
     JVerificationInterface.dismissLoginAuthActivity();
+    JVerificationInterface.dismissLoginAuthActivity(true, new RequestCallback<String>() {
+      @Override
+      public void onResult(int i, String s) {
+
+      }
+    });
   }
 
   /** 自定义授权界面 UI 、添加自定义控件*/
@@ -474,8 +499,10 @@ private  void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder
     Object privacyNavTitleTextColor = valueForKey(uiconfig,"privacyNavTitleTextColor");
     Object privacyNavTitleTextSize = valueForKey(uiconfig,"privacyNavTitleTextSize");
     Object privacyNavReturnBtnImage = valueForKey(uiconfig,"privacyNavReturnBtnImage");
+    Object privacyNavTitleTitle1 = valueForKey(uiconfig,"privacyNavTitleTitle1");
+    Object privacyNavTitleTitle2 = valueForKey(uiconfig,"privacyNavTitleTitle2");
 
-
+    Object popViewConfig = valueForKey(uiconfig,"popViewConfig");
 
     /************** 背景 ***************/
     if (authBackgroundImage != null ){
@@ -677,6 +704,12 @@ private  void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder
     if (privacyNavTitleTextColor != null){
       builder.setPrivacyNavTitleTextColor(exchangeObject(privacyNavTitleTextColor));
     }
+    if (privacyNavTitleTitle1 != null) {
+      builder.setAppPrivacyNavTitle1((String) privacyNavTitleTitle1);
+    }
+    if (privacyNavTitleTitle2 != null) {
+      builder.setAppPrivacyNavTitle2((String) privacyNavTitleTitle2);
+    }
 
     if (privacyNavReturnBtnImage != null){
       int res_id = getResourceByReflect((String)privacyNavReturnBtnImage);
@@ -686,6 +719,23 @@ private  void layoutOriginOuthView(Map uiconfig, JVerifyUIConfig.Builder builder
         builder.setPrivacyNavReturnBtn(view);
       }
     }
+
+    builder.enableHintToast(true,null);
+    /************** 授权页弹窗模式 ***************/
+    if (popViewConfig != null) {
+      Map popViewConfigMap = (Map)popViewConfig;
+      Object isPopViewTheme = valueForKey(popViewConfigMap,"isPopViewTheme");
+      if ((Boolean) isPopViewTheme) {
+        Object width = valueForKey(popViewConfigMap,"width");
+        Object height = valueForKey(popViewConfigMap,"height");
+        Object offsetCenterX = valueForKey(popViewConfigMap,"offsetCenterX");
+        Object offsetCenterY = valueForKey(popViewConfigMap,"offsetCenterY");
+        Object isBottom = valueForKey(popViewConfigMap,"isBottom");
+
+        builder.setDialogTheme((int)width, (int)height, (int)offsetCenterX, (int)offsetCenterY, (Boolean)isBottom);
+
+      }
+    }
   }
 
   /** 添加自定义 widget 到 SDK 原有的授权界面里 */

documents/APIs.md

@@ -94,7 +94,7 @@ jverify.addLoginAuthCallBackListener((event){
 jverify.loginAuthSyncApi(autoDismiss: true);
 
 /*   
-/// 方式二：使用异步接口 （如果想使用异步接口，则忽略此步骤，看方式一）
+/// 方式二：使用异步接口 （如果想使用同步接口，则忽略此步骤，看方式一）
     
 /// 先，执行异步的一键登录接口
 jverify.loginAuth(true).then((map) {

example/ios/Flutter/flutter_export_environment.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+# This is a generated file; do not edit or check into version control.
+export "FLUTTER_ROOT=/Applications/flutter"
+export "FLUTTER_APPLICATION_PATH=/Users/raoxudong/JPush/jpush-github/jverify-flutter-plugin/example"
+export "FLUTTER_TARGET=/Users/raoxudong/JPush/jpush-github/jverify-flutter-plugin/example/lib/main.dart"
+export "FLUTTER_BUILD_DIR=build"
+export "SYMROOT=${SOURCE_ROOT}/../build/ios"
+export "FLUTTER_FRAMEWORK_DIR=/Applications/flutter/bin/cache/artifacts/engine/ios"
+export "TRACK_WIDGET_CREATION=true"

example/ios/Podfile.lock

@@ -1,12 +1,12 @@
 PODS:
   - Flutter (1.0.0)
   - JCore (2.1.4-noidfa)
-  - JVerification (2.5.0):
+  - JVerification (2.5.2):
     - JCore (< 3.0.0, >= 1.2.6)
   - jverify (0.0.1):
     - Flutter
     - JCore (= 2.1.4-noidfa)
-    - JVerification (= 2.5.0)
+    - JVerification
 
 DEPENDENCIES:
   - Flutter (from `.symlinks/flutter/ios`)
@@ -24,10 +24,10 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/jverify/ios"
 
 SPEC CHECKSUMS:
-  Flutter: 58dd7d1b27887414a370fcccb9e645c08ffd7a6a
+  Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
   JCore: 2f15311e6889ab43ed5d629802ef793cac566465
-  JVerification: e51834e1c7f0f1b6b911987234a57bf80b9eeff8
-  jverify: 8a4261f246cf320f412d4f8fa8f7b3b2cb134dc9
+  JVerification: e62574b51a4a38ee5f7b46140a4698cb215d34ce
+  jverify: ebdfc61d824bb06ba49ba46f52ad3f3b27f00401
 
 PODFILE CHECKSUM: aff02bfeed411c636180d6812254b2daeea14d09
 

example/lib/main.dart

@@ -358,6 +358,8 @@ 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.privacyNavReturnBtnImage = "return_bg";//图片必须存在;
 
         /// 添加自定义的 控件 到授权界面
@@ -409,6 +411,15 @@ class _MyAppState extends State<MyApp> {
         */
 
 
+        /* 弹框模式
+        JVPopViewConfig popViewConfig = JVPopViewConfig();
+        popViewConfig.width = (screenWidth - 100.0).toInt();
+        popViewConfig.height = (screenHeight - 150.0).toInt();
+
+        uiConfig.popViewConfig = popViewConfig;
+        */
+
+
         /// 步骤 1：调用接口设置 UI
         jverify.setCustomAuthorizationView(true, uiConfig, landscapeConfig: uiConfig);
 
@@ -458,7 +469,13 @@ class _MyAppState extends State<MyApp> {
   // Platform messages are asynchronous, so we initialize in an async method.
   Future<void> initPlatformState() async {
     String platformVersion;
-    jverify.setDebugMode(false); // 打开调试模式
+
+    // 初始化 SDK 之前添加监听
+    jverify.addSDKSetupCallBackListener((JVSDKSetupEvent event){
+      print("receive sdk setup call back event :${event.toMap()}");
+    });
+
+    jverify.setDebugMode(true); // 打开调试模式
     jverify.setup(
         appKey: "你自己应用的 AppKey",//"你自己应用的 AppKey",
         channel: "devloper-default"); // 初始化sdk,  appKey 和 channel 只对ios设置有效

example/pubspec.lock

@@ -7,14 +7,14 @@ packages:
       name: async
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   charcode:
     dependency: transitive
     description:
@@ -52,7 +52,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.5.2"
+    version: "0.6.0"
   matcher:
     dependency: transitive
     description:
@@ -66,7 +66,7 @@ packages:
       name: meta
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.6"
+    version: "1.1.7"
   modal_progress_hud:
     dependency: "direct main"
     description:
@@ -80,14 +80,14 @@ packages:
       name: path
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.6.2"
+    version: "1.6.4"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0+1"
   platform:
     dependency: transitive
     description:
@@ -101,7 +101,7 @@ packages:
       name: quiver
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.5"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -134,7 +134,7 @@ packages:
       name: string_scanner
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   term_glyph:
     dependency: transitive
     description: