Merge branch 'master' into major

# Conflicts:
#	example/pubspec.lock

example/ios/Podfile.lock

@@ -1,11 +1,11 @@
 PODS:
-  - FinApplet (2.40.3)
+  - FinApplet (2.40.9)
-  - FinAppletExt (2.40.3):
+  - FinAppletExt (2.40.9):
-    - FinApplet (= 2.40.3)
+    - FinApplet (= 2.40.9)
   - Flutter (1.0.0)
   - mop (0.1.1):
-    - FinApplet (= 2.40.3)
+    - FinApplet (= 2.40.9)
-    - FinAppletExt (= 2.40.3)
+    - FinAppletExt (= 2.40.9)
     - Flutter
 
 DEPENDENCIES:
@@ -24,10 +24,10 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/mop/ios"
 
 SPEC CHECKSUMS:
-  FinApplet: a76ded99df163388bb4de129df20c0ff44abe37c
+  FinApplet: 9dd3810fb41400c882c8c5d5f528452b0f1f0a63
-  FinAppletExt: 5c53d5c3554ce1be014871214a5c7a06f0bf9177
+  FinAppletExt: e9f418e3d11f5cf4ee42b2d64ab405fe747f51fe
   Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
-  mop: 4881eb2c1d365d9cf148b5dc7f8eca2b7018121d
+  mop: 8684b0dad361ce1d9b2d4a98d65a1acb52ce4120
 
 PODFILE CHECKSUM: 2317ba7584871ae8cd67fd0244fbd5e96fd06167
 

example/ios/Runner.xcodeproj/project.pbxproj

@@ -520,6 +520,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = 9QCKYFU5M4;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = finclip_example;

example/lib/main.dart

@@ -131,7 +131,11 @@ class _MyAppState extends State<MyApp> {
                 _buildAppletItem(appletId, "打开小程序", () {
                   // Mop.instance.openApplet(appletId,
                   //     path: 'pages/index/index', query: '');
-                  RemoteAppletRequest request = RemoteAppletRequest(apiServer: 'https://api.finclip.com', appletId: appletId, transitionStyle: TranstionStyle.TranstionStyleUp);
+                  TranstionStyle style = TranstionStyle.TranstionStyleUp;
+                  if (appletId == "5f72e3559a6a7900019b5baa") {
+                    style = TranstionStyle.TranstionStylePush;
+                  }
+                  RemoteAppletRequest request = RemoteAppletRequest(apiServer: 'https://api.finclip.com', appletId: appletId, transitionStyle: style);
                   Mop.instance.startApplet(request);
                 }),
                 _buildAppletItem(appletId, "finishRunningApplet", () {

example/pubspec.lock

@@ -42,7 +42,7 @@ packages:
       name: collection
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.15.0"
+    version: "1.16.0"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -56,7 +56,7 @@ packages:
       name: fake_async
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -75,7 +75,7 @@ packages:
       name: flutter_plugin_android_lifecycle
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.6"
+    version: "2.0.9"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -95,6 +95,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.1.4"
   meta:
     dependency: transitive
     description:
@@ -108,14 +115,14 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "2.40.3"
+    version: "2.40.9"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -127,7 +134,7 @@ packages:
       name: source_span
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.2"
   stack_trace:
     dependency: transitive
     description:
@@ -176,7 +183,7 @@ packages:
       name: vector_math
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
 sdks:
-  dart: ">=2.14.0 <3.0.0"
+  dart: ">=2.17.0-0 <3.0.0"
-  flutter: ">=2.2.3"
+  flutter: ">=3.0.0"

pubspec.yaml

@@ -1,6 +1,6 @@
 name: mop
 description: A Finogeeks MiniProgram Flutter SDK.
-version: '2.40.9'
+version: '2.40.10'
 homepage: https://github.com/finogeeks/mop-flutter-sdk
 
 environment: