From 74a7ccecfcb1a878f4501701a3fe61a025e22971 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 14 Mar 2024 19:08:22 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=88=86=E4=BA=AB=E9=82=80?= =?UTF-8?q?=E8=AF=B7=E6=94=AF=E6=8C=81=E5=8A=A8=E6=80=81=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=9A=E6=A0=87=E9=A2=98=E3=80=81=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yizhuan/erban/ui/invite/ShareInviteDialog.kt | 5 +++-- .../com/yizhuan/erban/ui/invite/ShareInviteInfo.kt | 4 ++++ .../com/yizhuan/erban/ui/setting/SettingActivity.kt | 10 ++++++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/ui/invite/ShareInviteDialog.kt b/app/src/main/java/com/yizhuan/erban/ui/invite/ShareInviteDialog.kt index e68cba2ab..1fe01e860 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/invite/ShareInviteDialog.kt +++ b/app/src/main/java/com/yizhuan/erban/ui/invite/ShareInviteDialog.kt @@ -80,16 +80,17 @@ class ShareInviteDialog(val data: ShareInviteInfo) : BottomSheetDialogFragment() private fun share(platform: Platform, data: ShareInviteInfo) { val url = data.toUrl val sp = Platform.ShareParams() + sp.imageUrl = data.shareImg when (platform.name) { Facebook.NAME -> { - sp.title = data.shareText + sp.title = data.shareTitle sp.text = data.shareText sp.url = url sp.shareType = Platform.SHARE_WEBPAGE } Line.NAME -> { - sp.text = "${data.shareText}[$url]" + sp.text = "${data.shareTitle}[$url]" } } diff --git a/app/src/main/java/com/yizhuan/erban/ui/invite/ShareInviteInfo.kt b/app/src/main/java/com/yizhuan/erban/ui/invite/ShareInviteInfo.kt index 1eb3aba80..2f3de94fc 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/invite/ShareInviteInfo.kt +++ b/app/src/main/java/com/yizhuan/erban/ui/invite/ShareInviteInfo.kt @@ -18,6 +18,10 @@ data class ShareInviteInfo( val text: String? = null, // 分享文案 val shareText: String? = null, + // 分享图片 + val shareImg: String? = null, + // 分享标题 + val shareTitle: String? = null, // 跳转网页地址 val toUrl: String? = null, // （1分享2保存） diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.kt b/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.kt index 5c760408b..bfb777b38 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.kt @@ -223,7 +223,7 @@ class SettingActivity : BaseViewBindingActivity(), View. private fun debug() { // CommonWebViewActivity.start( // this, -// "http://192.168.19.136:5502/view/peko/activity/2024-invitationFission/index.html" +// "http://192.168.19.136:5502/view/peko/activity/2024-invitationFission/share.html" // ) val qrcodeUrl = "https://img0.baidu.com/it/u=4220524728,2310074610&fm=253&app=120&size=w931&n=0&f=JPEG&fmt=auto?sec=1710349200&t=39faa005691f3ebde5b8bf2b99708f1b" @@ -231,11 +231,13 @@ class SettingActivity : BaseViewBindingActivity(), View. qrCodeUrl = qrcodeUrl, invitationCode = Random.nextInt().toString(), text = "扫码下载PiKO并填写我的邀请码，立得1000钻石!!", - shareText = null, + shareTitle = "分享标题", + shareText = "分享文本", + shareImg = qrcodeUrl, toUrl = "https://www.baidu.com", ) - InviteImageHelper().saveToAlbum(this, rxPermissions, data) -// ShareInviteDialog(data).show(supportFragmentManager, "A") +// InviteImageHelper().saveToAlbum(this, rxPermissions, data) + ShareInviteDialog(data).show(supportFragmentManager, "A") // val json = "{\"data\":{\"diamonds\":225000,\"itemId\":32,\"itemMultiple\":45,\"nick\":\"XG001\",\"roomUid\":2881,\"uid\":2881},\"first\":95,\"second\":955}" // RedPackageOpenDialog2().show(this) // val json = "{\"first\":85,\"second\":855,\"data\":{\"nick\":\"66丢丢丢丢丢多多多的hhhh\",\"preVipName\":\"子爵\",\"floatPic\":\"https://image.hfighting.com/Fq3JtbK2acO3FN-3vWZo8ldtHfse\",\"uid\":2735,\"currVipName\":\"侯爵\",\"erbanNo\":66,\"roomUid\":2734,\"avatar\":\"https://img.pekolive.com/default_avatar.png\",\"currVipLevel\":5}}"