Merge pull request #33 from raoxudong/dev

0.6.1

Author: raoxudong

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.6.1
++ 优化：Android 回调 flutter 的回调函数
++ 优化重复请求逻辑
 ## 0.6.0
 + 新增：SDK 初始化回调监听
 + 新增：授权页弹窗模式

README.md

@@ -5,19 +5,23 @@
 
 在工程 pubspec.yaml 中加入 dependencies
 
-```yaml
-//pub 集成
-dependencies:
-  jverify: 0.6.0
++ github 集成 
 
-  
-//github 集成  
+``` 
 dependencies:
   jverify:
     git:
       url: git://github.com/jpush/jverify-flutter-plugin.git
       ref: master
 ```
+
++ pub 集成
+
+```
+dependencies:
+  jverify: 0.6.1
+```
+
 ### 配置
 
 ##### Android:

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

@@ -10,6 +10,9 @@
 import android.graphics.drawable.StateListDrawable;
 import android.media.Image;
 import android.nfc.Tag;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.Gravity;
@@ -43,6 +46,11 @@
 import io.flutter.plugin.common.MethodChannel.Result;
 import io.flutter.plugin.common.PluginRegistry.Registrar;
 
+class JVRequestItem {
+  public MethodCall call;
+  Result result;
+}
+
 /** JverifyPlugin */
 public class JverifyPlugin implements MethodCallHandler {
 
@@ -60,10 +68,13 @@ public class JverifyPlugin implements MethodCallHandler {
   private static  String  j_opr_key  = "operator";
   // 默认超时时间
   private  static  int j_default_timeout = 5000;
+  // 重复请求
+  private  static  int j_error_code_repeat = -1;
 
 
   private Context context;
   private MethodChannel channel;
+  private HashMap<String,JVRequestItem> requestQueue = new HashMap();
 
   /** Plugin registration. */
   public static void registerWith(Registrar registrar) {
@@ -81,6 +92,29 @@ private JverifyPlugin(Registrar registrar,MethodChannel channel){
   public void onMethodCall(MethodCall call, Result result) {
     Log.d(TAG,"onMethodCall:" + call.method);
 
+//    JVRequestItem item = requestQueue.get(call.method);
+//    if (item == null) {
+//      item = new JVRequestItem();
+//      item.call = call;
+//      item.result = result;
+//
+//      requestQueue.put(call.method,item);
+//
+//      processMethod(call, result);
+//    }else {
+//      String error_repeat_desc = call.method + " is requesting, please try again later.";
+//
+//      Map<String,Object> map = new HashMap<>();
+//      map.put(j_code_key,j_error_code_repeat);
+//      map.put(j_msg_key,error_repeat_desc);
+//
+//      result.success(map);
+//    }
+    processMethod(call,result);
+  }
+
+  private void processMethod(MethodCall call, Result result) {
+    Log.d(TAG,"processMethod:" + call.method);
     if (call.method.equals("setup")) {
       setup(call,result);
     }else if (call.method.equals("setDebugMode")) {
@@ -115,6 +149,34 @@ public void onMethodCall(MethodCall call, Result result) {
     }
   }
 
+  private void methodCallBack(Object object,String method) {
+    Log.d(TAG,"Action - methodCallBack:" + method);
+
+    JVRequestItem item = requestQueue.get(method);
+    if (item != null) {
+      if (item.result != null) {
+        item.result.success(object);
+      }
+    }
+    requestQueue.remove(method);
+  }
+
+  // 主线程再返回数据
+  private void runMainThread(final Map<String,Object> map, final Result result, final String method) {
+    android.os.Handler handler = new Handler(Looper.getMainLooper());
+    handler.post(new Runnable() {
+      @Override
+      public void run() {
+        if (result == null && method != null){
+          channel.invokeMethod(method,map);
+        } else {
+          result.success(map);
+        }
+      }
+    });
+  }
+
+
   /** SDK 初始换  */
   private void setup(MethodCall call,Result result){
     Log.d(TAG,"Action - setup:");
@@ -127,7 +189,8 @@ public void onResult(int code, String message) {
         map.put(j_code_key,code);
         map.put(j_msg_key,message);
         // 通过 channel 返回
-        channel.invokeMethod("onReceiveSDKSetupCallBackEvent",map);
+        //channel.invokeMethod("onReceiveSDKSetupCallBackEvent",map);
+        runMainThread(map,null,"onReceiveSDKSetupCallBackEvent");
       }
     });
   }
@@ -142,7 +205,7 @@ private void setDebugMode(MethodCall call,Result result){
 
     Map<String,Object> map = new HashMap<>();
     map.put(j_result_key,enable);
-    result.success(map);
+    runMainThread(map,result,null);
   }
 
   /** 获取 SDK 初始化是否成功标识 */
@@ -155,7 +218,7 @@ private  boolean isInitSuccess(MethodCall call, Result result) {
 
     Map<String,Object> map = new HashMap<>();
     map.put(j_result_key, isSuccess);
-    result.success(map);
+    runMainThread(map,result,null);
 
     return isSuccess;
   }
@@ -171,13 +234,13 @@ private boolean checkVerifyEnable(MethodCall call,Result result){
 
     Map<String,Object> map = new HashMap<>();
     map.put(j_result_key, verifyEnable);
-    result.success(map);
+    runMainThread(map,result,null);
 
     return verifyEnable;
   }
 
   /** SDK获取号码认证token*/
-  private void getToken(MethodCall call, final Result result) {
+  private void getToken(final MethodCall call, final Result result) {
     Log.d(TAG,"Action - getToken:");
 
     int timeOut = j_default_timeout;
@@ -206,7 +269,8 @@ public void onResult(int code, String content, String operator) {
         map.put(j_code_key,code);
         map.put(j_msg_key,content);
         map.put(j_opr_key,operator);
-        result.success(map);
+
+        runMainThread(map,result,null);
       }
     });
   }
@@ -251,7 +315,7 @@ public void onResult(int code, String content, String operator) {
   }
 
   /** SDK 一键登录预取号 */
-  private  void  preLogin(MethodCall call,final Result result) {
+  private  void  preLogin(final MethodCall call, final Result result) {
     Log.d(TAG,"Action - preLogin:" + call.arguments);
 
     int timeOut = j_default_timeout;
@@ -265,19 +329,21 @@ private  void  preLogin(MethodCall call,final Result result) {
       public void onResult(int code, String message) {
 
         if (code == 7000){//code: 返回码，7000代表获取成功，其他为失败，详见错误码描述
-          Log.d(TAG, "verify consistent, message =" + message);
+          Log.d(TAG, "verify success, message =" + message);
         }else {
-          Log.e(TAG, "code=" + code + ", message =" + message);
+          Log.e(TAG, "verify fail，code=" + code + ", message =" + message);
         }
-
         Map<String,Object> map = new HashMap<>();
         map.put(j_code_key,code);
         map.put(j_msg_key,message);
-        result.success(map);
+
+        runMainThread(map,result,null);
       }
     });
   }
 
+
+
   /** SDK清除预取号缓存 */
   private  void  clearPreLoginCache(MethodCall call,final Result result) {
     Log.d(TAG,"Action - clearPreLoginCache:");
@@ -295,7 +361,7 @@ private void loginAuthSyncApi(MethodCall call,final Result result) {
     Log.d(TAG,"Action - loginAuthSyncApi:");
     loginAuthInterface(true,call,result);
   }
-  private void loginAuthInterface(final Boolean isSync, MethodCall call, final Result result) {
+  private void loginAuthInterface(final Boolean isSync, final MethodCall call, final Result result) {
     Log.d(TAG,"Action - loginAuthInterface:");
 
     Object autoFinish =  getValueByKey(call,"autoDismiss");
@@ -312,7 +378,8 @@ public void onEvent(int cmd, String msg) {
         final HashMap jsonMap = new HashMap();
         jsonMap.put(j_code_key, cmd);
         jsonMap.put(j_msg_key, msg);
-        channel.invokeMethod("onReceiveAuthPageEvent", jsonMap);
+
+        runMainThread(jsonMap,null,"onReceiveAuthPageEvent");
       }
     });
 
@@ -330,10 +397,10 @@ public void onResult(int code, String content, String operator) {
         map.put(j_opr_key,operator);
         if (isSync) {
           // 通过 channel 返回
-          channel.invokeMethod("onReceiveLoginAuthCallBackEvent",map);
+          runMainThread(map,null,"onReceiveLoginAuthCallBackEvent");
         }else {
           // 通过回调返回
-          result.success(map);
+          runMainThread(map,result,null);
         }
       }
     });
@@ -928,7 +995,7 @@ private  void addCustomButtonWidgets(Map para, JVerifyUIConfig.Builder builder)
       @Override
       public void onClicked(Context context, View view) {
         Log.d(TAG,"onClicked button widget.");
-        channel.invokeMethod("onReceiveClickWidgetEvent", jsonMap);
+        runMainThread(jsonMap,null,"onReceiveClickWidgetEvent");
       }
     });
   }

example/ios/Podfile.lock

@@ -1,19 +1,19 @@
 PODS:
   - Flutter (1.0.0)
-  - JCore (2.1.4-noidfa)
-  - JVerification (2.5.2):
+  - JCore (2.1.8)
+  - JVerification (2.5.3):
     - JCore (< 3.0.0, >= 1.2.6)
   - jverify (0.0.1):
     - Flutter
-    - JCore (= 2.1.4-noidfa)
+    - JCore
     - JVerification
 
 DEPENDENCIES:
   - Flutter (from `.symlinks/flutter/ios`)
   - jverify (from `.symlinks/plugins/jverify/ios`)
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  trunk:
     - JCore
     - JVerification
 
@@ -25,10 +25,10 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
-  JCore: 2f15311e6889ab43ed5d629802ef793cac566465
-  JVerification: e62574b51a4a38ee5f7b46140a4698cb215d34ce
-  jverify: ebdfc61d824bb06ba49ba46f52ad3f3b27f00401
+  JCore: a7f1dead960d77a97717c73ea8b0aa5b33706491
+  JVerification: 0d0b4474a250f19ef2bc45da7bd0d0e151350012
+  jverify: 39f3e355cdb0d7c03fd2f8497ea11b273339547f
 
 PODFILE CHECKSUM: aff02bfeed411c636180d6812254b2daeea14d09
 
-COCOAPODS: 1.7.0.beta.2
+COCOAPODS: 1.8.4

example/lib/main.dart

@@ -116,25 +116,13 @@ class _MyAppState extends State<MyApp> {
             ),
             margin: EdgeInsets.fromLTRB(40, 5, 40, 5),
           ),
-          new Container(
-            child: SizedBox(
-              child: new CustomButton(
-                onPressed: () {
-                  verifyNumber();
-                },
-                title: "验证号码",
-              ),
-              width: double.infinity,
-            ),
-            margin: EdgeInsets.fromLTRB(40, 5, 40, 5),
-          ),
           new Container(
             child: SizedBox(
               child: new CustomButton(
                 onPressed: () {
                   preLogin();
                 },
-                title: "登录预号",
+                title: "预取号",
               ),
               width: double.infinity,
             ),
@@ -213,47 +201,18 @@ class _MyAppState extends State<MyApp> {
     });
   }
 
-  /// 发起号码认证，验证手机号码和本机SIM卡号码是否一致
-  void verifyNumber() {
-    print(controllerPHone.text);
-    if (controllerPHone.text == null || controllerPHone.text == "") {
-      setState(() {
-        _result = "电话号码不能为空";
-      });
-      return;
-    }
-    setState(() {
-      _loading = true;
-    });
-    jverify.checkVerifyEnable().then((map) {
-      bool result = map[f_result_key];
-      if (result) {
-        jverify.verifyNumber(controllerPHone.text, token: _token ?? null).then((map) {
-          int code = map[f_code_key];
-          String content = map[f_msg_key];
-          setState(() {
-            _loading = false;
-            _result = "[$code] message = $content";
-          });
-        });
-      } else {
-        setState(() {
-          _loading = false;
-          _result = "[2016], msg = 当前网络环境不支持认证";
-        });
-      }
-    });
-  }
 
   /// 登录预取号
   void preLogin(){
     setState(() {
       _loading = true;
     });
+
     jverify.checkVerifyEnable().then((map) {
       bool result = map[f_result_key];
       if (result) {
         jverify.preLogin().then((map) {
+          print("预取号接口回调：${map.toString()}");
           int code = map[f_code_key];
           String message = map[f_msg_key];
           setState(() {
@@ -477,7 +436,7 @@ class _MyAppState extends State<MyApp> {
 
     jverify.setDebugMode(true); // 打开调试模式
     jverify.setup(
-        appKey: "你自己应用的 AppKey",//"你自己应用的 AppKey",
+        appKey: "a0e6ace8d5b3e0247e3f58db",//"你自己应用的 AppKey",
         channel: "devloper-default"); // 初始化sdk,  appKey 和 channel 只对ios设置有效
     // If the widget was removed from the tree while the asynchronous platform
     // message was in flight, we want to discard the reply rather than calling