diff --git a/app/src/main/java/com/casic/br/fragment/waterheater/StatusPageFragment.kt b/app/src/main/java/com/casic/br/fragment/waterheater/StatusPageFragment.kt
index 206fbff..7c5ba31 100644
--- a/app/src/main/java/com/casic/br/fragment/waterheater/StatusPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/waterheater/StatusPageFragment.kt
@@ -9,7 +9,6 @@
 import com.casic.br.R
 import com.casic.br.extensions.diffDate
 import com.casic.br.utils.CommandManager
-import com.casic.br.utils.TuyaDeviceListener
 import com.casic.br.vm.DeviceViewModel
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
@@ -88,6 +87,34 @@
                                 else -> "已开机"
                             }
                         }
+                        "105" ->
+                            paramObject.put(
+                                "recentWaterConsumption",
+                                String.format("${parseObject[it] as Int}L")
+                            )
+                        "106" ->
+                            paramObject.put(
+                                "totalWaterConsumption",
+                                String.format("${parseObject[it] as Int}t")
+                            )
+                        "103" ->
+                            paramObject.put(
+                                "recentGasConsumption",
+                                String.format(
+                                    "${parseObject[it] as Int}${
+                                        resources.getString(R.string.volume_unit)
+                                    }"
+                                )
+                            )
+                        "104" ->
+                            paramObject.put(
+                                "totalGasConsumption",
+                                String.format(
+                                    "${parseObject[it] as Int}${
+                                        resources.getString(R.string.volume_unit)
+                                    }"
+                                )
+                            )
                     }
                 }
             }
@@ -131,44 +158,6 @@
                 CommandManager.getTuyaDp(deviceInstance, "103")
                 CommandManager.getTuyaDp(deviceInstance, "104")
 
-                deviceInstance.registerDevListener(object : TuyaDeviceListener() {
-                    override fun onDpUpdate(devId: String?, dpStr: String?) {
-                        val parseObject = JSONObject.parseObject(dpStr)
-                        parseObject.keys.forEach {
-                            when (it) {
-                                "105" ->
-                                    paramObject.put(
-                                        "recentWaterConsumption",
-                                        String.format("${parseObject[it] as Int}L")
-                                    )
-                                "106" ->
-                                    paramObject.put(
-                                        "totalWaterConsumption",
-                                        String.format("${parseObject[it] as Int}t")
-                                    )
-                                "103" ->
-                                    paramObject.put(
-                                        "recentGasConsumption",
-                                        String.format(
-                                            "${parseObject[it] as Int}${
-                                                resources.getString(R.string.volume_unit)
-                                            }"
-                                        )
-                                    )
-                                "104" ->
-                                    paramObject.put(
-                                        "totalGasConsumption",
-                                        String.format(
-                                            "${parseObject[it] as Int}${
-                                                resources.getString(R.string.volume_unit)
-                                            }"
-                                        )
-                                    )
-                            }
-                        }
-                    }
-                })
-
                 val obj = org.json.JSONObject()
                 obj.put("heaterInfo", paramObject)
                 deviceViewModel.addDeviceData(obj)