From db1da76ff60f17e7e267e7df878adc2cff6db389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <zhangyujiu@ghzhushou.com>
Date: Wed, 6 Jul 2022 13:52:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?=
 =?UTF-8?q?=E6=89=8BV5.11.0=E3=80=91=E5=90=8C=E6=AD=A5=E6=AD=A3=E5=BC=8F?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98=E6=B1=87=E6=80=BB(0706?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88)=20https://git.shanqu.cc/pm/halo/halo-app-is?=
 =?UTF-8?q?sues/-/issues/1958?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qa/video/detail/desc/VideoDescTopViewHolder.kt | 14 +++++---------
 .../gh/gamecenter/video/detail/DetailPlayerView.kt |  6 +-----
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/detail/desc/VideoDescTopViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/desc/VideoDescTopViewHolder.kt
index 5e5f47b01f..47b74f26ee 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/desc/VideoDescTopViewHolder.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/desc/VideoDescTopViewHolder.kt
@@ -40,7 +40,8 @@ class VideoDescTopViewHolder(
         binding.concernBtn.run {
             goneIf(entity.user.id == UserManager.getInstance().userId)
             text = if (entity.me.isFollower) "已关注" else "关注"
-            background = if (entity.me.isFollower) R.drawable.bg_shape_f5_radius_999.toDrawable() else R.drawable.button_round_primary_light.toDrawable()
+            background =
+                if (entity.me.isFollower) R.drawable.bg_shape_f5_radius_999.toDrawable() else R.drawable.button_round_primary_light.toDrawable()
             setTextColor(if (entity.me.isFollower) R.color.text_subtitleDesc.toColor() else R.color.theme_font.toColor())
         }
         binding.titleTv.text = entity.title
@@ -215,11 +216,7 @@ class VideoDescTopViewHolder(
 
     private fun share(entity: ForumVideoEntity) {
         val shareIcon = entity.poster
-        val shareUrl = if (isPublishEnv()) {
-            "https://m.ghzs666.com/video/${entity.id}"
-        } else {
-            "https://resource.ghzs.com/page/video_play/video/video.html?video=${entity.id}"
-        }
+        val shareUrl = binding.root.context.getString(R.string.share_community_video_url, entity.shortId)
         ShareUtils.getInstance(binding.root.context)
             .showShareWindowsCallback(binding.root.context as Activity,
                 (binding.root.context as Activity).window.decorView,
@@ -229,9 +226,8 @@ class VideoDescTopViewHolder(
                 entity.des,
                 ShareUtils.ShareEntrance.video, entity.id, object : ShareUtils.ShareCallBack {
                     override fun onSuccess(label: String) {
-                        if ("短信" == label || "复制链接" == label) mVideoDetailViewModel.shareVideoStatistics(
-                            entity
-                        )
+                        if ("短信" == label || "复制链接" == label)
+                            mVideoDetailViewModel.shareVideoStatistics(entity)
                     }
 
                     override fun onCancel() {
diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt b/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt
index 097c98a6cf..5550c2a9c5 100644
--- a/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt
+++ b/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt
@@ -304,11 +304,7 @@ class DetailPlayerView @JvmOverloads constructor(context: Context, attrs: Attrib
             mVideoEntity?.let {
                 val shareIcon = it.poster
                 val shareSummary = "@" + it.user.name + " 在光环助手发布了游戏小视频，快点开看看吧"
-                val shareUrl = if (isPublishEnv()) {
-                    "https://m.ghzs666.com/video/${it.id}"
-                } else {
-                    "https://resource.ghzs.com/page/video_play/video/video.html?video=${it.id}"
-                }
+                val shareUrl = context.getString(R.string.share_community_video_url, it.shortId)
                 ShareUtils.getInstance(context).showShareWindowsCallback(context as Activity,
                     this,
                     shareUrl,