提交 98b008ae authored 作者: JarvanMo's avatar JarvanMo

update kotlin to 1.3.0

上级 b1e3a51d
...@@ -2,7 +2,7 @@ group 'com.jarvan.fluwx' ...@@ -2,7 +2,7 @@ group 'com.jarvan.fluwx'
version '1.0-SNAPSHOT' version '1.0-SNAPSHOT'
buildscript { buildscript {
ext.kotlin_version = '1.2.71' ext.kotlin_version = '1.3.0'
repositories { repositories {
google() google()
jcenter() jcenter()
...@@ -42,8 +42,8 @@ android { ...@@ -42,8 +42,8 @@ android {
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
api 'com.tencent.mm.opensdk:wechat-sdk-android-with-mta:5.1.4' api 'com.tencent.mm.opensdk:wechat-sdk-android-with-mta:5.1.4'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.30.2' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:0.30.2' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.0.0'
implementation 'top.zibin:Luban:1.1.8' implementation 'top.zibin:Luban:1.1.8'
implementation 'com.squareup.okhttp3:okhttp:3.11.0' implementation 'com.squareup.okhttp3:okhttp:3.11.0'
} }
...@@ -24,7 +24,7 @@ import com.tencent.mm.opensdk.modelmsg.* ...@@ -24,7 +24,7 @@ import com.tencent.mm.opensdk.modelmsg.*
import io.flutter.plugin.common.MethodCall import io.flutter.plugin.common.MethodCall
import io.flutter.plugin.common.MethodChannel import io.flutter.plugin.common.MethodChannel
import io.flutter.plugin.common.PluginRegistry import io.flutter.plugin.common.PluginRegistry
import kotlinx.coroutines.experimental.* import kotlinx.coroutines.*
/*** /***
...@@ -112,11 +112,11 @@ internal class FluwxShareHandler { ...@@ -112,11 +112,11 @@ internal class FluwxShareHandler {
msg.description = call.argument("description") // 小程序消息desc msg.description = call.argument("description") // 小程序消息desc
val thumbnail: String? = call.argument(WechatPluginKeys.THUMBNAIL) val thumbnail: String? = call.argument(WechatPluginKeys.THUMBNAIL)
GlobalScope.launch((Dispatchers.Main), CoroutineStart.DEFAULT, { GlobalScope.launch((Dispatchers.Main), CoroutineStart.DEFAULT) {
if (thumbnail.isNullOrBlank()) { if (thumbnail.isNullOrBlank()) {
msg.thumbData = null msg.thumbData = null
} else { } else {
msg.thumbData = getThumbnailByteArrayMiniProgram(registrar, thumbnail!!) msg.thumbData = getThumbnailByteArrayMiniProgram(registrar, thumbnail)
} }
val req = SendMessageToWX.Req() val req = SendMessageToWX.Req()
setCommonArguments(call, req, msg) setCommonArguments(call, req, msg)
...@@ -129,38 +129,43 @@ internal class FluwxShareHandler { ...@@ -129,38 +129,43 @@ internal class FluwxShareHandler {
) )
) )
}) }
} }
private suspend fun getThumbnailByteArrayMiniProgram(registrar: PluginRegistry.Registrar?, thumbnail: String): ByteArray { private suspend fun getThumbnailByteArrayMiniProgram(registrar: PluginRegistry.Registrar?, thumbnail: String): ByteArray {
return GlobalScope.async(Dispatchers.Default, CoroutineStart.DEFAULT, { return GlobalScope.async(Dispatchers.Default, CoroutineStart.DEFAULT) {
val result = WeChatThumbnailUtil.thumbnailForMiniProgram(thumbnail, registrar) val result = WeChatThumbnailUtil.thumbnailForMiniProgram(thumbnail, registrar)
result ?: byteArrayOf() result ?: byteArrayOf()
}).await() }.await()
} }
private suspend fun getImageByteArrayCommon(registrar: PluginRegistry.Registrar?, imagePath: String): ByteArray { private suspend fun getImageByteArrayCommon(registrar: PluginRegistry.Registrar?, imagePath: String): ByteArray {
return GlobalScope.async(Dispatchers.Default, CoroutineStart.DEFAULT, { return GlobalScope.async(Dispatchers.Default, CoroutineStart.DEFAULT) {
val result = ShareImageUtil.getImageData(registrar, imagePath) val result = ShareImageUtil.getImageData(registrar, imagePath)
result ?: byteArrayOf() result ?: byteArrayOf()
}).await() }.await()
} }
// private suspend fun getThumbnailByteArrayCommon(registrar: PluginRegistry.Registrar?, thumbnail: String): ByteArray {
// return GlobalScope.async(Dispatchers.Default, CoroutineStart.DEFAULT, {
// val result = WeChatThumbnailUtil.thumbnailForCommon(thumbnail, registrar)
// result ?: byteArrayOf()
// }).await()
// }
private suspend fun getThumbnailByteArrayCommon(registrar: PluginRegistry.Registrar?, thumbnail: String): ByteArray { private suspend fun getThumbnailByteArrayCommon(registrar: PluginRegistry.Registrar?, thumbnail: String): ByteArray {
return GlobalScope.async(Dispatchers.Default, CoroutineStart.DEFAULT, { return GlobalScope.async(Dispatchers.Default, CoroutineStart.DEFAULT) {
val result = WeChatThumbnailUtil.thumbnailForCommon(thumbnail, registrar) val result = WeChatThumbnailUtil.thumbnailForCommon(thumbnail, registrar)
result ?: byteArrayOf() result ?: byteArrayOf()
}).await() }.await()
} }
private fun shareImage(call: MethodCall, result: MethodChannel.Result) { private fun shareImage(call: MethodCall, result: MethodChannel.Result) {
val imagePath = call.argument<String>(WechatPluginKeys.IMAGE) val imagePath = call.argument<String>(WechatPluginKeys.IMAGE)
GlobalScope.launch(Dispatchers.Main, CoroutineStart.DEFAULT, { GlobalScope.launch(Dispatchers.Main, CoroutineStart.DEFAULT) {
val byteArray: ByteArray? = if (imagePath.isNullOrBlank()){ val byteArray: ByteArray? = if (imagePath.isNullOrBlank()){
byteArrayOf() byteArrayOf()
}else{ }else{
...@@ -188,7 +193,7 @@ internal class FluwxShareHandler { ...@@ -188,7 +193,7 @@ internal class FluwxShareHandler {
// val thumbnailData = Util.bmpToByteArray(bitmap,true) // val thumbnailData = Util.bmpToByteArray(bitmap,true)
handleShareImage(imgObj, call, thumbnailData, result) handleShareImage(imgObj, call, thumbnailData, result)
}) }
} }
...@@ -234,7 +239,7 @@ internal class FluwxShareHandler { ...@@ -234,7 +239,7 @@ internal class FluwxShareHandler {
msg.description = call.argument("description") msg.description = call.argument("description")
val thumbnail: String? = call.argument("thumbnail") val thumbnail: String? = call.argument("thumbnail")
GlobalScope.launch(Dispatchers.Main, CoroutineStart.DEFAULT, { GlobalScope.launch(Dispatchers.Main, CoroutineStart.DEFAULT) {
if (thumbnail != null && thumbnail.isNotBlank()) { if (thumbnail != null && thumbnail.isNotBlank()) {
msg.thumbData = getThumbnailByteArrayCommon(registrar, thumbnail) msg.thumbData = getThumbnailByteArrayCommon(registrar, thumbnail)
} }
...@@ -249,7 +254,7 @@ internal class FluwxShareHandler { ...@@ -249,7 +254,7 @@ internal class FluwxShareHandler {
WechatPluginKeys.RESULT to done WechatPluginKeys.RESULT to done
) )
) )
}) }
} }
...@@ -269,7 +274,7 @@ internal class FluwxShareHandler { ...@@ -269,7 +274,7 @@ internal class FluwxShareHandler {
msg.description = call.argument(WechatPluginKeys.DESCRIPTION) msg.description = call.argument(WechatPluginKeys.DESCRIPTION)
val thumbnail: String? = call.argument(WechatPluginKeys.THUMBNAIL) val thumbnail: String? = call.argument(WechatPluginKeys.THUMBNAIL)
GlobalScope.launch(Dispatchers.Main, CoroutineStart.DEFAULT, { GlobalScope.launch(Dispatchers.Main, CoroutineStart.DEFAULT) {
if (thumbnail != null && thumbnail.isNotBlank()) { if (thumbnail != null && thumbnail.isNotBlank()) {
msg.thumbData = getThumbnailByteArrayCommon(registrar, thumbnail) msg.thumbData = getThumbnailByteArrayCommon(registrar, thumbnail)
} }
...@@ -283,7 +288,7 @@ internal class FluwxShareHandler { ...@@ -283,7 +288,7 @@ internal class FluwxShareHandler {
WechatPluginKeys.RESULT to done WechatPluginKeys.RESULT to done
) )
) )
}) }
} }
...@@ -298,7 +303,7 @@ internal class FluwxShareHandler { ...@@ -298,7 +303,7 @@ internal class FluwxShareHandler {
msg.title = call.argument(WechatPluginKeys.TITLE) msg.title = call.argument(WechatPluginKeys.TITLE)
msg.description = call.argument(WechatPluginKeys.DESCRIPTION) msg.description = call.argument(WechatPluginKeys.DESCRIPTION)
val thumbnail: String? = call.argument(WechatPluginKeys.THUMBNAIL) val thumbnail: String? = call.argument(WechatPluginKeys.THUMBNAIL)
GlobalScope.launch(Dispatchers.Main, CoroutineStart.DEFAULT, { GlobalScope.launch(Dispatchers.Main, CoroutineStart.DEFAULT) {
if (thumbnail != null && thumbnail.isNotBlank()) { if (thumbnail != null && thumbnail.isNotBlank()) {
msg.thumbData = getThumbnailByteArrayCommon(registrar, thumbnail) msg.thumbData = getThumbnailByteArrayCommon(registrar, thumbnail)
} }
...@@ -312,7 +317,7 @@ internal class FluwxShareHandler { ...@@ -312,7 +317,7 @@ internal class FluwxShareHandler {
WechatPluginKeys.RESULT to done WechatPluginKeys.RESULT to done
) )
) )
}) }
} }
// private fun createWxImageObject(imagePath:String):WXImageObject?{ // private fun createWxImageObject(imagePath:String):WXImageObject?{
......
buildscript { buildscript {
ext.kotlin_version = '1.2.71' ext.kotlin_version = '1.3.0'
repositories { repositories {
google() google()
jcenter() jcenter()
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论