[fix]merge github

2021-01-19 21:29:58 +08:00 · 2021-01-19 21:29:58 +08:00 · 9967dc0b6b
parent e28e220170 273af8333b
commit 9967dc0b6b
9 changed files with 55 additions and 70 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,9 @@
+## 1.0.0 
+Release
+## 0.7.1
+升级版本
+## 0.7.0
+适配运行时新接口
 ## 0.6.1
 适配运行时新接口
 ## 0.6.0
--- a/example/.flutter-plugins-dependencies
+++ b/example/.flutter-plugins-dependencies
@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"mop","path":"/Users/haley/Documents/Finogeeks/Flutter/mop-flutter-sdk/","dependencies":[]}],"android":[{"name":"mop","path":"/Users/haley/Documents/Finogeeks/Flutter/mop-flutter-sdk/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"mop","dependencies":[]}],"date_created":"2020-12-01 10:11:53.132361","version":"1.24.0-8.0.pre.140"}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"mop","path":"/Users/haley/Documents/Finogeeks/Flutter/mop-flutter-sdk/","dependencies":[]}],"android":[{"name":"mop","path":"/Users/haley/Documents/Finogeeks/Flutter/mop-flutter-sdk/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"mop","dependencies":[]}],"date_created":"2020-12-01 10:11:53.132361","version":"1.24.0-8.0.pre.140"}
--- a/example/ios/Flutter/.last_build_id
+++ b/example/ios/Flutter/.last_build_id
@ -1 +1 @@
-9b8dc99cc1898757c03a06b2261ab8de
+9b8dc99cc1898757c03a06b2261ab8de
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@ -1,8 +1,8 @@
 PODS:
-  - FinApplet (2.6.3)
+  - FinApplet (2.12.3)
  - Flutter (1.0.0)
  - mop (0.1.0):
-    - FinApplet (= 2.6.3)
+    - FinApplet
    - Flutter

 DEPENDENCIES:
@ -20,10 +20,10 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/mop/ios"

 SPEC CHECKSUMS:
-  FinApplet: d462499b39520138bdaf1a716ff17137768cbcf8
+  FinApplet: a79f16c3f1e982a78b152544bc0d30add70068c6
  Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
-  mop: d2defa66e0f2383923dd025ae4384f17d8d909b0
+  mop: e3eac9de90d3e331268e9c9e8308e233e540ad1c

 PODFILE CHECKSUM: fa591ea0d89752dd0191ae3f82c83db034678e82

-COCOAPODS: 1.9.3
+COCOAPODS: 1.9.1
--- a/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/example/ios/Runner.xcodeproj/project.pbxproj
@ -378,7 +378,7 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				MARKETING_VERSION = 1.0.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.finogeeks.mopExample;
+				PRODUCT_BUNDLE_IDENTIFIER = com.finogeeks.mopexample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
@ -507,7 +507,7 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				MARKETING_VERSION = 1.0.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.finogeeks.mopExample;
+				PRODUCT_BUNDLE_IDENTIFIER = com.finogeeks.mopexample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
@ -532,7 +532,7 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				MARKETING_VERSION = 1.0.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.finogeeks.mopExample;
+				PRODUCT_BUNDLE_IDENTIFIER = com.finogeeks.mopexample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@ -21,6 +21,7 @@ class _MyAppState extends State<MyApp> {
  Future<void> init() async {
    if (Platform.isIOS) {
      final res = await Mop.instance.initialize(
+<<<<<<< HEAD
          '22LyZEib0gLTQdU3MUauAZ0pZVbKTWGmNN6Lx8hXhIkA', '74bde5fad53a817c',
          apiServer: 'https://api.finclip.com', apiPrefix: '/api/v1/mop');
      print(res);
@ -28,6 +29,15 @@ class _MyAppState extends State<MyApp> {
      final res = await Mop.instance.initialize(
          '22LyZEib0gLTQdU3MUauAZ0pZVbKTWGmNN6Lx8hXhIkA', '74bde5fad53a817c',
          apiServer: 'https://api.finclip.com', apiPrefix: '/api/v1/mop');
+=======
+          '22LyZEib0gLTQdU3MUauATaGrbb4xsJ87TEDJExdNRsA', 'c7a85a043973223b',
+          apiServer: 'https://mp.finogeeks.com', apiPrefix: '/api/v1/mop');
+      print(res);
+    } else if (Platform.isAndroid) {
+      final res = await Mop.instance.initialize(
+          '22LyZEib0gLTQdU3MUauATaGrbb4xsJ87TEDJExdNRsA', 'c7a85a043973223b',
+          apiServer: 'https://mp.finogeeks.com', apiPrefix: '/api/v1/mop');
+>>>>>>> 273af8333b2af783766fd287d56301f4c8a9933b
      print(res);
    }
    if (!mounted) return;
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@ -5,56 +5,56 @@ packages:
    dependency: transitive
    description:
      name: async
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub"
    source: hosted
    version: "2.5.0-nullsafety.3"
  boolean_selector:
    dependency: transitive
    description:
      name: boolean_selector
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub"
    source: hosted
    version: "2.1.0-nullsafety.3"
  characters:
    dependency: transitive
    description:
      name: characters
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub"
    source: hosted
    version: "1.1.0-nullsafety.5"
  charcode:
    dependency: transitive
    description:
      name: charcode
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub"
    source: hosted
    version: "1.2.0-nullsafety.3"
  clock:
    dependency: transitive
    description:
      name: clock
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub"
    source: hosted
    version: "1.1.0-nullsafety.3"
  collection:
    dependency: transitive
    description:
      name: collection
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub"
    source: hosted
    version: "1.15.0-nullsafety.5"
  cupertino_icons:
    dependency: "direct main"
    description:
      name: cupertino_icons
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub"
    source: hosted
    version: "0.1.3"
  fake_async:
    dependency: transitive
    description:
      name: fake_async
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub"
    source: hosted
    version: "1.2.0-nullsafety.3"
  flutter:
@ -71,14 +71,14 @@ packages:
    dependency: transitive
    description:
      name: matcher
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub"
    source: hosted
    version: "0.12.10-nullsafety.3"
  meta:
    dependency: transitive
    description:
      name: meta
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub"
    source: hosted
    version: "1.3.0-nullsafety.6"
  mop:
@ -87,12 +87,12 @@ packages:
      path: ".."
      relative: true
    source: path
-    version: "0.6.1"
+    version: "0.7.0"
  path:
    dependency: transitive
    description:
      name: path
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub"
    source: hosted
    version: "1.8.0-nullsafety.3"
  sky_engine:
@ -104,56 +104,56 @@ packages:
    dependency: transitive
    description:
      name: source_span
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub"
    source: hosted
    version: "1.8.0-nullsafety.4"
  stack_trace:
    dependency: transitive
    description:
      name: stack_trace
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub"
    source: hosted
    version: "1.10.0-nullsafety.6"
  stream_channel:
    dependency: transitive
    description:
      name: stream_channel
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub"
    source: hosted
    version: "2.1.0-nullsafety.3"
  string_scanner:
    dependency: transitive
    description:
      name: string_scanner
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub"
    source: hosted
    version: "1.1.0-nullsafety.3"
  term_glyph:
    dependency: transitive
    description:
      name: term_glyph
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub"
    source: hosted
    version: "1.2.0-nullsafety.3"
  test_api:
    dependency: transitive
    description:
      name: test_api
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub"
    source: hosted
    version: "0.2.19-nullsafety.6"
  typed_data:
    dependency: transitive
    description:
      name: typed_data
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub"
    source: hosted
    version: "1.3.0-nullsafety.5"
  vector_math:
    dependency: transitive
    description:
      name: vector_math
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub"
    source: hosted
    version: "2.1.0-nullsafety.5"
 sdks:
--- a/ios/Classes/Api/MOP_openApplet.m
+++ b/ios/Classes/Api/MOP_openApplet.m
@ -34,6 +34,7 @@
                failure(error.description);
            }
        }];
+        
    }
 }
@end
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -1,10 +1,11 @@
 name: mop
 description: A Finogeeks MiniProgram Flutter SDK.
-version: 0.6.1
+version: 0.7.1
 homepage: https://github.com/finogeeks/mop-flutter-sdk

 environment:
  sdk: '>=2.1.0 <3.0.0'
+  flutter: '^1.10.0'

 dependencies:
  flutter:
@ -14,44 +15,11 @@ dev_dependencies:
  flutter_test:
    sdk: flutter

-# For information on the generic Dart part of this file, see the
-# following page: https://dart.dev/tools/pub/pubspec
-
-# The following section is specific to Flutter.
 flutter:
-  # This section identifies this Flutter project as a plugin project.
-  # The androidPackage and pluginClass identifiers should not ordinarily
-  # be modified. They are used by the tooling to maintain consistency when
-  # adding or updating assets for this project.
  plugin:
-    androidPackage: com.finogeeks.mop
-    pluginClass: MopPlugin
-  # To add assets to your plugin package, add an assets section, like this:
-  # assets:
-  #  - images/a_dot_burr.jpeg
-  #  - images/a_dot_ham.jpeg
-  #
-  # For details regarding assets in packages, see
-  # https://flutter.dev/assets-and-images/#from-packages
-  #
-  # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.dev/assets-and-images/#resolution-aware.
-  # To add custom fonts to your plugin package, add a fonts section here,
-  # in this "flutter" section. Each entry in this list should have a
-  # "family" key with the font family name, and a "fonts" key with a
-  # list giving the asset and other descriptors for the font. For
-  # example:
-  # fonts:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
-  #   - family: Trajan Pro
-  #     fonts:
-  #       - asset: fonts/TrajanPro.ttf
-  #       - asset: fonts/TrajanPro_Bold.ttf
-  #         weight: 700
-  #
-  # For details regarding fonts in packages, see
-  # https://flutter.dev/custom-fonts/#from-packages
+    platforms:
+      android:
+        package: com.finogeeks.mop
+        pluginClass: MopPlugin
+      ios:
+        pluginClass: MopPlugin