Merge pull request #36 from jpush/dev

v0.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/.flutter-plugins-dependencies

@@ -0,0 +1 @@
+{"_info":"// This is a generated file; do not edit or check into version control.","dependencyGraph":[{"name":"jverify","dependencies":[]}]}

example/android/app/build.gradle

@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -35,7 +35,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "cn.jiguang.xx" // 应用包名
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -53,10 +53,23 @@ android {
         ]
     }
 
+    signingConfigs {
+        release {
+            keyAlias 'androiddebugkey'
+            keyPassword 'android'
+            storePassword 'android'
+            storeFile file('debug.keystore')
+        }
+        debug {
+            storeFile file('debug.keystore')
+        }
+    }
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
+            signingConfig signingConfigs.release
+            shrinkResources false
+        }
+        debug {
             signingConfig signingConfigs.debug
         }
     }

example/android/app/src/main/AndroidManifest.xml

@@ -7,6 +7,7 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
+        android:networkSecurityConfig="@xml/network_security_config"
         android:name="io.flutter.app.FlutterApplication"
         android:label="jverify_example"
         android:icon="@mipmap/ic_launcher">

…app/src/main/res/drawable-xhdpi/logo.png …droid/app/src/main/res/drawable/logo.pngexample/android/app/src/main/res/drawable-xhdpi/logo.png renamed to example/android/app/src/main/res/drawable/logo.png example/android/app/src/main/res/drawable-xhdpi/logo.png renamed to example/android/app/src/main/res/drawable/logo.png

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="system" />
+        </trust-anchors>
+    </base-config>
+</network-security-config>

example/android/app/src/main/res/xml/network_security_config.xml

@@ -1 +1,2 @@
 org.gradle.jvmargs=-Xmx1536M
+android.enableR8=true

example/android/gradle.properties

@@ -2,8 +2,9 @@
 # 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_TARGET=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"
+export "FLUTTER_BUILD_NAME=1.0.0"
+export "FLUTTER_BUILD_NUMBER=1"