roll engine #54f68d82

fluttify-project · Nov 16, 2020 · 12900b8 · 12900b8
1 parent 451fa03
commit 12900b8
Show file tree

Hide file tree

Showing 63 changed files with 9,527 additions and 15,323 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -0,0 +1,9 @@
+include: package:pedantic/analysis_options.yaml
+
+linter:
+  rules:
+    camel_case_types: false
+    camel_case_extensions: false
+    omit_local_variable_types: false
+    prefer_single_quotes: false
+    unnecessary_this: false
diff --git a/android/build.gradle b/android/build.gradle
@@ -71,5 +71,5 @@ dependencies {
     // flutter plugin dependency
 
     // sdk dependency
-    api 'cn.jiguang.sdk:jcore:2.3.2'
+    api 'cn.jiguang.sdk:jcore:2.5.5'
 }
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
diff --git a/android/src/main/java/me/yohom/jcore_fluttify/JcoreFluttifyPlugin.java b/android/src/main/java/me/yohom/jcore_fluttify/JcoreFluttifyPlugin.java
@@ -54,8 +54,7 @@ public static void registerWith(Registrar registrar) {
         handlerMapList.add(SubHandler0.getSubHandler(messenger));
         handlerMapList.add(SubHandler1.getSubHandler(messenger));
         handlerMapList.add(SubHandler2.getSubHandler(messenger));
-        handlerMapList.add(SubHandler3.getSubHandler(messenger));
-        handlerMapList.add(SubHandlerCustom.getSubHandler(messenger, registrar.activity()));
+        handlerMapList.add(SubHandlerCustom.instance.getSubHandler(messenger, registrar.activity()));
 
         channel.setMethodCallHandler(plugin);
 
@@ -82,7 +81,6 @@ public void onAttachedToEngine(FlutterPluginBinding binding) {
         handlerMapList.add(SubHandler0.getSubHandler(messenger));
         handlerMapList.add(SubHandler1.getSubHandler(messenger));
         handlerMapList.add(SubHandler2.getSubHandler(messenger));
-        handlerMapList.add(SubHandler3.getSubHandler(messenger));
 
         channel.setMethodCallHandler(this);
     }
@@ -101,7 +99,7 @@ public void onAttachedToActivity(ActivityPluginBinding binding) {
         }
         Activity activity = binding.getActivity();
 
-        handlerMapList.add(SubHandlerCustom.getSubHandler(messenger, activity));
+        handlerMapList.add(SubHandlerCustom.instance.getSubHandler(messenger, activity));
 
         // register platform view
 

diff --git a/android/src/main/java/me/yohom/jcore_fluttify/sub_handler/SubHandler0.java b/android/src/main/java/me/yohom/jcore_fluttify/sub_handler/SubHandler0.java
diff --git a/android/src/main/java/me/yohom/jcore_fluttify/sub_handler/SubHandler1.java b/android/src/main/java/me/yohom/jcore_fluttify/sub_handler/SubHandler1.java
diff --git a/android/src/main/java/me/yohom/jcore_fluttify/sub_handler/SubHandler2.java b/android/src/main/java/me/yohom/jcore_fluttify/sub_handler/SubHandler2.java
diff --git a/android/src/main/java/me/yohom/jcore_fluttify/sub_handler/SubHandler3.java b/android/src/main/java/me/yohom/jcore_fluttify/sub_handler/SubHandler3.java
diff --git a/android/src/main/java/me/yohom/jcore_fluttify/sub_handler/custom/SubHandlerCustom.java b/android/src/main/java/me/yohom/jcore_fluttify/sub_handler/custom/SubHandlerCustom.java
@@ -28,7 +28,11 @@
 
 @SuppressWarnings("ALL")
 public class SubHandlerCustom {
-    public static Map<String, Handler> getSubHandler(BinaryMessenger messenger, android.app.Activity activity) {
+    public static SubHandlerCustom instance = new SubHandlerCustom();
+
+    private SubHandlerCustom() {}
+
+    public Map<String, Handler> getSubHandler(BinaryMessenger messenger, android.app.Activity activity) {
         return new HashMap<String, Handler>() {{
             put("", (args, methodResult) -> {
                 // args

diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
diff --git a/example/ios/Flutter/.last_build_id b/example/ios/Flutter/.last_build_id
@@ -1 +1 @@
-22d64be1d635a203ad23c3644d824910
+017eee7aac34cccd814dd9abbbd3ae04
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -5,58 +5,58 @@ packages:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.4.2"
+    version: "2.5.0-nullsafety.1"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0-nullsafety.1"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0-nullsafety.3"
   charcode:
     dependency: transitive
     description:
       name: charcode
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.3"
+    version: "1.2.0-nullsafety.1"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.1"
+    version: "1.1.0-nullsafety.1"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.14.13"
+    version: "1.15.0-nullsafety.3"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.1.3"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0-nullsafety.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -71,37 +71,37 @@ packages:
     dependency: transitive
     description:
       name: foundation_fluttify
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.9.6"
+    version: "0.11.1"
   jcore_fluttify:
     dependency: "direct dev"
     description:
       path: ".."
       relative: true
     source: path
-    version: "0.1.0"
+    version: "0.2.0"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.12.8"
+    version: "0.12.10-nullsafety.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.8"
+    version: "1.3.0-nullsafety.3"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0-nullsafety.1"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -111,58 +111,58 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0-nullsafety.2"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.9.5"
+    version: "1.10.0-nullsafety.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0-nullsafety.1"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.5"
+    version: "1.1.0-nullsafety.1"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0-nullsafety.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.2.17"
+    version: "0.2.19-nullsafety.2"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0-nullsafety.3"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.8"
+    version: "2.1.0-nullsafety.3"
 sdks:
-  dart: ">=2.9.0-14.0.dev <3.0.0"
+  dart: ">=2.10.0-110 <2.11.0"
   flutter: ">=1.12.13 <2.0.0"
diff --git a/ios/jcore_fluttify.podspec b/ios/jcore_fluttify.podspec
@@ -19,7 +19,7 @@ A new flutter plugin project.
   # flutter plugin dependency
 
   # sdk dependency
-  s.dependency 'JCore', '2.3.2'
+  s.dependency 'JCore', '2.4.0'
 
   s.static_framework = true
   s.ios.deployment_target = '8.0'

diff --git a/lib/src/android/android.export.g.dart b/lib/src/android/android.export.g.dart
@@ -1,43 +1,40 @@
-export 'cn/jiguang/net/HttpRequest.g.dart';
-export 'cn/jiguang/net/HttpResponse.g.dart';
-export 'cn/jiguang/net/DefaultHostVerifier.g.dart';
-export 'cn/jiguang/net/SSLTrustManager.g.dart';
-export 'cn/jiguang/net/HttpUtils.g.dart';
-export 'cn/jiguang/internal/JCoreHelperAction.g.dart';
-export 'cn/jiguang/internal/JCoreInternalHelper.g.dart';
-export 'cn/jiguang/internal/JConstants.g.dart';
-export 'cn/jiguang/internal/ActionManager.g.dart';
+export 'cn/jcore/client/android/BuildConfig.g.dart';
+export 'cn/jiguang/analytics/page/ActivityLifecycle.g.dart';
+export 'cn/jiguang/analytics/page/PushSA.g.dart';
 export 'cn/jiguang/android/BuildConfig.g.dart';
 export 'cn/jiguang/android/IDataShare.g.dart';
-export 'cn/jiguang/dy/Protocol.g.dart';
-export 'cn/jiguang/api/JDispatchAction.g.dart';
-export 'cn/jiguang/api/MultiSpHelper.g.dart';
 export 'cn/jiguang/api/BaseLogger.g.dart';
-export 'cn/jiguang/api/JResponse.g.dart';
-export 'cn/jiguang/api/JRequest.g.dart';
-export 'cn/jiguang/api/utils/ProtocolUtil.g.dart';
-export 'cn/jiguang/api/utils/OutputDataUtil.g.dart';
-export 'cn/jiguang/api/utils/ByteBufferUtils.g.dart';
-export 'cn/jiguang/api/JProtocol.g.dart';
-export 'cn/jiguang/api/ReportCallBack.g.dart';
-export 'cn/jiguang/api/JAnalyticsAction.g.dart';
 export 'cn/jiguang/api/JAction.g.dart';
+export 'cn/jiguang/api/JActionExtra.g.dart';
+export 'cn/jiguang/api/JAnalyticsAction.g.dart';
 export 'cn/jiguang/api/JCoreInterface.g.dart';
 export 'cn/jiguang/api/JCoreManager.g.dart';
-export 'cn/jiguang/api/JActionExtra.g.dart';
+export 'cn/jiguang/api/JDispatchAction.g.dart';
+export 'cn/jiguang/api/JProtocol.g.dart';
+export 'cn/jiguang/api/JRequest.g.dart';
+export 'cn/jiguang/api/JResponse.g.dart';
+export 'cn/jiguang/api/MultiSpHelper.g.dart';
+export 'cn/jiguang/api/ReportCallBack.g.dart';
 export 'cn/jiguang/api/SdkType.g.dart';
-export 'cn/jiguang/analytics/page/PushSA.g.dart';
-export 'cn/jiguang/analytics/page/ActivityLifecycle.g.dart';
-export 'cn/jcore/client/android/BuildConfig.g.dart';
-export 'cn/jpush/android/service/DownloadActivity.g.dart';
+export 'cn/jiguang/api/utils/ByteBufferUtils.g.dart';
+export 'cn/jiguang/api/utils/OutputDataUtil.g.dart';
+export 'cn/jiguang/api/utils/ProtocolUtil.g.dart';
+export 'cn/jiguang/net/DefaultHostVerifier.g.dart';
+export 'cn/jiguang/net/HttpRequest.g.dart';
+export 'cn/jiguang/net/HttpResponse.g.dart';
+export 'cn/jiguang/net/HttpUtils.g.dart';
+export 'cn/jiguang/net/SSLTrustManager.g.dart';
+export 'cn/jpush/android/service/AlarmReceiver.g.dart';
+export 'cn/jpush/android/service/DActivity.g.dart';
+export 'cn/jpush/android/service/DaemonService.g.dart';
 export 'cn/jpush/android/service/DataProvider.g.dart';
+export 'cn/jpush/android/service/DataShare.g.dart';
+export 'cn/jpush/android/service/DownloadActivity.g.dart';
 export 'cn/jpush/android/service/DownloadProvider.g.dart';
-export 'cn/jpush/android/service/DaemonService.g.dart';
+export 'cn/jpush/android/service/JCommonService.g.dart';
 export 'cn/jpush/android/service/PushReceiver.g.dart';
 export 'cn/jpush/android/service/PushService.g.dart';
 export 'cn/jpush/android/service/WakedResultReceiver.g.dart';
-export 'cn/jpush/android/service/DActivity.g.dart';
-export 'cn/jpush/android/service/AlarmReceiver.g.dart';
-export 'cn/jpush/android/service/JCommonService.g.dart';
-export 'type_op.g.dart';
 export 'constants.g.dart';
+export 'type_op.g.dart';
+export '../facade/objects.g.dart';
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		22d64be1d635a203ad23c3644d824910
		017eee7aac34cccd814dd9abbbd3ae04