Merge pull request #39 from jpush/dev

v0.6.2

Author: raoxudong

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.6.2
++ 同步 JVerification SDK 版本
++ 内部安全策略优化
 ## 0.6.1
 + 优化：Android 回调 flutter 的回调函数
 + 优化重复请求逻辑

README.md

@@ -19,7 +19,7 @@ dependencies:
 
 ```
 dependencies:
-  jverify: 0.6.1
+  jverify: 0.6.2
 ```
 
 ### 配置

android/build.gradle

@@ -25,7 +25,7 @@ android {
     compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 17
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
 
@@ -40,5 +40,5 @@ android {
 dependencies {
     compileOnly files('libs/flutter.jar')
     implementation 'cn.jiguang.sdk:jverification:2.5.2'
-    implementation 'cn.jiguang.sdk:jcore:2.1.6'
+    implementation 'cn.jiguang.sdk:jcore:2.2.6'
 }

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

@@ -46,10 +46,7 @@
 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 {
@@ -74,7 +71,6 @@ public class JverifyPlugin implements MethodCallHandler {
 
   private Context context;
   private MethodChannel channel;
-  private HashMap<String,JVRequestItem> requestQueue = new HashMap();
 
   /** Plugin registration. */
   public static void registerWith(Registrar registrar) {
@@ -92,28 +88,6 @@ 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);
@@ -149,17 +123,6 @@ private void processMethod(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) {

example/android/app/build.gradle

@@ -34,7 +34,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "cn.jiguang.xx" // 应用包名
-        minSdkVersion 16
+        minSdkVersion 17
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

example/android/gradle.properties

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

example/lib/main.dart

@@ -82,7 +82,7 @@ class _MyAppState extends State<MyApp> {
                     onPressed: (){
                       isInitSuccess();
                     },
-                    title: "SDK 是否初始化成功"
+                    title: "初始化状态"
                 ),
                 new Text("   "),
                 new CustomButton(

example/pubspec.lock

@@ -87,7 +87,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.6.1"
+    version: "0.6.2"
   matcher:
     dependency: transitive
     description:

pubspec.lock

@@ -1,13 +1,27 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.11"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.5.2"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.3.0"
+    version: "2.4.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -29,6 +43,20 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.14.11"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.1.1"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.1.3"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -39,20 +67,27 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.1.4"
   matcher:
     dependency: transitive
     description:
       name: matcher
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.12.5"
+    version: "0.12.6"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
   path:
     dependency: transitive
     description:
@@ -67,6 +102,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.8.0+1"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.4.0"
   platform:
     dependency: "direct main"
     description:
@@ -127,7 +169,7 @@ packages:
       name: test_api
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.2.5"
+    version: "0.2.11"
   typed_data:
     dependency: transitive
     description:
@@ -142,5 +184,12 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.8"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.5.0"
 sdks:
-  dart: ">=2.2.2 <3.0.0"
+  dart: ">=2.4.0 <3.0.0"

pubspec.yaml

@@ -1,6 +1,6 @@
 name: jverify
 description: JIGUANG Official Jverifycation SDK flutter plugin project.
-version: 0.6.1
+version: 0.6.2
 author:  xudong.rao <[email protected]>
 homepage: https://www.jiguang.cn