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

fix bugs

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