【ID871407511】合规修复-设备离线时，反馈问题跳转到h5对应的反馈页面。

http://tapd.oa.com/NEW_IOT/prong/stories/view/1020393192871407511

Change-Id: I05e8ef36948cf277b8bd179d6a31e10d30dba29a

Author: SundoggyNew

app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/ControlPanelActivity.kt

@@ -1,6 +1,7 @@
 package com.tencent.iot.explorer.link.kitlink.activity
 
 import android.bluetooth.BluetoothGatt
+import android.content.Intent
 import android.text.TextUtils
 import android.util.Log
 import android.view.View
@@ -23,6 +24,7 @@ import com.tencent.iot.explorer.link.core.link.listener.BleDeviceConnectionListe
 import com.tencent.iot.explorer.link.core.link.service.BleConfigService
 import com.tencent.iot.explorer.link.core.log.L
 import com.tencent.iot.explorer.link.customview.recyclerview.CRecyclerView
+import com.tencent.iot.explorer.link.kitlink.consts.CommonField
 import com.tencent.iot.explorer.link.kitlink.entity.DevicePropertyEntity
 import com.tencent.iot.explorer.link.kitlink.entity.ProductEntity
 import com.tencent.iot.explorer.link.kitlink.entity.ProductsEntity
@@ -296,7 +298,10 @@ class ControlPanelActivity : PActivity(), CoroutineScope by MainScope(), Control
             }
 
             override fun toFeedback(popupWindow: OfflinePopupWindow) {
-                jumpActivity(FeedbackActivity::class.java, true)
+                var intent = Intent(this@ControlPanelActivity, HelpWebViewActivity::class.java)
+                intent.putExtra(CommonField.FEEDBACK_DEVICE, true)
+                intent.putExtra(CommonField.FEEDBACK_CATEGORY, deviceEntity?.AliasName)
+                startActivity(intent)
             }
         }
         offlinePopup?.setBg(control_panel_bg)

app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/HelpWebViewActivity.kt

@@ -51,6 +51,8 @@ class HelpWebViewActivity: BaseActivity(), MyCallback, View.OnClickListener {
     private val FILE_CHOOSER_CAMERA_RESULT_CODE = 9998
 
     private var configQuestionList = false
+    private var feedbackDevice = false
+    private var feedbackCategory = ""
     private var permissionDialog: PermissionDialog? = null
 
     private var permissions = arrayOf(
@@ -67,6 +69,12 @@ class HelpWebViewActivity: BaseActivity(), MyCallback, View.OnClickListener {
         if (intent.hasExtra(CommonField.CONFIG_QUESTION_LIST)) {
             configQuestionList = intent.getBooleanExtra(CommonField.CONFIG_QUESTION_LIST, false)
         }
+        if (intent.hasExtra(CommonField.FEEDBACK_DEVICE)) {
+            feedbackDevice = intent.getBooleanExtra(CommonField.FEEDBACK_DEVICE, false)
+        }
+        if (intent.hasExtra(CommonField.FEEDBACK_CATEGORY)) {
+            feedbackCategory = intent.getStringExtra(CommonField.FEEDBACK_CATEGORY)
+        }
         initWebView()
         getAppGetTokenTicket()
     }
@@ -157,6 +165,9 @@ class HelpWebViewActivity: BaseActivity(), MyCallback, View.OnClickListener {
                 if (configQuestionList) {
                     url += "/#/pages/Functional/HelpCenter/QnAList/QnAList?genCateID=config7"
                 }
+                if (feedbackDevice) {
+                    url += "#/pages/User/Feedback/Feedback?cate=" + feedbackCategory
+                }
 
                 help_web.loadUrl(url)
             }

app/src/main/java/com/tencent/iot/explorer/link/kitlink/consts/CommonField.kt

@@ -39,6 +39,8 @@ object CommonField {
     const val HANDLER_NAME = "handlerName"
     const val MSG_TYPE = "msgType"
     const val CONFIG_QUESTION_LIST = "configQuestionList"
+    const val FEEDBACK_DEVICE = "feedbackDevice"
+    const val FEEDBACK_CATEGORY = "feedbackCategory"
     const val FIREBASE_USER_ID = "UserID"
     const val LOAD_VIEW_TXT_TYPE = "loadViewTxtType"
     const val CONFIG_TYPE = "configType"