Merge branch 'dev'

CHANGELOG.md

+## 2.6.0
+* Android支持通过H5冷启动app传递<wx-open-launch-app>中的extinfo数据
+* Android新加<meta-data>handleWeChatRequestByFluwx</meta-data>。
+
 ## 2.5.0+1
 * Fix trailing , issue.
 

README.md

@@ -21,6 +21,7 @@
 - Launch mini program in WeChat.
 - Subscribe Message.
 - Just open WeChat app.
+- Launch app From wechat link.
 
 ## Preparation
 
@@ -72,6 +73,7 @@ And you have to understand the difference between debug signature and release si
 - [Share](./doc/SHARE.md)
 - [Payment](./doc/PAYMENT.md)
 - [Auth](./doc/AUTH.md)
+- [Launch app from h5](./doc/LAUNCH_APP_FROM_H5.md)
 
 For more capabilities, you can read the public functions of `fluwx`.
 

README_CN.md

@@ -19,6 +19,7 @@
 - 拉起小程序.
 - 订阅消息.
 - 打开微信.
+- 从微信标签打开应用
 
 ## 准备
 
@@ -70,7 +71,7 @@ registerWxApi(appId: "wxd930ea5d5a228f5f",universalLink: "https://your.univerall
 - [分享](./doc/SHARE_CN.md)
 - [支付](./doc/PAYMENT_CN.md)
 - [登录](./doc/AUTH_CN.md)
-
+- [从微信标签打开应用](./doc/LAUNCH_APP_FROM_H5_CN.md)
 对于更多功能，可以查看源码。
 
 ## QA

android/src/main/kotlin/com/jarvan/fluwx/FluwxPlugin.kt

@@ -16,7 +16,7 @@ import io.flutter.plugin.common.MethodChannel.Result
 import io.flutter.plugin.common.PluginRegistry
 
 /** FluwxPlugin */
-public class FluwxPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
+class FluwxPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
 
     companion object {
         @JvmStatic
@@ -39,12 +39,18 @@ public class FluwxPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
 
     private var authHandler: FluwxAuthHandler? = null
 
+    private var fluwxChannel: MethodChannel? = null
+
     override fun onAttachedToEngine(@NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
-        val channel = MethodChannel(flutterPluginBinding.binaryMessenger, "com.jarvanmo/fluwx")
-        channel.setMethodCallHandler(this)
-        FluwxResponseHandler.setMethodChannel(channel)
-        FluwxRequestHandler.setMethodChannel(channel)
-        authHandler = FluwxAuthHandler(channel)
+        if (fluwxChannel == null) {
+            fluwxChannel = MethodChannel(flutterPluginBinding.binaryMessenger, "com.jarvanmo/fluwx")
+            fluwxChannel?.setMethodCallHandler(this)
+        }
+        fluwxChannel?.let {
+            FluwxResponseHandler.setMethodChannel(it)
+            FluwxRequestHandler.setMethodChannel(it)
+            authHandler = FluwxAuthHandler(it)
+        }
         shareHandler = FluwxShareHandlerEmbedding(flutterPluginBinding.flutterAssets, flutterPluginBinding.applicationContext)
     }
 

android/src/main/kotlin/com/jarvan/fluwx/handlers/FluwxRequestHandler.kt

@@ -14,26 +14,98 @@
  * limitations under the License.
  */
 package com.jarvan.fluwx.handlers
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Bundle
+import android.util.Log
 import com.tencent.mm.opensdk.modelmsg.ShowMessageFromWX
 import io.flutter.plugin.common.MethodChannel
 import com.tencent.mm.opensdk.modelbase.BaseReq
+import java.lang.Exception
 
 object FluwxRequestHandler {
+    private const val KEY_FLUWX_REQUEST_INFO_BUNDLE = "KEY_FLUWX_REQUEST_INFO_BUNDLE"
+
+    var customOnReqDelegate: ((baseReq: BaseReq, activity: Activity) -> Unit)? = null
+
     private var channel: MethodChannel? = null
 
     fun setMethodChannel(channel: MethodChannel) {
         FluwxRequestHandler.channel = channel
     }
 
-    fun handleRequest(req: BaseReq) {
+
+    fun handleRequestInfoFromIntent(intent: Intent) {
+        intent.getBundleExtra(KEY_FLUWX_REQUEST_INFO_BUNDLE)?.run {
+            val type = getInt("_wxapi_command_type", -9999)
+            if (type == 4) {
+                handleShowMessageFromWXBundle(this)
+            }
+        }
+    }
+
+    private fun handleShowMessageFromWXBundle(bundle: Bundle) = handleWXShowMessageFromWX(ShowMessageFromWX.Req(bundle))
+
+    private fun handleRequest(req: BaseReq) {
         when (req) {
-            is ShowMessageFromWX.Req -> hanleWXShowMessageFromWX(req)
+            is ShowMessageFromWX.Req -> handleWXShowMessageFromWX(req)
         }
     }
 
-    private  fun hanleWXShowMessageFromWX(req: ShowMessageFromWX.Req) {
+    private fun handleWXShowMessageFromWX(req: ShowMessageFromWX.Req) {
         val result = mapOf(
-                "extMsg" to req.message.messageExt)
+                "extMsg" to req.message.messageExt,
+        )
         channel?.invokeMethod("onWXShowMessageFromWX", result)
     }
+
+    private fun defaultOnReqDelegate(baseReq: BaseReq, activity: Activity) {
+        // FIXME: 可能是官方的Bug，从微信拉起APP的Intent类型不对，无法跳转回Flutter Activity
+        // 稳定复现场景：微信版本为7.0.5，小程序SDK为2.7.7
+        if (baseReq.type == 4) {
+            // com.tencent.mm.opensdk.constants.ConstantsAPI.COMMAND_SHOWMESSAGE_FROM_WX = 4
+            if (WXAPiHandler.wxApiRegistered) {
+                handleRequest(baseReq)
+                startSpecifiedActivity(defaultFlutterActivityAction(activity), activity = activity)
+            } else {
+                startSpecifiedActivity(defaultFlutterActivityAction(activity), bundle = Bundle().apply {
+                    baseReq.toBundle(this)
+                }, bundleKey = KEY_FLUWX_REQUEST_INFO_BUNDLE, activity = activity)
+            }
+        }
+    }
+
+    fun onReq(baseReq: BaseReq, activity: Activity) {
+        try {
+            val activityInfo = activity.packageManager.getActivityInfo(activity.componentName, PackageManager.GET_META_DATA)
+            val defaultHandle = activityInfo.metaData.getBoolean("handleWeChatRequestByFluwx", true)
+            if (defaultHandle) {
+                defaultOnReqDelegate(baseReq, activity)
+            } else {
+                customOnReqDelegate?.invoke(baseReq, activity)
+            }
+        } catch (e: Exception) {
+            Log.i("Fluwx", "can't load meta-data handleWeChatRequestByFluwx")
+        }
+    }
+
+    private fun startSpecifiedActivity(action: String, activity: Activity, bundle: Bundle? = null, bundleKey: String? = null) {
+        Intent(action).run {
+            bundleKey?.let {
+                putExtra(bundleKey, bundle)
+            }
+            addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
+            activity.packageManager?.let {
+                resolveActivity(it)?.also {
+                    activity.startActivity(this)
+                    activity.finish()
+                }
+            }
+        }
+    }
+
+    private fun defaultFlutterActivityAction(context: Context): String = "$context.packageName.FlutterActivity"
 }
\ No newline at end of file

android/src/main/kotlin/com/jarvan/fluwx/handlers/WXAPiHandler.kt

@@ -30,6 +30,18 @@ object WXAPiHandler {
 
     private var context: Context? = null
 
+    private var registered: Boolean = false
+
+    val wxApiRegistered get() = registered
+
+    fun setupWxApi(appId: String, context: Context, force: Boolean = true): Boolean {
+        if (force || !registered) {
+            setContext(context)
+            registerWxAPIInternal(appId, context)
+        }
+        return registered
+    }
+
     fun setContext(context: Context?) {
         WXAPiHandler.context = context
     }
@@ -51,9 +63,9 @@ object WXAPiHandler {
             return
         }
 
-        val api = WXAPIFactory.createWXAPI(context?.applicationContext, appId)
-        val registered = api.registerApp(appId)
-        wxApi = api
+        context?.let {
+            registerWxAPIInternal(appId, it)
+        }
         result.success(registered)
     }
 
@@ -64,6 +76,11 @@ object WXAPiHandler {
         } else {
             result.success(wxApi?.isWXAppInstalled)
         }
+    }
 
+    private fun registerWxAPIInternal(appId: String, context: Context) {
+        val api = WXAPIFactory.createWXAPI(context.applicationContext, appId)
+        registered = api.registerApp(appId)
+        wxApi = api
     }
 }
\ No newline at end of file

android/src/main/kotlin/com/jarvan/fluwx/wxapi/FluwxWXEntryActivity.kt

@@ -23,7 +23,6 @@ import com.jarvan.fluwx.handlers.FluwxRequestHandler
 import com.jarvan.fluwx.handlers.WXAPiHandler
 import com.tencent.mm.opensdk.modelbase.BaseReq
 import com.tencent.mm.opensdk.modelbase.BaseResp
-import com.tencent.mm.opensdk.modelmsg.ShowMessageFromWX
 import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler
 
 
@@ -38,7 +37,7 @@ open class FluwxWXEntryActivity : Activity(), IWXAPIEventHandler {
             WXAPiHandler.wxApi?.handleIntent(intent, this)
         } catch (e: Exception) {
             e.printStackTrace()
-            startSpecifiedActivity()
+            startSpecifiedActivity(defaultFlutterActivityAction())
             finish()
         }
     }
@@ -52,7 +51,7 @@ open class FluwxWXEntryActivity : Activity(), IWXAPIEventHandler {
             WXAPiHandler.wxApi?.handleIntent(intent, this)
         } catch (e: Exception) {
             e.printStackTrace()
-            startSpecifiedActivity()
+            startSpecifiedActivity(defaultFlutterActivityAction())
             finish()
         }
     }
@@ -61,11 +60,7 @@ open class FluwxWXEntryActivity : Activity(), IWXAPIEventHandler {
     override fun onReq(baseReq: BaseReq) {
         // FIXME: 可能是官方的Bug，从微信拉起APP的Intent类型不对，无法跳转回Flutter Activity
         // 稳定复现场景：微信版本为7.0.5，小程序SDK为2.7.7
-        if (baseReq.type == 4) {
-            // com.tencent.mm.opensdk.constants.ConstantsAPI.COMMAND_SHOWMESSAGE_FROM_WX = 4
-            FluwxRequestHandler.handleRequest(baseReq)
-            startSpecifiedActivity()
-        }
+       FluwxRequestHandler.onReq(baseReq,this)
     }
 
     // 第三方应用发送到微信的请求处理后的响应结果，会回调到该方法
@@ -74,11 +69,20 @@ open class FluwxWXEntryActivity : Activity(), IWXAPIEventHandler {
         finish()
     }
 
-    private fun startSpecifiedActivity() {
-        Intent("$packageName.FlutterActivity").run {
+    private fun startSpecifiedActivity(action: String, bundle: Bundle? = null, bundleKey: String? = null) {
+        Intent(action).run {
+            bundleKey?.let {
+                putExtra(bundleKey, bundle)
+            }
             addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
+            packageManager?.let {
+                resolveActivity(packageManager)?.also {
                     startActivity(this)
-        }
                     finish()
                 }
+            }
+        }
+    }
+
+    private fun defaultFlutterActivityAction(): String = "$packageName.FlutterActivity"
 }
\ No newline at end of file

doc/LAUNCH_APP_FROM_H5.md

+## Launch App from H5
+Fluwx supports launch app from `<wx-open-launch-app>`, and pass `extInfo` to your app.
+For Android side, you need add the following action for your FlutterActivity in `AndroidManifest.xml`:
+```
+    <action android:name="${applicationId}.FlutterActivity" />
+```
+If you want to pass `extInfo` to Flutter, you need to add the following code in `MainActivity.kt`:
+```kotlin
+    override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
+        GeneratedPluginRegistrant.registerWith(flutterEngine);
+        //If you didn't configure WxAPI, add the following code
+        WXAPiHandler.setupWxApi("wxd930ea5d5a258f4f",this)
+        //Get Ext-Info from Intent.
+        FluwxRequestHandler.handleRequestInfoFromIntent(intent)
+    }
+```
+If you want to custom your request logic, you need add the `<meta-data>` in host activity:
+```xml
+        <meta-data
+            android:name="handleWeChatRequestByFluwx"
+            android:value="flase" />
+```
+And then, set `FluwxRequestHandler.customOnReqDelegate` on your own.
\ No newline at end of file

doc/LAUNCH_APP_FROM_H5_CN.md

+## 从H5启动app
+Fluwx 支持从`<wx-open-launch-app>`启动你的app, 并且支持传递`extInfo`给你的app.
+对于Android来说,你要在`AndroidManifest.xml`中给你的宿主`Activty`加上一个标签:
+```
+    <action android:name="${applicationId}.FlutterActivity" />
+```
+如果你想把`extInfo`传给Flutter, 你要在`MainActivity`加上如下代码:
+```kotlin
+    override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
+        GeneratedPluginRegistrant.registerWith(flutterEngine);
+        //If you didn't configure WxAPI, add the following code
+        WXAPiHandler.setupWxApi("wxd930ea5d5a258f4f",this)
+        //Get Ext-Info from Intent.
+        FluwxRequestHandler.handleRequestInfoFromIntent(intent)
+    }
+```
+如果你想自定义你的调用逻辑, 你需要在宿主Activity中加上`<meta-data>`:
+```xml
+        <meta-data
+            android:name="handleWeChatRequestByFluwx"
+            android:value="flase" />
+```
+然后, 自己实现 `FluwxRequestHandler.customOnReqDelegate`.
\ No newline at end of file

example/android/app/src/main/AndroidManifest.xml

@@ -5,23 +5,27 @@
          In most cases you can leave this as-is, but you if you want to provide
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <application
         android:name="io.flutter.app.FlutterApplication"
-        android:label="fluwx_example"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:label="fluwx_example">
         <activity
             android:name=".MainActivity"
-            android:launchMode="singleTop"
-            android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:launchMode="singleTop"
+            android:theme="@style/LaunchTheme"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <action android:name="${applicationId}.FlutterActivity"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="${applicationId}.FlutterActivity" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <meta-data
+                android:name="handleWeChatRequestByFluwx"
+                android:value="false" />
         </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->

example/android/app/src/main/kotlin/com/jarvan/fluwx_example/MainActivity.kt

 package com.jarvan.fluwx_example
 
 import androidx.annotation.NonNull;
+import com.jarvan.fluwx.handlers.FluwxRequestHandler
+import com.jarvan.fluwx.handlers.WXAPiHandler
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugins.GeneratedPluginRegistrant
@@ -8,5 +10,9 @@ import io.flutter.plugins.GeneratedPluginRegistrant
 class MainActivity: FlutterActivity() {
     override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
         GeneratedPluginRegistrant.registerWith(flutterEngine);
+        //If you didn't configure WxAPI, add the following code
+        WXAPiHandler.setupWxApi("wxd930ea5d5a258f4f",this)
+        //Get Ext-Info from Intent.
+        FluwxRequestHandler.handleRequestInfoFromIntent(intent)
     }
 }

pubspec.yaml

 name: fluwx
 description: The capability of implementing WeChat SDKs in Flutter. With Fluwx, developers can use WeChatSDK easily, such as sharing, payment, lanuch mini program and etc.
-version: 2.5.0+1
+version: 2.6.0
 homepage: https://github.com/JarvanMo/fluwx
 
 environment: