From e7bc17c29fdf66228056b2f826c0a6aa19a526cf Mon Sep 17 00:00:00 2001
From: liuyirong <liuyirong@ghzhushou.com>
Date: Tue, 20 Dec 2022 17:53:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=95=85=E7=8E=A9=E5=8A=A9=E6=89=8B?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8F=8D=E9=A6=88=E7=9B=B8=E5=85=B3=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E2=80=94=E5=AE=A2=E6=88=B7=E7=AB=AF=20https://jira.sh?=
 =?UTF-8?q?anqu.cc/browse/GHZS-779?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gh/vspace/VFeedbackDialogFragment.kt  | 19 +++++++++++++++----
 app/src/main/java/com/gh/vspace/VHelper.kt    |  4 ++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/gh/vspace/VFeedbackDialogFragment.kt b/app/src/main/java/com/gh/vspace/VFeedbackDialogFragment.kt
index 50ac91ef8f..6c7dd35738 100644
--- a/app/src/main/java/com/gh/vspace/VFeedbackDialogFragment.kt
+++ b/app/src/main/java/com/gh/vspace/VFeedbackDialogFragment.kt
@@ -82,7 +82,9 @@ class VFeedbackDialogFragment : BaseDialogFragment() {
             dismissAllowingStateLoss()
         }
         mBinding.submitTv.setOnClickListener {
-            mViewModel.postFeedback(mGame!!.id, mBinding.feedbackEt.text.toString(), getSelectedTagString())
+            mGame?.run {
+                mViewModel.postFeedback(this, mBinding.feedbackEt.text.toString(), getSelectedTagString())
+            }
             NewFlatLogUtils.logHaloFunGameExitDialogSubmitClick(
                 mGame?.id ?: "",
                 mBinding.feedbackEt.text.toString(),
@@ -192,7 +194,16 @@ class VFeedbackDialogFragment : BaseDialogFragment() {
 
     class VFeedbackViewModel : ViewModel() {
 
-        fun postFeedback(gameId: String, message: String, tags: ArrayList<String>) {
+        fun postFeedback(game: GameEntity, message: String, tags: ArrayList<String>) {
+            val processedMessage = StringBuilder().apply {
+                append(game.name)
+                game.getApk().safelyGetInRelease(0)?.version?.run {
+                    append("-$this")
+                }
+                if (message.isNotBlank()) {
+                    append("-$message")
+                }
+            }
             val json = json {
                 "from" to ""
                 "ghversion" to PackageUtils.getGhVersionName()
@@ -206,8 +217,8 @@ class VFeedbackDialogFragment : BaseDialogFragment() {
                 "rom" to RomIdentifier.getRom().name + " " + RomIdentifier.getRom().versionName
 
                 "suggestion_type" to "畅玩问题"
-                "game_id" to gameId
-                "message" to message
+                "game_id" to game.id
+                "message" to processedMessage
                 "tags" to JSONArray(tags)
             }
 
diff --git a/app/src/main/java/com/gh/vspace/VHelper.kt b/app/src/main/java/com/gh/vspace/VHelper.kt
index 4c4f32bfa0..99304b0867 100644
--- a/app/src/main/java/com/gh/vspace/VHelper.kt
+++ b/app/src/main/java/com/gh/vspace/VHelper.kt
@@ -55,7 +55,6 @@ import io.reactivex.schedulers.Schedulers
 import org.greenrobot.eventbus.EventBus
 import java.io.File
 import java.util.*
-import kotlin.collections.ArrayList
 
 object VHelper {
 
@@ -781,7 +780,8 @@ object VHelper {
                     ApkEntity(
                         packageName = downloadEntity.packageName,
                         url = downloadEntity.url,
-                        platform = downloadEntity.platform
+                        platform = downloadEntity.platform,
+                        version = downloadEntity.versionName
                     )
                 )
             )