合并代码

2025-08-06 15:20:24 +08:00 · 2019-12-12 22:46:17 +08:00
parent 067e7b4bfd
commit 52891ac48c
7 changed files with 27 additions and 19 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -3,7 +3,7 @@ name: default

 steps:
 - name: prepare
-  image: v7lin/flutter:1.9.1-hotfix.6-stable
+  image: v7lin/flutter:1.12.13-hotfix.5-stable
  volumes:
  - name: pub-cache
    path: /opt/flutter/.pub-cache
@ -11,7 +11,7 @@ steps:
  - flutter packages get

 #- name: build_runner
-#  image: v7lin/flutter:1.9.1-hotfix.6-stable
+#  image: v7lin/flutter:1.12.13-hotfix.5-stable
 #  volumes:
 #  - name: pub-cache
 #    path: /opt/flutter/.pub-cache
@ -19,7 +19,7 @@ steps:
 #  - flutter packages pub run build_runner build --delete-conflicting-outputs

 #- name: android-check
-#  image: v7lin/flutter:1.9.1-hotfix.6-stable
+#  image: v7lin/flutter:1.12.13-hotfix.5-stable
 #  volumes:
 #  - name: pub-cache
 #    path: /opt/flutter/.pub-cache
@ -37,7 +37,7 @@ steps:
 #  - clang-format -style=file -i src/Classes/*.h src/Classes/*.m

 - name: format
-  image: v7lin/flutter:1.9.1-hotfix.6-stable
+  image: v7lin/flutter:1.12.13-hotfix.5-stable
  volumes:
  - name: pub-cache
    path: /opt/flutter/.pub-cache
@ -45,7 +45,7 @@ steps:
  - flutter format --dry-run --set-exit-if-changed .

 - name: analyze
-  image: v7lin/flutter:1.9.1-hotfix.6-stable
+  image: v7lin/flutter:1.12.13-hotfix.5-stable
  volumes:
  - name: pub-cache
    path: /opt/flutter/.pub-cache
@ -53,7 +53,7 @@ steps:
  - flutter analyze

 - name: test
-  image: v7lin/flutter:1.9.1-hotfix.6-stable
+  image: v7lin/flutter:1.12.13-hotfix.5-stable
  volumes:
  - name: pub-cache
    path: /opt/flutter/.pub-cache
@ -63,7 +63,7 @@ steps:
  - flutter test

 - name: proguard
-  image: v7lin/flutter:1.9.1-hotfix.6-stable
+  image: v7lin/flutter:1.12.13-hotfix.5-stable
  volumes:
  - name: pub-cache
    path: /opt/flutter/.pub-cache
@ -86,7 +86,7 @@ steps:
 #      - pull_request

 - name: publish-check
-  image: v7lin/flutter:1.9.1-hotfix.6-stable
+  image: v7lin/flutter:1.12.13-hotfix.5-stable
  volumes:
  - name: pub-cache
    path: /opt/flutter/.pub-cache
@ -129,7 +129,7 @@ steps:
  - rm $FLUTTER_HOME/credentials.json.enc

 - name: publish
-  image: v7lin/flutter:1.9.1-hotfix.6-stable
+  image: v7lin/flutter:1.12.13-hotfix.5-stable
  volumes:
  - name: pub-cache
    path: /opt/flutter/.pub-cache
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,6 +2,7 @@

 * 修正 homepage
 * 适配 Android Q 本地分享（targetSdkVersion >= 29，豁免外部存储沙箱限制，微信SDK并没有提供 FileProvider 方式）
+* 修正小程序分享（by [Ycong](https://github.com/Ycong)）

 ## 1.0.0 - 2019.12.02

@ -11,6 +12,7 @@
 ## 0.3.4 - 2019.9.25

 * 升级Android/iOS SDK
+* 修正 Universal Links 文档（by [Myth](https://github.com/kenleemyth)）

 ## 0.3.3 - 2019.8.8

--- a/android/src/main/java/io/github/v7lin/wechat_kit/WechatKitPlugin.java
+++ b/android/src/main/java/io/github/v7lin/wechat_kit/WechatKitPlugin.java
@ -98,7 +98,6 @@ public class WechatKitPlugin implements MethodCallHandler, PluginRegistry.ViewDe
    private static final String ARGUMENT_KEY_SIGNATURE = "signature";
    private static final String ARGUMENT_KEY_URL = "url";
    private static final String ARGUMENT_KEY_USERNAME = "username";
-    private static final String ARGUMENT_KEY_TYPE = "type";
    private static final String ARGUMENT_KEY_SCENE = "scene";
    private static final String ARGUMENT_KEY_TEXT = "text";
    private static final String ARGUMENT_KEY_TITLE = "title";
@ -120,6 +119,7 @@ public class WechatKitPlugin implements MethodCallHandler, PluginRegistry.ViewDe
    private static final String ARGUMENT_KEY_WITHSHARETICKET = "withShareTicket";
    private static final String ARGUMENT_KEY_TEMPLATEID = "templateId";
    private static final String ARGUMENT_KEY_RESERVED = "reserved";
+    private static final String ARGUMENT_KEY_TYPE = "type";
    private static final String ARGUMENT_KEY_PARTNERID = "partnerId";
    private static final String ARGUMENT_KEY_PREPAYID = "prepayId";
    //    private static final String ARGUMENT_KEY_NONCESTR = "noncestr";
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@ -267,7 +267,8 @@ class _HomeState extends State<Home> {
              _wechat.launchMiniProgram(
                userName: WECHAT_MINIAPPID,
                path: "page/page/index?uid=123",
-                  type: WechatMiniProgram.preview);
+                type: WechatMiniProgram.preview,
+              );
            },
          ),
        ],
--- a/ios/Classes/WechatKitPlugin.m
+++ b/ios/Classes/WechatKitPlugin.m
@ -323,8 +323,8 @@ static NSString *const ARGUMENT_KEY_RESULT_AUTHCODE = @"authCode";
    WXLaunchMiniProgramReq *req = [[WXLaunchMiniProgramReq alloc] init];
    req.userName = call.arguments[ARGUMENT_KEY_USERNAME];
    req.path = call.arguments[ARGUMENT_KEY_PATH];
-    NSNumber * miniProgramType = call.arguments[ARGUMENT_KEY_TYPE];
-    req.miniProgramType = miniProgramType.intValue;
+    NSNumber *miniProgramType = call.arguments[ARGUMENT_KEY_TYPE];
+    req.miniProgramType = miniProgramType.unsignedIntegerValue;
    [WXApi sendReq:req
        completion:^(BOOL success){
            // do nothing
--- a/lib/src/wechat.dart
+++ b/lib/src/wechat.dart
@ -68,7 +68,6 @@ class Wechat {
  static const String _ARGUMENT_KEY_SIGNATURE = 'signature';
  static const String _ARGUMENT_KEY_URL = 'url';
  static const String _ARGUMENT_KEY_USERNAME = 'username';
-  static const String _ARGUMENT_KEY_TYPE = 'type';
  static const String _ARGUMENT_KEY_SCENE = 'scene';
  static const String _ARGUMENT_KEY_TEXT = 'text';
  static const String _ARGUMENT_KEY_TITLE = 'title';
@ -90,6 +89,7 @@ class Wechat {
  static const String _ARGUMENT_KEY_WITHSHARETICKET = 'withShareTicket';
  static const String _ARGUMENT_KEY_TEMPLATEID = 'templateId';
  static const String _ARGUMENT_KEY_RESERVED = 'reserved';
+  static const String _ARGUMENT_KEY_TYPE = 'type';
  static const String _ARGUMENT_KEY_PARTNERID = 'partnerId';
  static const String _ARGUMENT_KEY_PREPAYID = 'prepayId';

@ -760,6 +760,7 @@ class Wechat {
    Map<String, dynamic> arguments = <String, dynamic>{
      _ARGUMENT_KEY_USERNAME: userName,
 //      _ARGUMENT_KEY_PATH: path,
+      _ARGUMENT_KEY_TYPE: type,
    };

    /// 兼容 iOS 空安全 -> NSNull
@ -767,8 +768,6 @@ class Wechat {
      arguments[_ARGUMENT_KEY_PATH] = path;
    }

-    arguments[_ARGUMENT_KEY_TYPE] = type;
-
    return _channel.invokeMethod(_METHOD_LAUNCHMINIPROGRAM, arguments);
  }

--- a/lib/src/wechat_constant.dart
+++ b/lib/src/wechat_constant.dart
@ -38,9 +38,15 @@ class WechatMPWebviewType {
  static const int AD = 0;
 }

-//正式版:0，测试版:1，体验版:2
 class WechatMiniProgram {
+  WechatMiniProgram._();
+
+  /// 正式版
  static const int release = 0;
+
+  /// 测试版
  static const int test = 1;
+
+  /// 体验版
  static const int preview = 2;
 }