提交 9ada1808 authored 作者: JarvanMo's avatar JarvanMo

fix runnable

上级 7c97d2d9
......@@ -2,14 +2,12 @@ package com.jarvan.fluwx
import android.content.Context
import android.content.Intent
import androidx.annotation.NonNull
import com.jarvan.fluwx.handlers.FluwxAuthHandler
import com.jarvan.fluwx.handlers.FluwxRequestHandler
import com.jarvan.fluwx.handlers.FluwxShareHandler
import com.jarvan.fluwx.handlers.FluwxShareHandlerEmbedding
import com.jarvan.fluwx.handlers.PermissionHandler
import com.jarvan.fluwx.handlers.WXAPiHandler
import com.jarvan.fluwx.utils.KEY_FLUWX_REQUEST_INFO_EXT_MSG
import com.jarvan.fluwx.utils.WXApiUtils
import com.jarvan.fluwx.utils.readWeChatCallbackIntent
import com.tencent.mm.opensdk.modelbase.BaseReq
......@@ -362,8 +360,8 @@ class FluwxPlugin : FlutterPlugin, MethodCallHandler, ActivityAware,
req?.let {
if (FluwxConfigurations.interruptWeChatRequestByFluwx) {
when (req) {
is ShowMessageFromWX.Req -> handleWXShowMessageFromWX(req)
is LaunchFromWX.Req -> handleWXLaunchFromWX(req)
is ShowMessageFromWX.Req -> handleShowMessageFromWX(req)
is LaunchFromWX.Req -> handleLaunchFromWX(req)
else -> {}
}
} else {
......@@ -374,7 +372,7 @@ class FluwxPlugin : FlutterPlugin, MethodCallHandler, ActivityAware,
}
private fun handleWXShowMessageFromWX(req: ShowMessageFromWX.Req) {
private fun handleShowMessageFromWX(req: ShowMessageFromWX.Req) {
val result = mapOf(
"extMsg" to req.message.messageExt,
"messageAction" to req.message.messageAction,
......@@ -387,13 +385,14 @@ class FluwxPlugin : FlutterPlugin, MethodCallHandler, ActivityAware,
fluwxChannel?.invokeMethod("onWXShowMessageFromWX", result)
}
private fun handleWXLaunchFromWX(req: LaunchFromWX.Req) {
private fun handleLaunchFromWX(req: LaunchFromWX.Req) {
val result = mapOf(
"extMsg" to req.messageExt,
"messageAction" to req.messageAction,
"lang" to req.lang,
"country" to req.country,
)
extMsg = req.message.messageExt
fluwxChannel?.invokeMethod("onWXLaunchFromWX", result)
}
......
......@@ -58,10 +58,6 @@ const NSString *lang = @"lang";
const NSString *country = @"country";
const NSString *description = @"description";
FluwxWXReqRunnable _initialWXReqRunnable;
BOOL handleOpenURLByFluwx = YES;
NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
......@@ -1036,7 +1032,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
[_channel invokeMethod:@"onWXShowMessageFromWX" arguments:result];
} else {
__weak typeof(self) weakSelf = self;
_initialWXReqRunnable = ^() {
_attemptToResumeMsgFromWxRunnable = ^() {
__strong typeof(weakSelf) strongSelf = weakSelf;
[strongSelf->_channel invokeMethod:@"onWXShowMessageFromWX" arguments:result];
};
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论