提交 f254588d authored 作者: JarvanMo's avatar JarvanMo

fix bugs

上级 2b1d8f12
...@@ -3,7 +3,6 @@ package com.jarvan.fluwx.handlers ...@@ -3,7 +3,6 @@ package com.jarvan.fluwx.handlers
import android.Manifest import android.Manifest
import android.content.Context import android.content.Context
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.util.Log
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import com.jarvan.fluwx.io.ImagesIO import com.jarvan.fluwx.io.ImagesIO
...@@ -53,14 +52,12 @@ internal class FluwxShareHandler(private val flutterAssets: FlutterPlugin.Flutte ...@@ -53,14 +52,12 @@ internal class FluwxShareHandler(private val flutterAssets: FlutterPlugin.Flutte
} }
private fun shareText(call: MethodCall, result: MethodChannel.Result) { private fun shareText(call: MethodCall, result: MethodChannel.Result) {
val textObj = WXTextObject() val textObj = WXTextObject(call.argument<String?>("source"))
textObj.text = call.argument("source")
val msg = WXMediaMessage() val msg = WXMediaMessage()
msg.mediaObject = textObj msg.mediaObject = textObj
val req = SendMessageToWX.Req() val req = SendMessageToWX.Req()
req.message = msg
setCommonArguments(call, req, msg) setCommonArguments(call, req, msg)
req.message = msg
result.success(WXAPiHandler.wxApi?.sendReq(req)) result.success(WXAPiHandler.wxApi?.sendReq(req))
} }
...@@ -113,7 +110,6 @@ internal class FluwxShareHandler(private val flutterAssets: FlutterPlugin.Flutte ...@@ -113,7 +110,6 @@ internal class FluwxShareHandler(private val flutterAssets: FlutterPlugin.Flutte
msg.mediaObject = imageObject msg.mediaObject = imageObject
msg.thumbData = thumbData msg.thumbData = thumbData
msg.title = call.argument<String>(keyTitle)
msg.description = call.argument<String>(keyDescription) msg.description = call.argument<String>(keyDescription)
val req = SendMessageToWX.Req() val req = SendMessageToWX.Req()
...@@ -137,7 +133,6 @@ internal class FluwxShareHandler(private val flutterAssets: FlutterPlugin.Flutte ...@@ -137,7 +133,6 @@ internal class FluwxShareHandler(private val flutterAssets: FlutterPlugin.Flutte
} }
val msg = WXMediaMessage() val msg = WXMediaMessage()
msg.mediaObject = music msg.mediaObject = music
msg.title = call.argument(keyTitle)
msg.description = call.argument(keyDescription) msg.description = call.argument(keyDescription)
launch { launch {
...@@ -161,7 +156,6 @@ internal class FluwxShareHandler(private val flutterAssets: FlutterPlugin.Flutte ...@@ -161,7 +156,6 @@ internal class FluwxShareHandler(private val flutterAssets: FlutterPlugin.Flutte
} }
val msg = WXMediaMessage() val msg = WXMediaMessage()
msg.mediaObject = video msg.mediaObject = video
msg.title = call.argument(keyTitle)
msg.description = call.argument(keyDescription) msg.description = call.argument(keyDescription)
launch { launch {
...@@ -180,7 +174,6 @@ internal class FluwxShareHandler(private val flutterAssets: FlutterPlugin.Flutte ...@@ -180,7 +174,6 @@ internal class FluwxShareHandler(private val flutterAssets: FlutterPlugin.Flutte
val msg = WXMediaMessage() val msg = WXMediaMessage()
msg.mediaObject = webPage msg.mediaObject = webPage
msg.title = call.argument(keyTitle)
msg.description = call.argument(keyDescription) msg.description = call.argument(keyDescription)
launch { launch {
...@@ -199,7 +192,6 @@ internal class FluwxShareHandler(private val flutterAssets: FlutterPlugin.Flutte ...@@ -199,7 +192,6 @@ internal class FluwxShareHandler(private val flutterAssets: FlutterPlugin.Flutte
val msg = WXMediaMessage() val msg = WXMediaMessage()
msg.mediaObject = file msg.mediaObject = file
msg.title = call.argument("title")
msg.description = call.argument("description") msg.description = call.argument("description")
launch { launch {
...@@ -230,6 +222,8 @@ internal class FluwxShareHandler(private val flutterAssets: FlutterPlugin.Flutte ...@@ -230,6 +222,8 @@ internal class FluwxShareHandler(private val flutterAssets: FlutterPlugin.Flutte
msg.messageAction = call.argument<String?>("messageAction") msg.messageAction = call.argument<String?>("messageAction")
msg.messageExt = call.argument<String?>("messageExt") msg.messageExt = call.argument<String?>("messageExt")
msg.mediaTagName = call.argument<String?>("mediaTagName") msg.mediaTagName = call.argument<String?>("mediaTagName")
msg.title = call.argument<String?>(keyTitle)
msg.description = call.argument<String?>(keyDescription)
req.transaction = UUID.randomUUID().toString().replace("-", "") req.transaction = UUID.randomUUID().toString().replace("-", "")
val sceneIndex = call.argument<Int?>("scene") val sceneIndex = call.argument<Int?>("scene")
req.scene = when (sceneIndex) { req.scene = when (sceneIndex) {
......
...@@ -42,13 +42,19 @@ class WeChatShareTextModel implements WeChatShareBaseModel { ...@@ -42,13 +42,19 @@ class WeChatShareTextModel implements WeChatShareBaseModel {
final String messageExt; final String messageExt;
final String messageAction; final String messageAction;
final String mediaTagName; final String mediaTagName;
final String title;
final String description;
WeChatShareTextModel(this.source, WeChatShareTextModel(this.source,
{this.scene = WeChatScene.SESSION, {this.scene = WeChatScene.SESSION,
this.mediaTagName, this.mediaTagName,
this.messageAction, this.messageAction,
this.messageExt}) this.messageExt,
: assert(scene != null); String description,
String title})
: assert(scene != null),
this.title = title ?? source,
this.description = description ?? source;
@override @override
Map toMap() { Map toMap() {
...@@ -57,7 +63,9 @@ class WeChatShareTextModel implements WeChatShareBaseModel { ...@@ -57,7 +63,9 @@ class WeChatShareTextModel implements WeChatShareBaseModel {
_source: source, _source: source,
_messageExt: messageExt, _messageExt: messageExt,
_messageAction: messageAction, _messageAction: messageAction,
_mediaTagName: mediaTagName _mediaTagName: mediaTagName,
_title: title,
_description: description
}; };
} }
} }
...@@ -105,7 +113,7 @@ class WeChatShareMiniProgramModel implements WeChatShareBaseModel { ...@@ -105,7 +113,7 @@ class WeChatShareMiniProgramModel implements WeChatShareBaseModel {
"userName": userName, "userName": userName,
"path": path, "path": path,
"title": title, "title": title,
"description": description, _description: description,
"withShareTicket": withShareTicket, "withShareTicket": withShareTicket,
_thumbnail: thumbnail?.toMap(), _thumbnail: thumbnail?.toMap(),
"hdImagePath": hdImagePath?.toMap(), "hdImagePath": hdImagePath?.toMap(),
...@@ -257,15 +265,16 @@ class WeChatShareWebPageModel implements WeChatShareBaseModel { ...@@ -257,15 +265,16 @@ class WeChatShareWebPageModel implements WeChatShareBaseModel {
WeChatShareWebPageModel(this.webPage, WeChatShareWebPageModel(this.webPage,
{this.title: "", {this.title: "",
this.description: "", String description,
this.thumbnail, this.thumbnail,
this.scene = WeChatScene.SESSION, this.scene = WeChatScene.SESSION,
this.mediaTagName, this.mediaTagName,
this.messageAction, this.messageAction,
this.messageExt}) this.messageExt})
: assert(webPage != null), : assert(webPage != null && webPage.isNotEmpty),
assert(thumbnail != null), assert(thumbnail != null),
assert(scene != null); assert(scene != null),
this.description = description ?? webPage;
@override @override
Map toMap() { Map toMap() {
...@@ -275,7 +284,8 @@ class WeChatShareWebPageModel implements WeChatShareBaseModel { ...@@ -275,7 +284,8 @@ class WeChatShareWebPageModel implements WeChatShareBaseModel {
_thumbnail: thumbnail?.toMap(), _thumbnail: thumbnail?.toMap(),
_title: title, _title: title,
_messageAction: messageAction, _messageAction: messageAction,
_mediaTagName: mediaTagName _mediaTagName: mediaTagName,
_description: description
}; };
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论