diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6abc67b..1eb9752 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,7 @@
         <activity android:name=".view.device.SmartGatewayActivity" />
         <activity android:name=".view.ScanZigbeeActivity" />
         <activity android:name=".view.device.MotionSensorActivity" />
+        <activity android:name=".view.device.TAndHSensorActivity" />
 
         <!--适配华为（huawei）刘海屏-->
         <meta-data

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6abc67b..1eb9752 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,7 @@
         <activity android:name=".view.device.SmartGatewayActivity" />
         <activity android:name=".view.ScanZigbeeActivity" />
         <activity android:name=".view.device.MotionSensorActivity" />
+        <activity android:name=".view.device.TAndHSensorActivity" />
 
         <!--适配华为（huawei）刘海屏-->
         <meta-data
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 58f9e46..74c77ba 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -163,6 +163,10 @@
                                     //人体传感器
                                     requireContext().navigatePageTo<MotionSensorActivity>()
                                 }
+                                selectedCategory.contains("wsdcg") -> {
+                                    //温湿度传感器
+                                    requireContext().navigatePageTo<TAndHSensorActivity>()
+                                }
                             }
                         } else {
                             requireContext().navigatePageTo<LoginActivity>()

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6abc67b..1eb9752 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,7 @@
         <activity android:name=".view.device.SmartGatewayActivity" />
         <activity android:name=".view.ScanZigbeeActivity" />
         <activity android:name=".view.device.MotionSensorActivity" />
+        <activity android:name=".view.device.TAndHSensorActivity" />
 
         <!--适配华为（huawei）刘海屏-->
         <meta-data
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 58f9e46..74c77ba 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -163,6 +163,10 @@
                                     //人体传感器
                                     requireContext().navigatePageTo<MotionSensorActivity>()
                                 }
+                                selectedCategory.contains("wsdcg") -> {
+                                    //温湿度传感器
+                                    requireContext().navigatePageTo<TAndHSensorActivity>()
+                                }
                             }
                         } else {
                             requireContext().navigatePageTo<LoginActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
new file mode 100644
index 0000000..2267755
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class HumidityPageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_humidity
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6abc67b..1eb9752 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,7 @@
         <activity android:name=".view.device.SmartGatewayActivity" />
         <activity android:name=".view.ScanZigbeeActivity" />
         <activity android:name=".view.device.MotionSensorActivity" />
+        <activity android:name=".view.device.TAndHSensorActivity" />
 
         <!--适配华为（huawei）刘海屏-->
         <meta-data
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 58f9e46..74c77ba 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -163,6 +163,10 @@
                                     //人体传感器
                                     requireContext().navigatePageTo<MotionSensorActivity>()
                                 }
+                                selectedCategory.contains("wsdcg") -> {
+                                    //温湿度传感器
+                                    requireContext().navigatePageTo<TAndHSensorActivity>()
+                                }
                             }
                         } else {
                             requireContext().navigatePageTo<LoginActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
new file mode 100644
index 0000000..2267755
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class HumidityPageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_humidity
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
new file mode 100644
index 0000000..2d8a2df
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class TemperaturePageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_temperature
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6abc67b..1eb9752 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,7 @@
         <activity android:name=".view.device.SmartGatewayActivity" />
         <activity android:name=".view.ScanZigbeeActivity" />
         <activity android:name=".view.device.MotionSensorActivity" />
+        <activity android:name=".view.device.TAndHSensorActivity" />
 
         <!--适配华为（huawei）刘海屏-->
         <meta-data
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 58f9e46..74c77ba 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -163,6 +163,10 @@
                                     //人体传感器
                                     requireContext().navigatePageTo<MotionSensorActivity>()
                                 }
+                                selectedCategory.contains("wsdcg") -> {
+                                    //温湿度传感器
+                                    requireContext().navigatePageTo<TAndHSensorActivity>()
+                                }
                             }
                         } else {
                             requireContext().navigatePageTo<LoginActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
new file mode 100644
index 0000000..2267755
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class HumidityPageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_humidity
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
new file mode 100644
index 0000000..2d8a2df
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class TemperaturePageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_temperature
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
index d042a7f..aeb638b 100644
--- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
@@ -34,8 +34,32 @@
     val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们")
     val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴")
     val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置")
+    val T_H_PAGE_TITLE = arrayOf("温度记录", "湿度记录")
     val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu)
     val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话")
+
+    //TODO 模拟数据
+    val TEST_IMAGE = intArrayOf(
+        R.mipmap.t_1,
+        R.mipmap.t_2,
+        R.mipmap.t_3,
+        R.mipmap.t_4,
+        R.mipmap.t_5,
+        R.mipmap.t_6,
+        R.mipmap.t_7,
+        R.mipmap.t_8
+    )
+    val TEST_ARRAY = arrayOf(
+        "24LS01壁挂炉",
+        "多功能智能热水器",
+        "24LC01壁挂炉",
+        "16RC01热水器",
+        "TXC01油烟机",
+        "QZE03燃气灶",
+        "多功能智能油烟机",
+        "多功能智能燃气灶"
+    )
+
     //预置颜色
     val COLORS = arrayOf(
         R.color.color_1, R.color.color_2, R.color.color_3,

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6abc67b..1eb9752 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,7 @@
         <activity android:name=".view.device.SmartGatewayActivity" />
         <activity android:name=".view.ScanZigbeeActivity" />
         <activity android:name=".view.device.MotionSensorActivity" />
+        <activity android:name=".view.device.TAndHSensorActivity" />
 
         <!--适配华为（huawei）刘海屏-->
         <meta-data
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 58f9e46..74c77ba 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -163,6 +163,10 @@
                                     //人体传感器
                                     requireContext().navigatePageTo<MotionSensorActivity>()
                                 }
+                                selectedCategory.contains("wsdcg") -> {
+                                    //温湿度传感器
+                                    requireContext().navigatePageTo<TAndHSensorActivity>()
+                                }
                             }
                         } else {
                             requireContext().navigatePageTo<LoginActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
new file mode 100644
index 0000000..2267755
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class HumidityPageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_humidity
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
new file mode 100644
index 0000000..2d8a2df
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class TemperaturePageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_temperature
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
index d042a7f..aeb638b 100644
--- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
@@ -34,8 +34,32 @@
     val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们")
     val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴")
     val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置")
+    val T_H_PAGE_TITLE = arrayOf("温度记录", "湿度记录")
     val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu)
     val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话")
+
+    //TODO 模拟数据
+    val TEST_IMAGE = intArrayOf(
+        R.mipmap.t_1,
+        R.mipmap.t_2,
+        R.mipmap.t_3,
+        R.mipmap.t_4,
+        R.mipmap.t_5,
+        R.mipmap.t_6,
+        R.mipmap.t_7,
+        R.mipmap.t_8
+    )
+    val TEST_ARRAY = arrayOf(
+        "24LS01壁挂炉",
+        "多功能智能热水器",
+        "24LC01壁挂炉",
+        "16RC01热水器",
+        "TXC01油烟机",
+        "QZE03燃气灶",
+        "多功能智能油烟机",
+        "多功能智能燃气灶"
+    )
+
     //预置颜色
     val COLORS = arrayOf(
         R.color.color_1, R.color.color_2, R.color.color_3,
diff --git a/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
new file mode 100644
index 0000000..7c8dfe7
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
@@ -0,0 +1,135 @@
+package com.casic.br.view.device
+
+import android.os.Handler
+import android.util.Log
+import android.view.View
+import androidx.fragment.app.Fragment
+import com.casic.br.R
+import com.casic.br.adapter.TabPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.casic.br.extensions.selectCategory
+import com.casic.br.extensions.toBatteryImage
+import com.casic.br.fragment.th.HumidityPageFragment
+import com.casic.br.fragment.th.TemperaturePageFragment
+import com.casic.br.utils.DeserializeModel
+import com.casic.br.utils.LocaleConstant
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.tuya.smart.home.sdk.TuyaHomeSdk
+import com.tuya.smart.home.sdk.bean.HomeBean
+import com.tuya.smart.home.sdk.callback.ITuyaHomeResultCallback
+import com.tuya.smart.sdk.bean.DeviceBean
+import kotlinx.android.synthetic.main.activity_t_h_senser.*
+import kotlinx.android.synthetic.main.include_device_title.*
+import java.util.*
+import kotlin.collections.HashMap
+
+/**
+ * 温湿度传感器
+ * TODO 数据上报暂缓
+ * */
+class TAndHSensorActivity : KotlinBaseActivity() {
+
+    private val context = this@TAndHSensorActivity
+    private val dataTimer by lazy { Timer() }//数据上传Timer
+    private val dataLinkedList = LinkedList<HashMap<String, Any>>()
+    private lateinit var weakReference: WeakReferenceHandler
+    private var fragmentPages: ArrayList<Fragment> = ArrayList()
+
+    override fun initLayoutView(): Int = R.layout.activity_t_h_senser
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        initLayoutImmersionBar(rootView)
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+
+        leftBackView.setOnClickListener { finish() }
+        rightOperateView.visibility = View.GONE
+    }
+
+    override fun initData() {
+        weakReference = WeakReferenceHandler(callback)
+        //每隔5s传一次数据到服务器
+        dataTimer.schedule(object : TimerTask() {
+            override fun run() {
+                TuyaHomeSdk.newHomeInstance(DeserializeModel.getHomeId())
+                    .getHomeDetail(object : ITuyaHomeResultCallback {
+                        override fun onSuccess(bean: HomeBean) {
+                            bean.deviceList.forEach {
+                                val selectedCategory = it.selectCategory()
+                                if (selectedCategory.contains("wsdcg")) {
+                                    //温湿度传感器
+                                    val msg = weakReference.obtainMessage()
+                                    msg.what = 2022112001
+                                    msg.obj = it
+                                    weakReference.sendMessage(msg)
+                                }
+                            }
+                        }
+
+                        override fun onError(errorCode: String, errorMsg: String) {
+                            Log.d("Casic", "TAndHSensorActivity => onError: $errorMsg")
+                        }
+                    })
+            }
+        }, 0, 5000)
+
+        fragmentPages.add(TemperaturePageFragment())
+        fragmentPages.add(HumidityPageFragment())
+        viewPager.adapter =
+            TabPagerAdapter(fragmentPages, LocaleConstant.T_H_PAGE_TITLE, supportFragmentManager)
+        tabLayout.setupWithViewPager(viewPager)
+    }
+
+    private val callback = Handler.Callback { message ->
+        if (message.what == 2022112001) {
+            val it = message.obj as DeviceBean
+            deviceStateView.text = if (it.isOnline) {
+                "设备在线"
+            } else {
+                "设备已离线"
+            }
+            titleView.text = String.format(it.name + "传感器")
+
+            val dataMap = HashMap<String, Any>()
+
+            val h = it.dps["101"].toString()
+            //温湿度的值需要缩小100倍
+            humidityView.text = if (h.isBlank()) {
+                "0%"
+            } else {
+                "${h.toDouble() / 100}%"
+            }
+            dataMap["humidity"] = humidityView.text.toString().replace("%", "")
+
+            val b = it.dps["102"].toString()
+            batteryView.setBackgroundResource(b.toBatteryImage())
+            batteryValueView.text = "${b}%"
+
+            val t = it.dps["103"].toString()
+            //{"unit":"℃","min":-2000,"max":10000,"scale":2,"step":1,"type":"value"}
+            temperatureView.text = if (h.isBlank()) {
+                "0${resources.getString(R.string.temperature_unit)}"
+            } else {
+                "${t.toDouble() / 100}${resources.getString(R.string.temperature_unit)}"
+            }
+            dataMap["temperature"] = temperatureView.text.toString().replace("°C", "")
+
+            dataLinkedList.add(dataMap)
+        }
+        true
+    }
+
+    override fun initEvent() {
+
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        dataTimer.cancel()
+    }
+}
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6abc67b..1eb9752 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,7 @@
         <activity android:name=".view.device.SmartGatewayActivity" />
         <activity android:name=".view.ScanZigbeeActivity" />
         <activity android:name=".view.device.MotionSensorActivity" />
+        <activity android:name=".view.device.TAndHSensorActivity" />
 
         <!--适配华为（huawei）刘海屏-->
         <meta-data
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 58f9e46..74c77ba 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -163,6 +163,10 @@
                                     //人体传感器
                                     requireContext().navigatePageTo<MotionSensorActivity>()
                                 }
+                                selectedCategory.contains("wsdcg") -> {
+                                    //温湿度传感器
+                                    requireContext().navigatePageTo<TAndHSensorActivity>()
+                                }
                             }
                         } else {
                             requireContext().navigatePageTo<LoginActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
new file mode 100644
index 0000000..2267755
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class HumidityPageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_humidity
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
new file mode 100644
index 0000000..2d8a2df
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class TemperaturePageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_temperature
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
index d042a7f..aeb638b 100644
--- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
@@ -34,8 +34,32 @@
     val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们")
     val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴")
     val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置")
+    val T_H_PAGE_TITLE = arrayOf("温度记录", "湿度记录")
     val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu)
     val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话")
+
+    //TODO 模拟数据
+    val TEST_IMAGE = intArrayOf(
+        R.mipmap.t_1,
+        R.mipmap.t_2,
+        R.mipmap.t_3,
+        R.mipmap.t_4,
+        R.mipmap.t_5,
+        R.mipmap.t_6,
+        R.mipmap.t_7,
+        R.mipmap.t_8
+    )
+    val TEST_ARRAY = arrayOf(
+        "24LS01壁挂炉",
+        "多功能智能热水器",
+        "24LC01壁挂炉",
+        "16RC01热水器",
+        "TXC01油烟机",
+        "QZE03燃气灶",
+        "多功能智能油烟机",
+        "多功能智能燃气灶"
+    )
+
     //预置颜色
     val COLORS = arrayOf(
         R.color.color_1, R.color.color_2, R.color.color_3,
diff --git a/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
new file mode 100644
index 0000000..7c8dfe7
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
@@ -0,0 +1,135 @@
+package com.casic.br.view.device
+
+import android.os.Handler
+import android.util.Log
+import android.view.View
+import androidx.fragment.app.Fragment
+import com.casic.br.R
+import com.casic.br.adapter.TabPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.casic.br.extensions.selectCategory
+import com.casic.br.extensions.toBatteryImage
+import com.casic.br.fragment.th.HumidityPageFragment
+import com.casic.br.fragment.th.TemperaturePageFragment
+import com.casic.br.utils.DeserializeModel
+import com.casic.br.utils.LocaleConstant
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.tuya.smart.home.sdk.TuyaHomeSdk
+import com.tuya.smart.home.sdk.bean.HomeBean
+import com.tuya.smart.home.sdk.callback.ITuyaHomeResultCallback
+import com.tuya.smart.sdk.bean.DeviceBean
+import kotlinx.android.synthetic.main.activity_t_h_senser.*
+import kotlinx.android.synthetic.main.include_device_title.*
+import java.util.*
+import kotlin.collections.HashMap
+
+/**
+ * 温湿度传感器
+ * TODO 数据上报暂缓
+ * */
+class TAndHSensorActivity : KotlinBaseActivity() {
+
+    private val context = this@TAndHSensorActivity
+    private val dataTimer by lazy { Timer() }//数据上传Timer
+    private val dataLinkedList = LinkedList<HashMap<String, Any>>()
+    private lateinit var weakReference: WeakReferenceHandler
+    private var fragmentPages: ArrayList<Fragment> = ArrayList()
+
+    override fun initLayoutView(): Int = R.layout.activity_t_h_senser
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        initLayoutImmersionBar(rootView)
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+
+        leftBackView.setOnClickListener { finish() }
+        rightOperateView.visibility = View.GONE
+    }
+
+    override fun initData() {
+        weakReference = WeakReferenceHandler(callback)
+        //每隔5s传一次数据到服务器
+        dataTimer.schedule(object : TimerTask() {
+            override fun run() {
+                TuyaHomeSdk.newHomeInstance(DeserializeModel.getHomeId())
+                    .getHomeDetail(object : ITuyaHomeResultCallback {
+                        override fun onSuccess(bean: HomeBean) {
+                            bean.deviceList.forEach {
+                                val selectedCategory = it.selectCategory()
+                                if (selectedCategory.contains("wsdcg")) {
+                                    //温湿度传感器
+                                    val msg = weakReference.obtainMessage()
+                                    msg.what = 2022112001
+                                    msg.obj = it
+                                    weakReference.sendMessage(msg)
+                                }
+                            }
+                        }
+
+                        override fun onError(errorCode: String, errorMsg: String) {
+                            Log.d("Casic", "TAndHSensorActivity => onError: $errorMsg")
+                        }
+                    })
+            }
+        }, 0, 5000)
+
+        fragmentPages.add(TemperaturePageFragment())
+        fragmentPages.add(HumidityPageFragment())
+        viewPager.adapter =
+            TabPagerAdapter(fragmentPages, LocaleConstant.T_H_PAGE_TITLE, supportFragmentManager)
+        tabLayout.setupWithViewPager(viewPager)
+    }
+
+    private val callback = Handler.Callback { message ->
+        if (message.what == 2022112001) {
+            val it = message.obj as DeviceBean
+            deviceStateView.text = if (it.isOnline) {
+                "设备在线"
+            } else {
+                "设备已离线"
+            }
+            titleView.text = String.format(it.name + "传感器")
+
+            val dataMap = HashMap<String, Any>()
+
+            val h = it.dps["101"].toString()
+            //温湿度的值需要缩小100倍
+            humidityView.text = if (h.isBlank()) {
+                "0%"
+            } else {
+                "${h.toDouble() / 100}%"
+            }
+            dataMap["humidity"] = humidityView.text.toString().replace("%", "")
+
+            val b = it.dps["102"].toString()
+            batteryView.setBackgroundResource(b.toBatteryImage())
+            batteryValueView.text = "${b}%"
+
+            val t = it.dps["103"].toString()
+            //{"unit":"℃","min":-2000,"max":10000,"scale":2,"step":1,"type":"value"}
+            temperatureView.text = if (h.isBlank()) {
+                "0${resources.getString(R.string.temperature_unit)}"
+            } else {
+                "${t.toDouble() / 100}${resources.getString(R.string.temperature_unit)}"
+            }
+            dataMap["temperature"] = temperatureView.text.toString().replace("°C", "")
+
+            dataLinkedList.add(dataMap)
+        }
+        true
+    }
+
+    override fun initEvent() {
+
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        dataTimer.cancel()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
new file mode 100644
index 0000000..9570167
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_10"
+        android:topRightRadius="@dimen/dp_10" />
+</shape>
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6abc67b..1eb9752 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,7 @@
         <activity android:name=".view.device.SmartGatewayActivity" />
         <activity android:name=".view.ScanZigbeeActivity" />
         <activity android:name=".view.device.MotionSensorActivity" />
+        <activity android:name=".view.device.TAndHSensorActivity" />
 
         <!--适配华为（huawei）刘海屏-->
         <meta-data
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 58f9e46..74c77ba 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -163,6 +163,10 @@
                                     //人体传感器
                                     requireContext().navigatePageTo<MotionSensorActivity>()
                                 }
+                                selectedCategory.contains("wsdcg") -> {
+                                    //温湿度传感器
+                                    requireContext().navigatePageTo<TAndHSensorActivity>()
+                                }
                             }
                         } else {
                             requireContext().navigatePageTo<LoginActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
new file mode 100644
index 0000000..2267755
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class HumidityPageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_humidity
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
new file mode 100644
index 0000000..2d8a2df
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class TemperaturePageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_temperature
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
index d042a7f..aeb638b 100644
--- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
@@ -34,8 +34,32 @@
     val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们")
     val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴")
     val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置")
+    val T_H_PAGE_TITLE = arrayOf("温度记录", "湿度记录")
     val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu)
     val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话")
+
+    //TODO 模拟数据
+    val TEST_IMAGE = intArrayOf(
+        R.mipmap.t_1,
+        R.mipmap.t_2,
+        R.mipmap.t_3,
+        R.mipmap.t_4,
+        R.mipmap.t_5,
+        R.mipmap.t_6,
+        R.mipmap.t_7,
+        R.mipmap.t_8
+    )
+    val TEST_ARRAY = arrayOf(
+        "24LS01壁挂炉",
+        "多功能智能热水器",
+        "24LC01壁挂炉",
+        "16RC01热水器",
+        "TXC01油烟机",
+        "QZE03燃气灶",
+        "多功能智能油烟机",
+        "多功能智能燃气灶"
+    )
+
     //预置颜色
     val COLORS = arrayOf(
         R.color.color_1, R.color.color_2, R.color.color_3,
diff --git a/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
new file mode 100644
index 0000000..7c8dfe7
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
@@ -0,0 +1,135 @@
+package com.casic.br.view.device
+
+import android.os.Handler
+import android.util.Log
+import android.view.View
+import androidx.fragment.app.Fragment
+import com.casic.br.R
+import com.casic.br.adapter.TabPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.casic.br.extensions.selectCategory
+import com.casic.br.extensions.toBatteryImage
+import com.casic.br.fragment.th.HumidityPageFragment
+import com.casic.br.fragment.th.TemperaturePageFragment
+import com.casic.br.utils.DeserializeModel
+import com.casic.br.utils.LocaleConstant
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.tuya.smart.home.sdk.TuyaHomeSdk
+import com.tuya.smart.home.sdk.bean.HomeBean
+import com.tuya.smart.home.sdk.callback.ITuyaHomeResultCallback
+import com.tuya.smart.sdk.bean.DeviceBean
+import kotlinx.android.synthetic.main.activity_t_h_senser.*
+import kotlinx.android.synthetic.main.include_device_title.*
+import java.util.*
+import kotlin.collections.HashMap
+
+/**
+ * 温湿度传感器
+ * TODO 数据上报暂缓
+ * */
+class TAndHSensorActivity : KotlinBaseActivity() {
+
+    private val context = this@TAndHSensorActivity
+    private val dataTimer by lazy { Timer() }//数据上传Timer
+    private val dataLinkedList = LinkedList<HashMap<String, Any>>()
+    private lateinit var weakReference: WeakReferenceHandler
+    private var fragmentPages: ArrayList<Fragment> = ArrayList()
+
+    override fun initLayoutView(): Int = R.layout.activity_t_h_senser
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        initLayoutImmersionBar(rootView)
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+
+        leftBackView.setOnClickListener { finish() }
+        rightOperateView.visibility = View.GONE
+    }
+
+    override fun initData() {
+        weakReference = WeakReferenceHandler(callback)
+        //每隔5s传一次数据到服务器
+        dataTimer.schedule(object : TimerTask() {
+            override fun run() {
+                TuyaHomeSdk.newHomeInstance(DeserializeModel.getHomeId())
+                    .getHomeDetail(object : ITuyaHomeResultCallback {
+                        override fun onSuccess(bean: HomeBean) {
+                            bean.deviceList.forEach {
+                                val selectedCategory = it.selectCategory()
+                                if (selectedCategory.contains("wsdcg")) {
+                                    //温湿度传感器
+                                    val msg = weakReference.obtainMessage()
+                                    msg.what = 2022112001
+                                    msg.obj = it
+                                    weakReference.sendMessage(msg)
+                                }
+                            }
+                        }
+
+                        override fun onError(errorCode: String, errorMsg: String) {
+                            Log.d("Casic", "TAndHSensorActivity => onError: $errorMsg")
+                        }
+                    })
+            }
+        }, 0, 5000)
+
+        fragmentPages.add(TemperaturePageFragment())
+        fragmentPages.add(HumidityPageFragment())
+        viewPager.adapter =
+            TabPagerAdapter(fragmentPages, LocaleConstant.T_H_PAGE_TITLE, supportFragmentManager)
+        tabLayout.setupWithViewPager(viewPager)
+    }
+
+    private val callback = Handler.Callback { message ->
+        if (message.what == 2022112001) {
+            val it = message.obj as DeviceBean
+            deviceStateView.text = if (it.isOnline) {
+                "设备在线"
+            } else {
+                "设备已离线"
+            }
+            titleView.text = String.format(it.name + "传感器")
+
+            val dataMap = HashMap<String, Any>()
+
+            val h = it.dps["101"].toString()
+            //温湿度的值需要缩小100倍
+            humidityView.text = if (h.isBlank()) {
+                "0%"
+            } else {
+                "${h.toDouble() / 100}%"
+            }
+            dataMap["humidity"] = humidityView.text.toString().replace("%", "")
+
+            val b = it.dps["102"].toString()
+            batteryView.setBackgroundResource(b.toBatteryImage())
+            batteryValueView.text = "${b}%"
+
+            val t = it.dps["103"].toString()
+            //{"unit":"℃","min":-2000,"max":10000,"scale":2,"step":1,"type":"value"}
+            temperatureView.text = if (h.isBlank()) {
+                "0${resources.getString(R.string.temperature_unit)}"
+            } else {
+                "${t.toDouble() / 100}${resources.getString(R.string.temperature_unit)}"
+            }
+            dataMap["temperature"] = temperatureView.text.toString().replace("°C", "")
+
+            dataLinkedList.add(dataMap)
+        }
+        true
+    }
+
+    override fun initEvent() {
+
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        dataTimer.cancel()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
new file mode 100644
index 0000000..9570167
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_10"
+        android:topRightRadius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
new file mode 100644
index 0000000..b35e98c
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="@dimen/dp_10"/>
+
+    <stroke
+        android:width="@dimen/dp_10"
+        android:color="@color/mainBackColor" />
+</shape>
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6abc67b..1eb9752 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,7 @@
         <activity android:name=".view.device.SmartGatewayActivity" />
         <activity android:name=".view.ScanZigbeeActivity" />
         <activity android:name=".view.device.MotionSensorActivity" />
+        <activity android:name=".view.device.TAndHSensorActivity" />
 
         <!--适配华为（huawei）刘海屏-->
         <meta-data
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 58f9e46..74c77ba 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -163,6 +163,10 @@
                                     //人体传感器
                                     requireContext().navigatePageTo<MotionSensorActivity>()
                                 }
+                                selectedCategory.contains("wsdcg") -> {
+                                    //温湿度传感器
+                                    requireContext().navigatePageTo<TAndHSensorActivity>()
+                                }
                             }
                         } else {
                             requireContext().navigatePageTo<LoginActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
new file mode 100644
index 0000000..2267755
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class HumidityPageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_humidity
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
new file mode 100644
index 0000000..2d8a2df
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class TemperaturePageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_temperature
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
index d042a7f..aeb638b 100644
--- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
@@ -34,8 +34,32 @@
     val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们")
     val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴")
     val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置")
+    val T_H_PAGE_TITLE = arrayOf("温度记录", "湿度记录")
     val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu)
     val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话")
+
+    //TODO 模拟数据
+    val TEST_IMAGE = intArrayOf(
+        R.mipmap.t_1,
+        R.mipmap.t_2,
+        R.mipmap.t_3,
+        R.mipmap.t_4,
+        R.mipmap.t_5,
+        R.mipmap.t_6,
+        R.mipmap.t_7,
+        R.mipmap.t_8
+    )
+    val TEST_ARRAY = arrayOf(
+        "24LS01壁挂炉",
+        "多功能智能热水器",
+        "24LC01壁挂炉",
+        "16RC01热水器",
+        "TXC01油烟机",
+        "QZE03燃气灶",
+        "多功能智能油烟机",
+        "多功能智能燃气灶"
+    )
+
     //预置颜色
     val COLORS = arrayOf(
         R.color.color_1, R.color.color_2, R.color.color_3,
diff --git a/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
new file mode 100644
index 0000000..7c8dfe7
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
@@ -0,0 +1,135 @@
+package com.casic.br.view.device
+
+import android.os.Handler
+import android.util.Log
+import android.view.View
+import androidx.fragment.app.Fragment
+import com.casic.br.R
+import com.casic.br.adapter.TabPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.casic.br.extensions.selectCategory
+import com.casic.br.extensions.toBatteryImage
+import com.casic.br.fragment.th.HumidityPageFragment
+import com.casic.br.fragment.th.TemperaturePageFragment
+import com.casic.br.utils.DeserializeModel
+import com.casic.br.utils.LocaleConstant
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.tuya.smart.home.sdk.TuyaHomeSdk
+import com.tuya.smart.home.sdk.bean.HomeBean
+import com.tuya.smart.home.sdk.callback.ITuyaHomeResultCallback
+import com.tuya.smart.sdk.bean.DeviceBean
+import kotlinx.android.synthetic.main.activity_t_h_senser.*
+import kotlinx.android.synthetic.main.include_device_title.*
+import java.util.*
+import kotlin.collections.HashMap
+
+/**
+ * 温湿度传感器
+ * TODO 数据上报暂缓
+ * */
+class TAndHSensorActivity : KotlinBaseActivity() {
+
+    private val context = this@TAndHSensorActivity
+    private val dataTimer by lazy { Timer() }//数据上传Timer
+    private val dataLinkedList = LinkedList<HashMap<String, Any>>()
+    private lateinit var weakReference: WeakReferenceHandler
+    private var fragmentPages: ArrayList<Fragment> = ArrayList()
+
+    override fun initLayoutView(): Int = R.layout.activity_t_h_senser
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        initLayoutImmersionBar(rootView)
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+
+        leftBackView.setOnClickListener { finish() }
+        rightOperateView.visibility = View.GONE
+    }
+
+    override fun initData() {
+        weakReference = WeakReferenceHandler(callback)
+        //每隔5s传一次数据到服务器
+        dataTimer.schedule(object : TimerTask() {
+            override fun run() {
+                TuyaHomeSdk.newHomeInstance(DeserializeModel.getHomeId())
+                    .getHomeDetail(object : ITuyaHomeResultCallback {
+                        override fun onSuccess(bean: HomeBean) {
+                            bean.deviceList.forEach {
+                                val selectedCategory = it.selectCategory()
+                                if (selectedCategory.contains("wsdcg")) {
+                                    //温湿度传感器
+                                    val msg = weakReference.obtainMessage()
+                                    msg.what = 2022112001
+                                    msg.obj = it
+                                    weakReference.sendMessage(msg)
+                                }
+                            }
+                        }
+
+                        override fun onError(errorCode: String, errorMsg: String) {
+                            Log.d("Casic", "TAndHSensorActivity => onError: $errorMsg")
+                        }
+                    })
+            }
+        }, 0, 5000)
+
+        fragmentPages.add(TemperaturePageFragment())
+        fragmentPages.add(HumidityPageFragment())
+        viewPager.adapter =
+            TabPagerAdapter(fragmentPages, LocaleConstant.T_H_PAGE_TITLE, supportFragmentManager)
+        tabLayout.setupWithViewPager(viewPager)
+    }
+
+    private val callback = Handler.Callback { message ->
+        if (message.what == 2022112001) {
+            val it = message.obj as DeviceBean
+            deviceStateView.text = if (it.isOnline) {
+                "设备在线"
+            } else {
+                "设备已离线"
+            }
+            titleView.text = String.format(it.name + "传感器")
+
+            val dataMap = HashMap<String, Any>()
+
+            val h = it.dps["101"].toString()
+            //温湿度的值需要缩小100倍
+            humidityView.text = if (h.isBlank()) {
+                "0%"
+            } else {
+                "${h.toDouble() / 100}%"
+            }
+            dataMap["humidity"] = humidityView.text.toString().replace("%", "")
+
+            val b = it.dps["102"].toString()
+            batteryView.setBackgroundResource(b.toBatteryImage())
+            batteryValueView.text = "${b}%"
+
+            val t = it.dps["103"].toString()
+            //{"unit":"℃","min":-2000,"max":10000,"scale":2,"step":1,"type":"value"}
+            temperatureView.text = if (h.isBlank()) {
+                "0${resources.getString(R.string.temperature_unit)}"
+            } else {
+                "${t.toDouble() / 100}${resources.getString(R.string.temperature_unit)}"
+            }
+            dataMap["temperature"] = temperatureView.text.toString().replace("°C", "")
+
+            dataLinkedList.add(dataMap)
+        }
+        true
+    }
+
+    override fun initEvent() {
+
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        dataTimer.cancel()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
new file mode 100644
index 0000000..9570167
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_10"
+        android:topRightRadius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
new file mode 100644
index 0000000..b35e98c
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="@dimen/dp_10"/>
+
+    <stroke
+        android:width="@dimen/dp_10"
+        android:color="@color/mainBackColor" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_shidu.xml b/app/src/main/res/drawable/ic_shidu.xml
new file mode 100644
index 0000000..1d14648
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shidu.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M662.76,296.76c-54.68,-63.47 -107.74,-109.46 -148.67,-144.95l-1.5,-1.3c-11.97,10.77 -24.84,22.36 -37.42,34.01 -34.88,32.3 -74.98,71.57 -112.94,116.15C284.58,391.9 224,496.05 224,600.85 224,765.08 354.15,896 512,896s288,-130.92 288,-295.15c0,-110.84 -60.59,-215.12 -137.24,-304.09zM512.04,64.04c8.7,8.55 21.87,20 38.08,34.09C649.66,184.62 864,370.89 864,600.85 864,799.2 706.4,960 512,960S160,799.2 160,600.85c0,-219.68 214.57,-412.4 313.64,-501.38 16.48,-14.8 29.76,-26.73 38.33,-35.43L512,64l0.04,0.04z" />
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M500.4,544.39h-0.1c19.35,-47.63 66.08,-81.21 120.66,-81.21 54.28,0 100.8,33.22 120.34,80.44h0.17A243.66,243.66 0,0 1,746 590.54c0,131.6 -104.76,238.28 -234,238.28s-234,-106.68 -234,-238.28a244,244 0,0 1,3.64 -42.1c17.55,43.49 59.56,74.12 108.61,74.12 50.54,0 93.63,-32.53 110.15,-78.16z" />
+</vector>

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6abc67b..1eb9752 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,7 @@
         <activity android:name=".view.device.SmartGatewayActivity" />
         <activity android:name=".view.ScanZigbeeActivity" />
         <activity android:name=".view.device.MotionSensorActivity" />
+        <activity android:name=".view.device.TAndHSensorActivity" />
 
         <!--适配华为（huawei）刘海屏-->
         <meta-data
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 58f9e46..74c77ba 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -163,6 +163,10 @@
                                     //人体传感器
                                     requireContext().navigatePageTo<MotionSensorActivity>()
                                 }
+                                selectedCategory.contains("wsdcg") -> {
+                                    //温湿度传感器
+                                    requireContext().navigatePageTo<TAndHSensorActivity>()
+                                }
                             }
                         } else {
                             requireContext().navigatePageTo<LoginActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
new file mode 100644
index 0000000..2267755
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class HumidityPageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_humidity
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
new file mode 100644
index 0000000..2d8a2df
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class TemperaturePageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_temperature
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
index d042a7f..aeb638b 100644
--- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
@@ -34,8 +34,32 @@
     val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们")
     val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴")
     val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置")
+    val T_H_PAGE_TITLE = arrayOf("温度记录", "湿度记录")
     val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu)
     val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话")
+
+    //TODO 模拟数据
+    val TEST_IMAGE = intArrayOf(
+        R.mipmap.t_1,
+        R.mipmap.t_2,
+        R.mipmap.t_3,
+        R.mipmap.t_4,
+        R.mipmap.t_5,
+        R.mipmap.t_6,
+        R.mipmap.t_7,
+        R.mipmap.t_8
+    )
+    val TEST_ARRAY = arrayOf(
+        "24LS01壁挂炉",
+        "多功能智能热水器",
+        "24LC01壁挂炉",
+        "16RC01热水器",
+        "TXC01油烟机",
+        "QZE03燃气灶",
+        "多功能智能油烟机",
+        "多功能智能燃气灶"
+    )
+
     //预置颜色
     val COLORS = arrayOf(
         R.color.color_1, R.color.color_2, R.color.color_3,
diff --git a/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
new file mode 100644
index 0000000..7c8dfe7
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
@@ -0,0 +1,135 @@
+package com.casic.br.view.device
+
+import android.os.Handler
+import android.util.Log
+import android.view.View
+import androidx.fragment.app.Fragment
+import com.casic.br.R
+import com.casic.br.adapter.TabPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.casic.br.extensions.selectCategory
+import com.casic.br.extensions.toBatteryImage
+import com.casic.br.fragment.th.HumidityPageFragment
+import com.casic.br.fragment.th.TemperaturePageFragment
+import com.casic.br.utils.DeserializeModel
+import com.casic.br.utils.LocaleConstant
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.tuya.smart.home.sdk.TuyaHomeSdk
+import com.tuya.smart.home.sdk.bean.HomeBean
+import com.tuya.smart.home.sdk.callback.ITuyaHomeResultCallback
+import com.tuya.smart.sdk.bean.DeviceBean
+import kotlinx.android.synthetic.main.activity_t_h_senser.*
+import kotlinx.android.synthetic.main.include_device_title.*
+import java.util.*
+import kotlin.collections.HashMap
+
+/**
+ * 温湿度传感器
+ * TODO 数据上报暂缓
+ * */
+class TAndHSensorActivity : KotlinBaseActivity() {
+
+    private val context = this@TAndHSensorActivity
+    private val dataTimer by lazy { Timer() }//数据上传Timer
+    private val dataLinkedList = LinkedList<HashMap<String, Any>>()
+    private lateinit var weakReference: WeakReferenceHandler
+    private var fragmentPages: ArrayList<Fragment> = ArrayList()
+
+    override fun initLayoutView(): Int = R.layout.activity_t_h_senser
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        initLayoutImmersionBar(rootView)
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+
+        leftBackView.setOnClickListener { finish() }
+        rightOperateView.visibility = View.GONE
+    }
+
+    override fun initData() {
+        weakReference = WeakReferenceHandler(callback)
+        //每隔5s传一次数据到服务器
+        dataTimer.schedule(object : TimerTask() {
+            override fun run() {
+                TuyaHomeSdk.newHomeInstance(DeserializeModel.getHomeId())
+                    .getHomeDetail(object : ITuyaHomeResultCallback {
+                        override fun onSuccess(bean: HomeBean) {
+                            bean.deviceList.forEach {
+                                val selectedCategory = it.selectCategory()
+                                if (selectedCategory.contains("wsdcg")) {
+                                    //温湿度传感器
+                                    val msg = weakReference.obtainMessage()
+                                    msg.what = 2022112001
+                                    msg.obj = it
+                                    weakReference.sendMessage(msg)
+                                }
+                            }
+                        }
+
+                        override fun onError(errorCode: String, errorMsg: String) {
+                            Log.d("Casic", "TAndHSensorActivity => onError: $errorMsg")
+                        }
+                    })
+            }
+        }, 0, 5000)
+
+        fragmentPages.add(TemperaturePageFragment())
+        fragmentPages.add(HumidityPageFragment())
+        viewPager.adapter =
+            TabPagerAdapter(fragmentPages, LocaleConstant.T_H_PAGE_TITLE, supportFragmentManager)
+        tabLayout.setupWithViewPager(viewPager)
+    }
+
+    private val callback = Handler.Callback { message ->
+        if (message.what == 2022112001) {
+            val it = message.obj as DeviceBean
+            deviceStateView.text = if (it.isOnline) {
+                "设备在线"
+            } else {
+                "设备已离线"
+            }
+            titleView.text = String.format(it.name + "传感器")
+
+            val dataMap = HashMap<String, Any>()
+
+            val h = it.dps["101"].toString()
+            //温湿度的值需要缩小100倍
+            humidityView.text = if (h.isBlank()) {
+                "0%"
+            } else {
+                "${h.toDouble() / 100}%"
+            }
+            dataMap["humidity"] = humidityView.text.toString().replace("%", "")
+
+            val b = it.dps["102"].toString()
+            batteryView.setBackgroundResource(b.toBatteryImage())
+            batteryValueView.text = "${b}%"
+
+            val t = it.dps["103"].toString()
+            //{"unit":"℃","min":-2000,"max":10000,"scale":2,"step":1,"type":"value"}
+            temperatureView.text = if (h.isBlank()) {
+                "0${resources.getString(R.string.temperature_unit)}"
+            } else {
+                "${t.toDouble() / 100}${resources.getString(R.string.temperature_unit)}"
+            }
+            dataMap["temperature"] = temperatureView.text.toString().replace("°C", "")
+
+            dataLinkedList.add(dataMap)
+        }
+        true
+    }
+
+    override fun initEvent() {
+
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        dataTimer.cancel()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
new file mode 100644
index 0000000..9570167
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_10"
+        android:topRightRadius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
new file mode 100644
index 0000000..b35e98c
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="@dimen/dp_10"/>
+
+    <stroke
+        android:width="@dimen/dp_10"
+        android:color="@color/mainBackColor" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_shidu.xml b/app/src/main/res/drawable/ic_shidu.xml
new file mode 100644
index 0000000..1d14648
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shidu.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M662.76,296.76c-54.68,-63.47 -107.74,-109.46 -148.67,-144.95l-1.5,-1.3c-11.97,10.77 -24.84,22.36 -37.42,34.01 -34.88,32.3 -74.98,71.57 -112.94,116.15C284.58,391.9 224,496.05 224,600.85 224,765.08 354.15,896 512,896s288,-130.92 288,-295.15c0,-110.84 -60.59,-215.12 -137.24,-304.09zM512.04,64.04c8.7,8.55 21.87,20 38.08,34.09C649.66,184.62 864,370.89 864,600.85 864,799.2 706.4,960 512,960S160,799.2 160,600.85c0,-219.68 214.57,-412.4 313.64,-501.38 16.48,-14.8 29.76,-26.73 38.33,-35.43L512,64l0.04,0.04z" />
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M500.4,544.39h-0.1c19.35,-47.63 66.08,-81.21 120.66,-81.21 54.28,0 100.8,33.22 120.34,80.44h0.17A243.66,243.66 0,0 1,746 590.54c0,131.6 -104.76,238.28 -234,238.28s-234,-106.68 -234,-238.28a244,244 0,0 1,3.64 -42.1c17.55,43.49 59.56,74.12 108.61,74.12 50.54,0 93.63,-32.53 110.15,-78.16z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_wendu.xml b/app/src/main/res/drawable/ic_wendu.xml
new file mode 100644
index 0000000..41e033d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wendu.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M324,596.69l-17.74,16.6C273.41,644.02 253,687.58 253,736c0,92.78 75.22,168 168,168s168,-75.22 168,-168c0,-49.51 -21.35,-93.96 -55.51,-124.79L515,594.54L515,215.5c0,-52.74 -42.76,-95.5 -95.5,-95.5S324,162.76 324,215.5v381.19zM268,215.5C268,131.83 335.83,64 419.5,64S571,131.83 571,215.5v354.14c45.44,41 74,100.35 74,166.36 0,123.71 -100.29,224 -224,224S197,859.71 197,736c0,-64.55 27.31,-122.73 71,-163.61L268,215.5zM419,384c-17.67,0 -32,14.33 -32,32v210.38c-42.41,14.04 -73,54.01 -73,101.12 0,58.82 47.68,106.5 106.5,106.5S527,786.32 527,727.5c0,-48.22 -32.04,-88.95 -76,-102.07L451,416c0,-17.67 -14.33,-32 -32,-32zM771,224c0,-22.09 -17.91,-40 -40,-40s-40,17.91 -40,40 17.91,40 40,40 40,-17.91 40,-40zM827,224c0,53.02 -42.98,96 -96,96s-96,-42.98 -96,-96 42.98,-96 96,-96 96,42.98 96,96z" />
+</vector>

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6abc67b..1eb9752 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,7 @@
         <activity android:name=".view.device.SmartGatewayActivity" />
         <activity android:name=".view.ScanZigbeeActivity" />
         <activity android:name=".view.device.MotionSensorActivity" />
+        <activity android:name=".view.device.TAndHSensorActivity" />
 
         <!--适配华为（huawei）刘海屏-->
         <meta-data
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 58f9e46..74c77ba 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -163,6 +163,10 @@
                                     //人体传感器
                                     requireContext().navigatePageTo<MotionSensorActivity>()
                                 }
+                                selectedCategory.contains("wsdcg") -> {
+                                    //温湿度传感器
+                                    requireContext().navigatePageTo<TAndHSensorActivity>()
+                                }
                             }
                         } else {
                             requireContext().navigatePageTo<LoginActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
new file mode 100644
index 0000000..2267755
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class HumidityPageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_humidity
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
new file mode 100644
index 0000000..2d8a2df
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class TemperaturePageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_temperature
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
index d042a7f..aeb638b 100644
--- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
@@ -34,8 +34,32 @@
     val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们")
     val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴")
     val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置")
+    val T_H_PAGE_TITLE = arrayOf("温度记录", "湿度记录")
     val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu)
     val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话")
+
+    //TODO 模拟数据
+    val TEST_IMAGE = intArrayOf(
+        R.mipmap.t_1,
+        R.mipmap.t_2,
+        R.mipmap.t_3,
+        R.mipmap.t_4,
+        R.mipmap.t_5,
+        R.mipmap.t_6,
+        R.mipmap.t_7,
+        R.mipmap.t_8
+    )
+    val TEST_ARRAY = arrayOf(
+        "24LS01壁挂炉",
+        "多功能智能热水器",
+        "24LC01壁挂炉",
+        "16RC01热水器",
+        "TXC01油烟机",
+        "QZE03燃气灶",
+        "多功能智能油烟机",
+        "多功能智能燃气灶"
+    )
+
     //预置颜色
     val COLORS = arrayOf(
         R.color.color_1, R.color.color_2, R.color.color_3,
diff --git a/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
new file mode 100644
index 0000000..7c8dfe7
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
@@ -0,0 +1,135 @@
+package com.casic.br.view.device
+
+import android.os.Handler
+import android.util.Log
+import android.view.View
+import androidx.fragment.app.Fragment
+import com.casic.br.R
+import com.casic.br.adapter.TabPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.casic.br.extensions.selectCategory
+import com.casic.br.extensions.toBatteryImage
+import com.casic.br.fragment.th.HumidityPageFragment
+import com.casic.br.fragment.th.TemperaturePageFragment
+import com.casic.br.utils.DeserializeModel
+import com.casic.br.utils.LocaleConstant
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.tuya.smart.home.sdk.TuyaHomeSdk
+import com.tuya.smart.home.sdk.bean.HomeBean
+import com.tuya.smart.home.sdk.callback.ITuyaHomeResultCallback
+import com.tuya.smart.sdk.bean.DeviceBean
+import kotlinx.android.synthetic.main.activity_t_h_senser.*
+import kotlinx.android.synthetic.main.include_device_title.*
+import java.util.*
+import kotlin.collections.HashMap
+
+/**
+ * 温湿度传感器
+ * TODO 数据上报暂缓
+ * */
+class TAndHSensorActivity : KotlinBaseActivity() {
+
+    private val context = this@TAndHSensorActivity
+    private val dataTimer by lazy { Timer() }//数据上传Timer
+    private val dataLinkedList = LinkedList<HashMap<String, Any>>()
+    private lateinit var weakReference: WeakReferenceHandler
+    private var fragmentPages: ArrayList<Fragment> = ArrayList()
+
+    override fun initLayoutView(): Int = R.layout.activity_t_h_senser
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        initLayoutImmersionBar(rootView)
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+
+        leftBackView.setOnClickListener { finish() }
+        rightOperateView.visibility = View.GONE
+    }
+
+    override fun initData() {
+        weakReference = WeakReferenceHandler(callback)
+        //每隔5s传一次数据到服务器
+        dataTimer.schedule(object : TimerTask() {
+            override fun run() {
+                TuyaHomeSdk.newHomeInstance(DeserializeModel.getHomeId())
+                    .getHomeDetail(object : ITuyaHomeResultCallback {
+                        override fun onSuccess(bean: HomeBean) {
+                            bean.deviceList.forEach {
+                                val selectedCategory = it.selectCategory()
+                                if (selectedCategory.contains("wsdcg")) {
+                                    //温湿度传感器
+                                    val msg = weakReference.obtainMessage()
+                                    msg.what = 2022112001
+                                    msg.obj = it
+                                    weakReference.sendMessage(msg)
+                                }
+                            }
+                        }
+
+                        override fun onError(errorCode: String, errorMsg: String) {
+                            Log.d("Casic", "TAndHSensorActivity => onError: $errorMsg")
+                        }
+                    })
+            }
+        }, 0, 5000)
+
+        fragmentPages.add(TemperaturePageFragment())
+        fragmentPages.add(HumidityPageFragment())
+        viewPager.adapter =
+            TabPagerAdapter(fragmentPages, LocaleConstant.T_H_PAGE_TITLE, supportFragmentManager)
+        tabLayout.setupWithViewPager(viewPager)
+    }
+
+    private val callback = Handler.Callback { message ->
+        if (message.what == 2022112001) {
+            val it = message.obj as DeviceBean
+            deviceStateView.text = if (it.isOnline) {
+                "设备在线"
+            } else {
+                "设备已离线"
+            }
+            titleView.text = String.format(it.name + "传感器")
+
+            val dataMap = HashMap<String, Any>()
+
+            val h = it.dps["101"].toString()
+            //温湿度的值需要缩小100倍
+            humidityView.text = if (h.isBlank()) {
+                "0%"
+            } else {
+                "${h.toDouble() / 100}%"
+            }
+            dataMap["humidity"] = humidityView.text.toString().replace("%", "")
+
+            val b = it.dps["102"].toString()
+            batteryView.setBackgroundResource(b.toBatteryImage())
+            batteryValueView.text = "${b}%"
+
+            val t = it.dps["103"].toString()
+            //{"unit":"℃","min":-2000,"max":10000,"scale":2,"step":1,"type":"value"}
+            temperatureView.text = if (h.isBlank()) {
+                "0${resources.getString(R.string.temperature_unit)}"
+            } else {
+                "${t.toDouble() / 100}${resources.getString(R.string.temperature_unit)}"
+            }
+            dataMap["temperature"] = temperatureView.text.toString().replace("°C", "")
+
+            dataLinkedList.add(dataMap)
+        }
+        true
+    }
+
+    override fun initEvent() {
+
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        dataTimer.cancel()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
new file mode 100644
index 0000000..9570167
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_10"
+        android:topRightRadius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
new file mode 100644
index 0000000..b35e98c
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="@dimen/dp_10"/>
+
+    <stroke
+        android:width="@dimen/dp_10"
+        android:color="@color/mainBackColor" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_shidu.xml b/app/src/main/res/drawable/ic_shidu.xml
new file mode 100644
index 0000000..1d14648
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shidu.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M662.76,296.76c-54.68,-63.47 -107.74,-109.46 -148.67,-144.95l-1.5,-1.3c-11.97,10.77 -24.84,22.36 -37.42,34.01 -34.88,32.3 -74.98,71.57 -112.94,116.15C284.58,391.9 224,496.05 224,600.85 224,765.08 354.15,896 512,896s288,-130.92 288,-295.15c0,-110.84 -60.59,-215.12 -137.24,-304.09zM512.04,64.04c8.7,8.55 21.87,20 38.08,34.09C649.66,184.62 864,370.89 864,600.85 864,799.2 706.4,960 512,960S160,799.2 160,600.85c0,-219.68 214.57,-412.4 313.64,-501.38 16.48,-14.8 29.76,-26.73 38.33,-35.43L512,64l0.04,0.04z" />
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M500.4,544.39h-0.1c19.35,-47.63 66.08,-81.21 120.66,-81.21 54.28,0 100.8,33.22 120.34,80.44h0.17A243.66,243.66 0,0 1,746 590.54c0,131.6 -104.76,238.28 -234,238.28s-234,-106.68 -234,-238.28a244,244 0,0 1,3.64 -42.1c17.55,43.49 59.56,74.12 108.61,74.12 50.54,0 93.63,-32.53 110.15,-78.16z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_wendu.xml b/app/src/main/res/drawable/ic_wendu.xml
new file mode 100644
index 0000000..41e033d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wendu.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M324,596.69l-17.74,16.6C273.41,644.02 253,687.58 253,736c0,92.78 75.22,168 168,168s168,-75.22 168,-168c0,-49.51 -21.35,-93.96 -55.51,-124.79L515,594.54L515,215.5c0,-52.74 -42.76,-95.5 -95.5,-95.5S324,162.76 324,215.5v381.19zM268,215.5C268,131.83 335.83,64 419.5,64S571,131.83 571,215.5v354.14c45.44,41 74,100.35 74,166.36 0,123.71 -100.29,224 -224,224S197,859.71 197,736c0,-64.55 27.31,-122.73 71,-163.61L268,215.5zM419,384c-17.67,0 -32,14.33 -32,32v210.38c-42.41,14.04 -73,54.01 -73,101.12 0,58.82 47.68,106.5 106.5,106.5S527,786.32 527,727.5c0,-48.22 -32.04,-88.95 -76,-102.07L451,416c0,-17.67 -14.33,-32 -32,-32zM771,224c0,-22.09 -17.91,-40 -40,-40s-40,17.91 -40,40 17.91,40 40,40 40,-17.91 40,-40zM827,224c0,53.02 -42.98,96 -96,96s-96,-42.98 -96,-96 42.98,-96 96,-96 96,42.98 96,96z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_t_h_senser.xml b/app/src/main/res/layout/activity_t_h_senser.xml
new file mode 100644
index 0000000..8f94160
--- /dev/null
+++ b/app/src/main/res/layout/activity_t_h_senser.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/common_bkg"
+    android:orientation="vertical">
+
+    <include layout="@layout/include_device_title" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_100"
+            android:layout_marginHorizontal="@dimen/dp_50"
+            android:layout_marginVertical="@dimen/dp_20"
+            android:background="@drawable/bg_stroke_layout_gray_rectangle_10"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:padding="@dimen/dp_5">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_wendu" />
+
+                <TextView
+                    android:id="@+id/temperatureView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:text="@string/temperature_unit"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/sp_20" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="@dimen/dp_3"
+                android:layout_height="match_parent"
+                android:background="@color/mainBackColor" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_shidu" />
+
+                <TextView
+                    android:id="@+id/humidityView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:text="%"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/sp_20" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/deviceStateView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/app_name" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="@dimen/dp_20"
+            android:gravity="center_vertical">
+
+            <ImageView
+                android:id="@+id/batteryView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_10" />
+
+            <TextView
+                android:id="@+id/batteryValueView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:background="@drawable/bg_solid_layout_white_top_radius_10"
+            android:orientation="vertical">
+
+            <com.google.android.material.tabs.TabLayout
+                android:id="@+id/tabLayout"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_40"
+                android:layout_marginHorizontal="@dimen/dp_40"
+                android:layout_marginVertical="10dp"
+                app:tabIndicatorColor="@color/orangeTextColor"
+                app:tabIndicatorFullWidth="false"
+                app:tabIndicatorHeight="3dp"
+                app:tabSelectedTextColor="@color/mainTextColor"
+                app:tabTextColor="@color/subTextColor" />
+
+            <androidx.viewpager.widget.ViewPager
+                android:id="@+id/viewPager"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6abc67b..1eb9752 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,7 @@
         <activity android:name=".view.device.SmartGatewayActivity" />
         <activity android:name=".view.ScanZigbeeActivity" />
         <activity android:name=".view.device.MotionSensorActivity" />
+        <activity android:name=".view.device.TAndHSensorActivity" />
 
         <!--适配华为（huawei）刘海屏-->
         <meta-data
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 58f9e46..74c77ba 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -163,6 +163,10 @@
                                     //人体传感器
                                     requireContext().navigatePageTo<MotionSensorActivity>()
                                 }
+                                selectedCategory.contains("wsdcg") -> {
+                                    //温湿度传感器
+                                    requireContext().navigatePageTo<TAndHSensorActivity>()
+                                }
                             }
                         } else {
                             requireContext().navigatePageTo<LoginActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
new file mode 100644
index 0000000..2267755
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class HumidityPageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_humidity
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
new file mode 100644
index 0000000..2d8a2df
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class TemperaturePageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_temperature
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
index d042a7f..aeb638b 100644
--- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
@@ -34,8 +34,32 @@
     val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们")
     val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴")
     val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置")
+    val T_H_PAGE_TITLE = arrayOf("温度记录", "湿度记录")
     val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu)
     val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话")
+
+    //TODO 模拟数据
+    val TEST_IMAGE = intArrayOf(
+        R.mipmap.t_1,
+        R.mipmap.t_2,
+        R.mipmap.t_3,
+        R.mipmap.t_4,
+        R.mipmap.t_5,
+        R.mipmap.t_6,
+        R.mipmap.t_7,
+        R.mipmap.t_8
+    )
+    val TEST_ARRAY = arrayOf(
+        "24LS01壁挂炉",
+        "多功能智能热水器",
+        "24LC01壁挂炉",
+        "16RC01热水器",
+        "TXC01油烟机",
+        "QZE03燃气灶",
+        "多功能智能油烟机",
+        "多功能智能燃气灶"
+    )
+
     //预置颜色
     val COLORS = arrayOf(
         R.color.color_1, R.color.color_2, R.color.color_3,
diff --git a/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
new file mode 100644
index 0000000..7c8dfe7
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
@@ -0,0 +1,135 @@
+package com.casic.br.view.device
+
+import android.os.Handler
+import android.util.Log
+import android.view.View
+import androidx.fragment.app.Fragment
+import com.casic.br.R
+import com.casic.br.adapter.TabPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.casic.br.extensions.selectCategory
+import com.casic.br.extensions.toBatteryImage
+import com.casic.br.fragment.th.HumidityPageFragment
+import com.casic.br.fragment.th.TemperaturePageFragment
+import com.casic.br.utils.DeserializeModel
+import com.casic.br.utils.LocaleConstant
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.tuya.smart.home.sdk.TuyaHomeSdk
+import com.tuya.smart.home.sdk.bean.HomeBean
+import com.tuya.smart.home.sdk.callback.ITuyaHomeResultCallback
+import com.tuya.smart.sdk.bean.DeviceBean
+import kotlinx.android.synthetic.main.activity_t_h_senser.*
+import kotlinx.android.synthetic.main.include_device_title.*
+import java.util.*
+import kotlin.collections.HashMap
+
+/**
+ * 温湿度传感器
+ * TODO 数据上报暂缓
+ * */
+class TAndHSensorActivity : KotlinBaseActivity() {
+
+    private val context = this@TAndHSensorActivity
+    private val dataTimer by lazy { Timer() }//数据上传Timer
+    private val dataLinkedList = LinkedList<HashMap<String, Any>>()
+    private lateinit var weakReference: WeakReferenceHandler
+    private var fragmentPages: ArrayList<Fragment> = ArrayList()
+
+    override fun initLayoutView(): Int = R.layout.activity_t_h_senser
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        initLayoutImmersionBar(rootView)
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+
+        leftBackView.setOnClickListener { finish() }
+        rightOperateView.visibility = View.GONE
+    }
+
+    override fun initData() {
+        weakReference = WeakReferenceHandler(callback)
+        //每隔5s传一次数据到服务器
+        dataTimer.schedule(object : TimerTask() {
+            override fun run() {
+                TuyaHomeSdk.newHomeInstance(DeserializeModel.getHomeId())
+                    .getHomeDetail(object : ITuyaHomeResultCallback {
+                        override fun onSuccess(bean: HomeBean) {
+                            bean.deviceList.forEach {
+                                val selectedCategory = it.selectCategory()
+                                if (selectedCategory.contains("wsdcg")) {
+                                    //温湿度传感器
+                                    val msg = weakReference.obtainMessage()
+                                    msg.what = 2022112001
+                                    msg.obj = it
+                                    weakReference.sendMessage(msg)
+                                }
+                            }
+                        }
+
+                        override fun onError(errorCode: String, errorMsg: String) {
+                            Log.d("Casic", "TAndHSensorActivity => onError: $errorMsg")
+                        }
+                    })
+            }
+        }, 0, 5000)
+
+        fragmentPages.add(TemperaturePageFragment())
+        fragmentPages.add(HumidityPageFragment())
+        viewPager.adapter =
+            TabPagerAdapter(fragmentPages, LocaleConstant.T_H_PAGE_TITLE, supportFragmentManager)
+        tabLayout.setupWithViewPager(viewPager)
+    }
+
+    private val callback = Handler.Callback { message ->
+        if (message.what == 2022112001) {
+            val it = message.obj as DeviceBean
+            deviceStateView.text = if (it.isOnline) {
+                "设备在线"
+            } else {
+                "设备已离线"
+            }
+            titleView.text = String.format(it.name + "传感器")
+
+            val dataMap = HashMap<String, Any>()
+
+            val h = it.dps["101"].toString()
+            //温湿度的值需要缩小100倍
+            humidityView.text = if (h.isBlank()) {
+                "0%"
+            } else {
+                "${h.toDouble() / 100}%"
+            }
+            dataMap["humidity"] = humidityView.text.toString().replace("%", "")
+
+            val b = it.dps["102"].toString()
+            batteryView.setBackgroundResource(b.toBatteryImage())
+            batteryValueView.text = "${b}%"
+
+            val t = it.dps["103"].toString()
+            //{"unit":"℃","min":-2000,"max":10000,"scale":2,"step":1,"type":"value"}
+            temperatureView.text = if (h.isBlank()) {
+                "0${resources.getString(R.string.temperature_unit)}"
+            } else {
+                "${t.toDouble() / 100}${resources.getString(R.string.temperature_unit)}"
+            }
+            dataMap["temperature"] = temperatureView.text.toString().replace("°C", "")
+
+            dataLinkedList.add(dataMap)
+        }
+        true
+    }
+
+    override fun initEvent() {
+
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        dataTimer.cancel()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
new file mode 100644
index 0000000..9570167
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_10"
+        android:topRightRadius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
new file mode 100644
index 0000000..b35e98c
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="@dimen/dp_10"/>
+
+    <stroke
+        android:width="@dimen/dp_10"
+        android:color="@color/mainBackColor" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_shidu.xml b/app/src/main/res/drawable/ic_shidu.xml
new file mode 100644
index 0000000..1d14648
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shidu.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M662.76,296.76c-54.68,-63.47 -107.74,-109.46 -148.67,-144.95l-1.5,-1.3c-11.97,10.77 -24.84,22.36 -37.42,34.01 -34.88,32.3 -74.98,71.57 -112.94,116.15C284.58,391.9 224,496.05 224,600.85 224,765.08 354.15,896 512,896s288,-130.92 288,-295.15c0,-110.84 -60.59,-215.12 -137.24,-304.09zM512.04,64.04c8.7,8.55 21.87,20 38.08,34.09C649.66,184.62 864,370.89 864,600.85 864,799.2 706.4,960 512,960S160,799.2 160,600.85c0,-219.68 214.57,-412.4 313.64,-501.38 16.48,-14.8 29.76,-26.73 38.33,-35.43L512,64l0.04,0.04z" />
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M500.4,544.39h-0.1c19.35,-47.63 66.08,-81.21 120.66,-81.21 54.28,0 100.8,33.22 120.34,80.44h0.17A243.66,243.66 0,0 1,746 590.54c0,131.6 -104.76,238.28 -234,238.28s-234,-106.68 -234,-238.28a244,244 0,0 1,3.64 -42.1c17.55,43.49 59.56,74.12 108.61,74.12 50.54,0 93.63,-32.53 110.15,-78.16z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_wendu.xml b/app/src/main/res/drawable/ic_wendu.xml
new file mode 100644
index 0000000..41e033d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wendu.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M324,596.69l-17.74,16.6C273.41,644.02 253,687.58 253,736c0,92.78 75.22,168 168,168s168,-75.22 168,-168c0,-49.51 -21.35,-93.96 -55.51,-124.79L515,594.54L515,215.5c0,-52.74 -42.76,-95.5 -95.5,-95.5S324,162.76 324,215.5v381.19zM268,215.5C268,131.83 335.83,64 419.5,64S571,131.83 571,215.5v354.14c45.44,41 74,100.35 74,166.36 0,123.71 -100.29,224 -224,224S197,859.71 197,736c0,-64.55 27.31,-122.73 71,-163.61L268,215.5zM419,384c-17.67,0 -32,14.33 -32,32v210.38c-42.41,14.04 -73,54.01 -73,101.12 0,58.82 47.68,106.5 106.5,106.5S527,786.32 527,727.5c0,-48.22 -32.04,-88.95 -76,-102.07L451,416c0,-17.67 -14.33,-32 -32,-32zM771,224c0,-22.09 -17.91,-40 -40,-40s-40,17.91 -40,40 17.91,40 40,40 40,-17.91 40,-40zM827,224c0,53.02 -42.98,96 -96,96s-96,-42.98 -96,-96 42.98,-96 96,-96 96,42.98 96,96z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_t_h_senser.xml b/app/src/main/res/layout/activity_t_h_senser.xml
new file mode 100644
index 0000000..8f94160
--- /dev/null
+++ b/app/src/main/res/layout/activity_t_h_senser.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/common_bkg"
+    android:orientation="vertical">
+
+    <include layout="@layout/include_device_title" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_100"
+            android:layout_marginHorizontal="@dimen/dp_50"
+            android:layout_marginVertical="@dimen/dp_20"
+            android:background="@drawable/bg_stroke_layout_gray_rectangle_10"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:padding="@dimen/dp_5">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_wendu" />
+
+                <TextView
+                    android:id="@+id/temperatureView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:text="@string/temperature_unit"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/sp_20" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="@dimen/dp_3"
+                android:layout_height="match_parent"
+                android:background="@color/mainBackColor" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_shidu" />
+
+                <TextView
+                    android:id="@+id/humidityView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:text="%"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/sp_20" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/deviceStateView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/app_name" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="@dimen/dp_20"
+            android:gravity="center_vertical">
+
+            <ImageView
+                android:id="@+id/batteryView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_10" />
+
+            <TextView
+                android:id="@+id/batteryValueView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:background="@drawable/bg_solid_layout_white_top_radius_10"
+            android:orientation="vertical">
+
+            <com.google.android.material.tabs.TabLayout
+                android:id="@+id/tabLayout"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_40"
+                android:layout_marginHorizontal="@dimen/dp_40"
+                android:layout_marginVertical="10dp"
+                app:tabIndicatorColor="@color/orangeTextColor"
+                app:tabIndicatorFullWidth="false"
+                app:tabIndicatorHeight="3dp"
+                app:tabSelectedTextColor="@color/mainTextColor"
+                app:tabTextColor="@color/subTextColor" />
+
+            <androidx.viewpager.widget.ViewPager
+                android:id="@+id/viewPager"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_cooker_service.xml b/app/src/main/res/layout/fragment_device_cooker_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_cooker_service.xml
+++ b/app/src/main/res/layout/fragment_device_cooker_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6abc67b..1eb9752 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,7 @@
         <activity android:name=".view.device.SmartGatewayActivity" />
         <activity android:name=".view.ScanZigbeeActivity" />
         <activity android:name=".view.device.MotionSensorActivity" />
+        <activity android:name=".view.device.TAndHSensorActivity" />
 
         <!--适配华为（huawei）刘海屏-->
         <meta-data
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 58f9e46..74c77ba 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -163,6 +163,10 @@
                                     //人体传感器
                                     requireContext().navigatePageTo<MotionSensorActivity>()
                                 }
+                                selectedCategory.contains("wsdcg") -> {
+                                    //温湿度传感器
+                                    requireContext().navigatePageTo<TAndHSensorActivity>()
+                                }
                             }
                         } else {
                             requireContext().navigatePageTo<LoginActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
new file mode 100644
index 0000000..2267755
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class HumidityPageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_humidity
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
new file mode 100644
index 0000000..2d8a2df
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class TemperaturePageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_temperature
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
index d042a7f..aeb638b 100644
--- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
@@ -34,8 +34,32 @@
     val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们")
     val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴")
     val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置")
+    val T_H_PAGE_TITLE = arrayOf("温度记录", "湿度记录")
     val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu)
     val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话")
+
+    //TODO 模拟数据
+    val TEST_IMAGE = intArrayOf(
+        R.mipmap.t_1,
+        R.mipmap.t_2,
+        R.mipmap.t_3,
+        R.mipmap.t_4,
+        R.mipmap.t_5,
+        R.mipmap.t_6,
+        R.mipmap.t_7,
+        R.mipmap.t_8
+    )
+    val TEST_ARRAY = arrayOf(
+        "24LS01壁挂炉",
+        "多功能智能热水器",
+        "24LC01壁挂炉",
+        "16RC01热水器",
+        "TXC01油烟机",
+        "QZE03燃气灶",
+        "多功能智能油烟机",
+        "多功能智能燃气灶"
+    )
+
     //预置颜色
     val COLORS = arrayOf(
         R.color.color_1, R.color.color_2, R.color.color_3,
diff --git a/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
new file mode 100644
index 0000000..7c8dfe7
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
@@ -0,0 +1,135 @@
+package com.casic.br.view.device
+
+import android.os.Handler
+import android.util.Log
+import android.view.View
+import androidx.fragment.app.Fragment
+import com.casic.br.R
+import com.casic.br.adapter.TabPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.casic.br.extensions.selectCategory
+import com.casic.br.extensions.toBatteryImage
+import com.casic.br.fragment.th.HumidityPageFragment
+import com.casic.br.fragment.th.TemperaturePageFragment
+import com.casic.br.utils.DeserializeModel
+import com.casic.br.utils.LocaleConstant
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.tuya.smart.home.sdk.TuyaHomeSdk
+import com.tuya.smart.home.sdk.bean.HomeBean
+import com.tuya.smart.home.sdk.callback.ITuyaHomeResultCallback
+import com.tuya.smart.sdk.bean.DeviceBean
+import kotlinx.android.synthetic.main.activity_t_h_senser.*
+import kotlinx.android.synthetic.main.include_device_title.*
+import java.util.*
+import kotlin.collections.HashMap
+
+/**
+ * 温湿度传感器
+ * TODO 数据上报暂缓
+ * */
+class TAndHSensorActivity : KotlinBaseActivity() {
+
+    private val context = this@TAndHSensorActivity
+    private val dataTimer by lazy { Timer() }//数据上传Timer
+    private val dataLinkedList = LinkedList<HashMap<String, Any>>()
+    private lateinit var weakReference: WeakReferenceHandler
+    private var fragmentPages: ArrayList<Fragment> = ArrayList()
+
+    override fun initLayoutView(): Int = R.layout.activity_t_h_senser
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        initLayoutImmersionBar(rootView)
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+
+        leftBackView.setOnClickListener { finish() }
+        rightOperateView.visibility = View.GONE
+    }
+
+    override fun initData() {
+        weakReference = WeakReferenceHandler(callback)
+        //每隔5s传一次数据到服务器
+        dataTimer.schedule(object : TimerTask() {
+            override fun run() {
+                TuyaHomeSdk.newHomeInstance(DeserializeModel.getHomeId())
+                    .getHomeDetail(object : ITuyaHomeResultCallback {
+                        override fun onSuccess(bean: HomeBean) {
+                            bean.deviceList.forEach {
+                                val selectedCategory = it.selectCategory()
+                                if (selectedCategory.contains("wsdcg")) {
+                                    //温湿度传感器
+                                    val msg = weakReference.obtainMessage()
+                                    msg.what = 2022112001
+                                    msg.obj = it
+                                    weakReference.sendMessage(msg)
+                                }
+                            }
+                        }
+
+                        override fun onError(errorCode: String, errorMsg: String) {
+                            Log.d("Casic", "TAndHSensorActivity => onError: $errorMsg")
+                        }
+                    })
+            }
+        }, 0, 5000)
+
+        fragmentPages.add(TemperaturePageFragment())
+        fragmentPages.add(HumidityPageFragment())
+        viewPager.adapter =
+            TabPagerAdapter(fragmentPages, LocaleConstant.T_H_PAGE_TITLE, supportFragmentManager)
+        tabLayout.setupWithViewPager(viewPager)
+    }
+
+    private val callback = Handler.Callback { message ->
+        if (message.what == 2022112001) {
+            val it = message.obj as DeviceBean
+            deviceStateView.text = if (it.isOnline) {
+                "设备在线"
+            } else {
+                "设备已离线"
+            }
+            titleView.text = String.format(it.name + "传感器")
+
+            val dataMap = HashMap<String, Any>()
+
+            val h = it.dps["101"].toString()
+            //温湿度的值需要缩小100倍
+            humidityView.text = if (h.isBlank()) {
+                "0%"
+            } else {
+                "${h.toDouble() / 100}%"
+            }
+            dataMap["humidity"] = humidityView.text.toString().replace("%", "")
+
+            val b = it.dps["102"].toString()
+            batteryView.setBackgroundResource(b.toBatteryImage())
+            batteryValueView.text = "${b}%"
+
+            val t = it.dps["103"].toString()
+            //{"unit":"℃","min":-2000,"max":10000,"scale":2,"step":1,"type":"value"}
+            temperatureView.text = if (h.isBlank()) {
+                "0${resources.getString(R.string.temperature_unit)}"
+            } else {
+                "${t.toDouble() / 100}${resources.getString(R.string.temperature_unit)}"
+            }
+            dataMap["temperature"] = temperatureView.text.toString().replace("°C", "")
+
+            dataLinkedList.add(dataMap)
+        }
+        true
+    }
+
+    override fun initEvent() {
+
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        dataTimer.cancel()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
new file mode 100644
index 0000000..9570167
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_10"
+        android:topRightRadius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
new file mode 100644
index 0000000..b35e98c
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="@dimen/dp_10"/>
+
+    <stroke
+        android:width="@dimen/dp_10"
+        android:color="@color/mainBackColor" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_shidu.xml b/app/src/main/res/drawable/ic_shidu.xml
new file mode 100644
index 0000000..1d14648
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shidu.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M662.76,296.76c-54.68,-63.47 -107.74,-109.46 -148.67,-144.95l-1.5,-1.3c-11.97,10.77 -24.84,22.36 -37.42,34.01 -34.88,32.3 -74.98,71.57 -112.94,116.15C284.58,391.9 224,496.05 224,600.85 224,765.08 354.15,896 512,896s288,-130.92 288,-295.15c0,-110.84 -60.59,-215.12 -137.24,-304.09zM512.04,64.04c8.7,8.55 21.87,20 38.08,34.09C649.66,184.62 864,370.89 864,600.85 864,799.2 706.4,960 512,960S160,799.2 160,600.85c0,-219.68 214.57,-412.4 313.64,-501.38 16.48,-14.8 29.76,-26.73 38.33,-35.43L512,64l0.04,0.04z" />
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M500.4,544.39h-0.1c19.35,-47.63 66.08,-81.21 120.66,-81.21 54.28,0 100.8,33.22 120.34,80.44h0.17A243.66,243.66 0,0 1,746 590.54c0,131.6 -104.76,238.28 -234,238.28s-234,-106.68 -234,-238.28a244,244 0,0 1,3.64 -42.1c17.55,43.49 59.56,74.12 108.61,74.12 50.54,0 93.63,-32.53 110.15,-78.16z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_wendu.xml b/app/src/main/res/drawable/ic_wendu.xml
new file mode 100644
index 0000000..41e033d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wendu.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M324,596.69l-17.74,16.6C273.41,644.02 253,687.58 253,736c0,92.78 75.22,168 168,168s168,-75.22 168,-168c0,-49.51 -21.35,-93.96 -55.51,-124.79L515,594.54L515,215.5c0,-52.74 -42.76,-95.5 -95.5,-95.5S324,162.76 324,215.5v381.19zM268,215.5C268,131.83 335.83,64 419.5,64S571,131.83 571,215.5v354.14c45.44,41 74,100.35 74,166.36 0,123.71 -100.29,224 -224,224S197,859.71 197,736c0,-64.55 27.31,-122.73 71,-163.61L268,215.5zM419,384c-17.67,0 -32,14.33 -32,32v210.38c-42.41,14.04 -73,54.01 -73,101.12 0,58.82 47.68,106.5 106.5,106.5S527,786.32 527,727.5c0,-48.22 -32.04,-88.95 -76,-102.07L451,416c0,-17.67 -14.33,-32 -32,-32zM771,224c0,-22.09 -17.91,-40 -40,-40s-40,17.91 -40,40 17.91,40 40,40 40,-17.91 40,-40zM827,224c0,53.02 -42.98,96 -96,96s-96,-42.98 -96,-96 42.98,-96 96,-96 96,42.98 96,96z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_t_h_senser.xml b/app/src/main/res/layout/activity_t_h_senser.xml
new file mode 100644
index 0000000..8f94160
--- /dev/null
+++ b/app/src/main/res/layout/activity_t_h_senser.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/common_bkg"
+    android:orientation="vertical">
+
+    <include layout="@layout/include_device_title" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_100"
+            android:layout_marginHorizontal="@dimen/dp_50"
+            android:layout_marginVertical="@dimen/dp_20"
+            android:background="@drawable/bg_stroke_layout_gray_rectangle_10"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:padding="@dimen/dp_5">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_wendu" />
+
+                <TextView
+                    android:id="@+id/temperatureView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:text="@string/temperature_unit"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/sp_20" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="@dimen/dp_3"
+                android:layout_height="match_parent"
+                android:background="@color/mainBackColor" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_shidu" />
+
+                <TextView
+                    android:id="@+id/humidityView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:text="%"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/sp_20" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/deviceStateView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/app_name" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="@dimen/dp_20"
+            android:gravity="center_vertical">
+
+            <ImageView
+                android:id="@+id/batteryView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_10" />
+
+            <TextView
+                android:id="@+id/batteryValueView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:background="@drawable/bg_solid_layout_white_top_radius_10"
+            android:orientation="vertical">
+
+            <com.google.android.material.tabs.TabLayout
+                android:id="@+id/tabLayout"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_40"
+                android:layout_marginHorizontal="@dimen/dp_40"
+                android:layout_marginVertical="10dp"
+                app:tabIndicatorColor="@color/orangeTextColor"
+                app:tabIndicatorFullWidth="false"
+                app:tabIndicatorHeight="3dp"
+                app:tabSelectedTextColor="@color/mainTextColor"
+                app:tabTextColor="@color/subTextColor" />
+
+            <androidx.viewpager.widget.ViewPager
+                android:id="@+id/viewPager"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_cooker_service.xml b/app/src/main/res/layout/fragment_device_cooker_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_cooker_service.xml
+++ b/app/src/main/res/layout/fragment_device_cooker_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_fireplace_service.xml b/app/src/main/res/layout/fragment_device_fireplace_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_fireplace_service.xml
+++ b/app/src/main/res/layout/fragment_device_fireplace_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6abc67b..1eb9752 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,7 @@
         <activity android:name=".view.device.SmartGatewayActivity" />
         <activity android:name=".view.ScanZigbeeActivity" />
         <activity android:name=".view.device.MotionSensorActivity" />
+        <activity android:name=".view.device.TAndHSensorActivity" />
 
         <!--适配华为（huawei）刘海屏-->
         <meta-data
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 58f9e46..74c77ba 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -163,6 +163,10 @@
                                     //人体传感器
                                     requireContext().navigatePageTo<MotionSensorActivity>()
                                 }
+                                selectedCategory.contains("wsdcg") -> {
+                                    //温湿度传感器
+                                    requireContext().navigatePageTo<TAndHSensorActivity>()
+                                }
                             }
                         } else {
                             requireContext().navigatePageTo<LoginActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
new file mode 100644
index 0000000..2267755
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class HumidityPageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_humidity
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
new file mode 100644
index 0000000..2d8a2df
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class TemperaturePageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_temperature
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
index d042a7f..aeb638b 100644
--- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
@@ -34,8 +34,32 @@
     val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们")
     val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴")
     val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置")
+    val T_H_PAGE_TITLE = arrayOf("温度记录", "湿度记录")
     val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu)
     val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话")
+
+    //TODO 模拟数据
+    val TEST_IMAGE = intArrayOf(
+        R.mipmap.t_1,
+        R.mipmap.t_2,
+        R.mipmap.t_3,
+        R.mipmap.t_4,
+        R.mipmap.t_5,
+        R.mipmap.t_6,
+        R.mipmap.t_7,
+        R.mipmap.t_8
+    )
+    val TEST_ARRAY = arrayOf(
+        "24LS01壁挂炉",
+        "多功能智能热水器",
+        "24LC01壁挂炉",
+        "16RC01热水器",
+        "TXC01油烟机",
+        "QZE03燃气灶",
+        "多功能智能油烟机",
+        "多功能智能燃气灶"
+    )
+
     //预置颜色
     val COLORS = arrayOf(
         R.color.color_1, R.color.color_2, R.color.color_3,
diff --git a/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
new file mode 100644
index 0000000..7c8dfe7
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
@@ -0,0 +1,135 @@
+package com.casic.br.view.device
+
+import android.os.Handler
+import android.util.Log
+import android.view.View
+import androidx.fragment.app.Fragment
+import com.casic.br.R
+import com.casic.br.adapter.TabPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.casic.br.extensions.selectCategory
+import com.casic.br.extensions.toBatteryImage
+import com.casic.br.fragment.th.HumidityPageFragment
+import com.casic.br.fragment.th.TemperaturePageFragment
+import com.casic.br.utils.DeserializeModel
+import com.casic.br.utils.LocaleConstant
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.tuya.smart.home.sdk.TuyaHomeSdk
+import com.tuya.smart.home.sdk.bean.HomeBean
+import com.tuya.smart.home.sdk.callback.ITuyaHomeResultCallback
+import com.tuya.smart.sdk.bean.DeviceBean
+import kotlinx.android.synthetic.main.activity_t_h_senser.*
+import kotlinx.android.synthetic.main.include_device_title.*
+import java.util.*
+import kotlin.collections.HashMap
+
+/**
+ * 温湿度传感器
+ * TODO 数据上报暂缓
+ * */
+class TAndHSensorActivity : KotlinBaseActivity() {
+
+    private val context = this@TAndHSensorActivity
+    private val dataTimer by lazy { Timer() }//数据上传Timer
+    private val dataLinkedList = LinkedList<HashMap<String, Any>>()
+    private lateinit var weakReference: WeakReferenceHandler
+    private var fragmentPages: ArrayList<Fragment> = ArrayList()
+
+    override fun initLayoutView(): Int = R.layout.activity_t_h_senser
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        initLayoutImmersionBar(rootView)
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+
+        leftBackView.setOnClickListener { finish() }
+        rightOperateView.visibility = View.GONE
+    }
+
+    override fun initData() {
+        weakReference = WeakReferenceHandler(callback)
+        //每隔5s传一次数据到服务器
+        dataTimer.schedule(object : TimerTask() {
+            override fun run() {
+                TuyaHomeSdk.newHomeInstance(DeserializeModel.getHomeId())
+                    .getHomeDetail(object : ITuyaHomeResultCallback {
+                        override fun onSuccess(bean: HomeBean) {
+                            bean.deviceList.forEach {
+                                val selectedCategory = it.selectCategory()
+                                if (selectedCategory.contains("wsdcg")) {
+                                    //温湿度传感器
+                                    val msg = weakReference.obtainMessage()
+                                    msg.what = 2022112001
+                                    msg.obj = it
+                                    weakReference.sendMessage(msg)
+                                }
+                            }
+                        }
+
+                        override fun onError(errorCode: String, errorMsg: String) {
+                            Log.d("Casic", "TAndHSensorActivity => onError: $errorMsg")
+                        }
+                    })
+            }
+        }, 0, 5000)
+
+        fragmentPages.add(TemperaturePageFragment())
+        fragmentPages.add(HumidityPageFragment())
+        viewPager.adapter =
+            TabPagerAdapter(fragmentPages, LocaleConstant.T_H_PAGE_TITLE, supportFragmentManager)
+        tabLayout.setupWithViewPager(viewPager)
+    }
+
+    private val callback = Handler.Callback { message ->
+        if (message.what == 2022112001) {
+            val it = message.obj as DeviceBean
+            deviceStateView.text = if (it.isOnline) {
+                "设备在线"
+            } else {
+                "设备已离线"
+            }
+            titleView.text = String.format(it.name + "传感器")
+
+            val dataMap = HashMap<String, Any>()
+
+            val h = it.dps["101"].toString()
+            //温湿度的值需要缩小100倍
+            humidityView.text = if (h.isBlank()) {
+                "0%"
+            } else {
+                "${h.toDouble() / 100}%"
+            }
+            dataMap["humidity"] = humidityView.text.toString().replace("%", "")
+
+            val b = it.dps["102"].toString()
+            batteryView.setBackgroundResource(b.toBatteryImage())
+            batteryValueView.text = "${b}%"
+
+            val t = it.dps["103"].toString()
+            //{"unit":"℃","min":-2000,"max":10000,"scale":2,"step":1,"type":"value"}
+            temperatureView.text = if (h.isBlank()) {
+                "0${resources.getString(R.string.temperature_unit)}"
+            } else {
+                "${t.toDouble() / 100}${resources.getString(R.string.temperature_unit)}"
+            }
+            dataMap["temperature"] = temperatureView.text.toString().replace("°C", "")
+
+            dataLinkedList.add(dataMap)
+        }
+        true
+    }
+
+    override fun initEvent() {
+
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        dataTimer.cancel()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
new file mode 100644
index 0000000..9570167
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_10"
+        android:topRightRadius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
new file mode 100644
index 0000000..b35e98c
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="@dimen/dp_10"/>
+
+    <stroke
+        android:width="@dimen/dp_10"
+        android:color="@color/mainBackColor" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_shidu.xml b/app/src/main/res/drawable/ic_shidu.xml
new file mode 100644
index 0000000..1d14648
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shidu.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M662.76,296.76c-54.68,-63.47 -107.74,-109.46 -148.67,-144.95l-1.5,-1.3c-11.97,10.77 -24.84,22.36 -37.42,34.01 -34.88,32.3 -74.98,71.57 -112.94,116.15C284.58,391.9 224,496.05 224,600.85 224,765.08 354.15,896 512,896s288,-130.92 288,-295.15c0,-110.84 -60.59,-215.12 -137.24,-304.09zM512.04,64.04c8.7,8.55 21.87,20 38.08,34.09C649.66,184.62 864,370.89 864,600.85 864,799.2 706.4,960 512,960S160,799.2 160,600.85c0,-219.68 214.57,-412.4 313.64,-501.38 16.48,-14.8 29.76,-26.73 38.33,-35.43L512,64l0.04,0.04z" />
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M500.4,544.39h-0.1c19.35,-47.63 66.08,-81.21 120.66,-81.21 54.28,0 100.8,33.22 120.34,80.44h0.17A243.66,243.66 0,0 1,746 590.54c0,131.6 -104.76,238.28 -234,238.28s-234,-106.68 -234,-238.28a244,244 0,0 1,3.64 -42.1c17.55,43.49 59.56,74.12 108.61,74.12 50.54,0 93.63,-32.53 110.15,-78.16z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_wendu.xml b/app/src/main/res/drawable/ic_wendu.xml
new file mode 100644
index 0000000..41e033d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wendu.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M324,596.69l-17.74,16.6C273.41,644.02 253,687.58 253,736c0,92.78 75.22,168 168,168s168,-75.22 168,-168c0,-49.51 -21.35,-93.96 -55.51,-124.79L515,594.54L515,215.5c0,-52.74 -42.76,-95.5 -95.5,-95.5S324,162.76 324,215.5v381.19zM268,215.5C268,131.83 335.83,64 419.5,64S571,131.83 571,215.5v354.14c45.44,41 74,100.35 74,166.36 0,123.71 -100.29,224 -224,224S197,859.71 197,736c0,-64.55 27.31,-122.73 71,-163.61L268,215.5zM419,384c-17.67,0 -32,14.33 -32,32v210.38c-42.41,14.04 -73,54.01 -73,101.12 0,58.82 47.68,106.5 106.5,106.5S527,786.32 527,727.5c0,-48.22 -32.04,-88.95 -76,-102.07L451,416c0,-17.67 -14.33,-32 -32,-32zM771,224c0,-22.09 -17.91,-40 -40,-40s-40,17.91 -40,40 17.91,40 40,40 40,-17.91 40,-40zM827,224c0,53.02 -42.98,96 -96,96s-96,-42.98 -96,-96 42.98,-96 96,-96 96,42.98 96,96z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_t_h_senser.xml b/app/src/main/res/layout/activity_t_h_senser.xml
new file mode 100644
index 0000000..8f94160
--- /dev/null
+++ b/app/src/main/res/layout/activity_t_h_senser.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/common_bkg"
+    android:orientation="vertical">
+
+    <include layout="@layout/include_device_title" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_100"
+            android:layout_marginHorizontal="@dimen/dp_50"
+            android:layout_marginVertical="@dimen/dp_20"
+            android:background="@drawable/bg_stroke_layout_gray_rectangle_10"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:padding="@dimen/dp_5">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_wendu" />
+
+                <TextView
+                    android:id="@+id/temperatureView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:text="@string/temperature_unit"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/sp_20" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="@dimen/dp_3"
+                android:layout_height="match_parent"
+                android:background="@color/mainBackColor" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_shidu" />
+
+                <TextView
+                    android:id="@+id/humidityView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:text="%"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/sp_20" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/deviceStateView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/app_name" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="@dimen/dp_20"
+            android:gravity="center_vertical">
+
+            <ImageView
+                android:id="@+id/batteryView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_10" />
+
+            <TextView
+                android:id="@+id/batteryValueView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:background="@drawable/bg_solid_layout_white_top_radius_10"
+            android:orientation="vertical">
+
+            <com.google.android.material.tabs.TabLayout
+                android:id="@+id/tabLayout"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_40"
+                android:layout_marginHorizontal="@dimen/dp_40"
+                android:layout_marginVertical="10dp"
+                app:tabIndicatorColor="@color/orangeTextColor"
+                app:tabIndicatorFullWidth="false"
+                app:tabIndicatorHeight="3dp"
+                app:tabSelectedTextColor="@color/mainTextColor"
+                app:tabTextColor="@color/subTextColor" />
+
+            <androidx.viewpager.widget.ViewPager
+                android:id="@+id/viewPager"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_cooker_service.xml b/app/src/main/res/layout/fragment_device_cooker_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_cooker_service.xml
+++ b/app/src/main/res/layout/fragment_device_cooker_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_fireplace_service.xml b/app/src/main/res/layout/fragment_device_fireplace_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_fireplace_service.xml
+++ b/app/src/main/res/layout/fragment_device_fireplace_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_rangehood_service.xml b/app/src/main/res/layout/fragment_device_rangehood_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_rangehood_service.xml
+++ b/app/src/main/res/layout/fragment_device_rangehood_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6abc67b..1eb9752 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,7 @@
         <activity android:name=".view.device.SmartGatewayActivity" />
         <activity android:name=".view.ScanZigbeeActivity" />
         <activity android:name=".view.device.MotionSensorActivity" />
+        <activity android:name=".view.device.TAndHSensorActivity" />
 
         <!--适配华为（huawei）刘海屏-->
         <meta-data
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 58f9e46..74c77ba 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -163,6 +163,10 @@
                                     //人体传感器
                                     requireContext().navigatePageTo<MotionSensorActivity>()
                                 }
+                                selectedCategory.contains("wsdcg") -> {
+                                    //温湿度传感器
+                                    requireContext().navigatePageTo<TAndHSensorActivity>()
+                                }
                             }
                         } else {
                             requireContext().navigatePageTo<LoginActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
new file mode 100644
index 0000000..2267755
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class HumidityPageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_humidity
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
new file mode 100644
index 0000000..2d8a2df
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class TemperaturePageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_temperature
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
index d042a7f..aeb638b 100644
--- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
@@ -34,8 +34,32 @@
     val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们")
     val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴")
     val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置")
+    val T_H_PAGE_TITLE = arrayOf("温度记录", "湿度记录")
     val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu)
     val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话")
+
+    //TODO 模拟数据
+    val TEST_IMAGE = intArrayOf(
+        R.mipmap.t_1,
+        R.mipmap.t_2,
+        R.mipmap.t_3,
+        R.mipmap.t_4,
+        R.mipmap.t_5,
+        R.mipmap.t_6,
+        R.mipmap.t_7,
+        R.mipmap.t_8
+    )
+    val TEST_ARRAY = arrayOf(
+        "24LS01壁挂炉",
+        "多功能智能热水器",
+        "24LC01壁挂炉",
+        "16RC01热水器",
+        "TXC01油烟机",
+        "QZE03燃气灶",
+        "多功能智能油烟机",
+        "多功能智能燃气灶"
+    )
+
     //预置颜色
     val COLORS = arrayOf(
         R.color.color_1, R.color.color_2, R.color.color_3,
diff --git a/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
new file mode 100644
index 0000000..7c8dfe7
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
@@ -0,0 +1,135 @@
+package com.casic.br.view.device
+
+import android.os.Handler
+import android.util.Log
+import android.view.View
+import androidx.fragment.app.Fragment
+import com.casic.br.R
+import com.casic.br.adapter.TabPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.casic.br.extensions.selectCategory
+import com.casic.br.extensions.toBatteryImage
+import com.casic.br.fragment.th.HumidityPageFragment
+import com.casic.br.fragment.th.TemperaturePageFragment
+import com.casic.br.utils.DeserializeModel
+import com.casic.br.utils.LocaleConstant
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.tuya.smart.home.sdk.TuyaHomeSdk
+import com.tuya.smart.home.sdk.bean.HomeBean
+import com.tuya.smart.home.sdk.callback.ITuyaHomeResultCallback
+import com.tuya.smart.sdk.bean.DeviceBean
+import kotlinx.android.synthetic.main.activity_t_h_senser.*
+import kotlinx.android.synthetic.main.include_device_title.*
+import java.util.*
+import kotlin.collections.HashMap
+
+/**
+ * 温湿度传感器
+ * TODO 数据上报暂缓
+ * */
+class TAndHSensorActivity : KotlinBaseActivity() {
+
+    private val context = this@TAndHSensorActivity
+    private val dataTimer by lazy { Timer() }//数据上传Timer
+    private val dataLinkedList = LinkedList<HashMap<String, Any>>()
+    private lateinit var weakReference: WeakReferenceHandler
+    private var fragmentPages: ArrayList<Fragment> = ArrayList()
+
+    override fun initLayoutView(): Int = R.layout.activity_t_h_senser
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        initLayoutImmersionBar(rootView)
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+
+        leftBackView.setOnClickListener { finish() }
+        rightOperateView.visibility = View.GONE
+    }
+
+    override fun initData() {
+        weakReference = WeakReferenceHandler(callback)
+        //每隔5s传一次数据到服务器
+        dataTimer.schedule(object : TimerTask() {
+            override fun run() {
+                TuyaHomeSdk.newHomeInstance(DeserializeModel.getHomeId())
+                    .getHomeDetail(object : ITuyaHomeResultCallback {
+                        override fun onSuccess(bean: HomeBean) {
+                            bean.deviceList.forEach {
+                                val selectedCategory = it.selectCategory()
+                                if (selectedCategory.contains("wsdcg")) {
+                                    //温湿度传感器
+                                    val msg = weakReference.obtainMessage()
+                                    msg.what = 2022112001
+                                    msg.obj = it
+                                    weakReference.sendMessage(msg)
+                                }
+                            }
+                        }
+
+                        override fun onError(errorCode: String, errorMsg: String) {
+                            Log.d("Casic", "TAndHSensorActivity => onError: $errorMsg")
+                        }
+                    })
+            }
+        }, 0, 5000)
+
+        fragmentPages.add(TemperaturePageFragment())
+        fragmentPages.add(HumidityPageFragment())
+        viewPager.adapter =
+            TabPagerAdapter(fragmentPages, LocaleConstant.T_H_PAGE_TITLE, supportFragmentManager)
+        tabLayout.setupWithViewPager(viewPager)
+    }
+
+    private val callback = Handler.Callback { message ->
+        if (message.what == 2022112001) {
+            val it = message.obj as DeviceBean
+            deviceStateView.text = if (it.isOnline) {
+                "设备在线"
+            } else {
+                "设备已离线"
+            }
+            titleView.text = String.format(it.name + "传感器")
+
+            val dataMap = HashMap<String, Any>()
+
+            val h = it.dps["101"].toString()
+            //温湿度的值需要缩小100倍
+            humidityView.text = if (h.isBlank()) {
+                "0%"
+            } else {
+                "${h.toDouble() / 100}%"
+            }
+            dataMap["humidity"] = humidityView.text.toString().replace("%", "")
+
+            val b = it.dps["102"].toString()
+            batteryView.setBackgroundResource(b.toBatteryImage())
+            batteryValueView.text = "${b}%"
+
+            val t = it.dps["103"].toString()
+            //{"unit":"℃","min":-2000,"max":10000,"scale":2,"step":1,"type":"value"}
+            temperatureView.text = if (h.isBlank()) {
+                "0${resources.getString(R.string.temperature_unit)}"
+            } else {
+                "${t.toDouble() / 100}${resources.getString(R.string.temperature_unit)}"
+            }
+            dataMap["temperature"] = temperatureView.text.toString().replace("°C", "")
+
+            dataLinkedList.add(dataMap)
+        }
+        true
+    }
+
+    override fun initEvent() {
+
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        dataTimer.cancel()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
new file mode 100644
index 0000000..9570167
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_10"
+        android:topRightRadius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
new file mode 100644
index 0000000..b35e98c
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="@dimen/dp_10"/>
+
+    <stroke
+        android:width="@dimen/dp_10"
+        android:color="@color/mainBackColor" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_shidu.xml b/app/src/main/res/drawable/ic_shidu.xml
new file mode 100644
index 0000000..1d14648
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shidu.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M662.76,296.76c-54.68,-63.47 -107.74,-109.46 -148.67,-144.95l-1.5,-1.3c-11.97,10.77 -24.84,22.36 -37.42,34.01 -34.88,32.3 -74.98,71.57 -112.94,116.15C284.58,391.9 224,496.05 224,600.85 224,765.08 354.15,896 512,896s288,-130.92 288,-295.15c0,-110.84 -60.59,-215.12 -137.24,-304.09zM512.04,64.04c8.7,8.55 21.87,20 38.08,34.09C649.66,184.62 864,370.89 864,600.85 864,799.2 706.4,960 512,960S160,799.2 160,600.85c0,-219.68 214.57,-412.4 313.64,-501.38 16.48,-14.8 29.76,-26.73 38.33,-35.43L512,64l0.04,0.04z" />
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M500.4,544.39h-0.1c19.35,-47.63 66.08,-81.21 120.66,-81.21 54.28,0 100.8,33.22 120.34,80.44h0.17A243.66,243.66 0,0 1,746 590.54c0,131.6 -104.76,238.28 -234,238.28s-234,-106.68 -234,-238.28a244,244 0,0 1,3.64 -42.1c17.55,43.49 59.56,74.12 108.61,74.12 50.54,0 93.63,-32.53 110.15,-78.16z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_wendu.xml b/app/src/main/res/drawable/ic_wendu.xml
new file mode 100644
index 0000000..41e033d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wendu.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M324,596.69l-17.74,16.6C273.41,644.02 253,687.58 253,736c0,92.78 75.22,168 168,168s168,-75.22 168,-168c0,-49.51 -21.35,-93.96 -55.51,-124.79L515,594.54L515,215.5c0,-52.74 -42.76,-95.5 -95.5,-95.5S324,162.76 324,215.5v381.19zM268,215.5C268,131.83 335.83,64 419.5,64S571,131.83 571,215.5v354.14c45.44,41 74,100.35 74,166.36 0,123.71 -100.29,224 -224,224S197,859.71 197,736c0,-64.55 27.31,-122.73 71,-163.61L268,215.5zM419,384c-17.67,0 -32,14.33 -32,32v210.38c-42.41,14.04 -73,54.01 -73,101.12 0,58.82 47.68,106.5 106.5,106.5S527,786.32 527,727.5c0,-48.22 -32.04,-88.95 -76,-102.07L451,416c0,-17.67 -14.33,-32 -32,-32zM771,224c0,-22.09 -17.91,-40 -40,-40s-40,17.91 -40,40 17.91,40 40,40 40,-17.91 40,-40zM827,224c0,53.02 -42.98,96 -96,96s-96,-42.98 -96,-96 42.98,-96 96,-96 96,42.98 96,96z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_t_h_senser.xml b/app/src/main/res/layout/activity_t_h_senser.xml
new file mode 100644
index 0000000..8f94160
--- /dev/null
+++ b/app/src/main/res/layout/activity_t_h_senser.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/common_bkg"
+    android:orientation="vertical">
+
+    <include layout="@layout/include_device_title" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_100"
+            android:layout_marginHorizontal="@dimen/dp_50"
+            android:layout_marginVertical="@dimen/dp_20"
+            android:background="@drawable/bg_stroke_layout_gray_rectangle_10"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:padding="@dimen/dp_5">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_wendu" />
+
+                <TextView
+                    android:id="@+id/temperatureView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:text="@string/temperature_unit"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/sp_20" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="@dimen/dp_3"
+                android:layout_height="match_parent"
+                android:background="@color/mainBackColor" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_shidu" />
+
+                <TextView
+                    android:id="@+id/humidityView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:text="%"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/sp_20" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/deviceStateView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/app_name" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="@dimen/dp_20"
+            android:gravity="center_vertical">
+
+            <ImageView
+                android:id="@+id/batteryView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_10" />
+
+            <TextView
+                android:id="@+id/batteryValueView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:background="@drawable/bg_solid_layout_white_top_radius_10"
+            android:orientation="vertical">
+
+            <com.google.android.material.tabs.TabLayout
+                android:id="@+id/tabLayout"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_40"
+                android:layout_marginHorizontal="@dimen/dp_40"
+                android:layout_marginVertical="10dp"
+                app:tabIndicatorColor="@color/orangeTextColor"
+                app:tabIndicatorFullWidth="false"
+                app:tabIndicatorHeight="3dp"
+                app:tabSelectedTextColor="@color/mainTextColor"
+                app:tabTextColor="@color/subTextColor" />
+
+            <androidx.viewpager.widget.ViewPager
+                android:id="@+id/viewPager"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_cooker_service.xml b/app/src/main/res/layout/fragment_device_cooker_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_cooker_service.xml
+++ b/app/src/main/res/layout/fragment_device_cooker_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_fireplace_service.xml b/app/src/main/res/layout/fragment_device_fireplace_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_fireplace_service.xml
+++ b/app/src/main/res/layout/fragment_device_fireplace_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_rangehood_service.xml b/app/src/main/res/layout/fragment_device_rangehood_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_rangehood_service.xml
+++ b/app/src/main/res/layout/fragment_device_rangehood_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_waterheater_service.xml b/app/src/main/res/layout/fragment_device_waterheater_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_waterheater_service.xml
+++ b/app/src/main/res/layout/fragment_device_waterheater_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6abc67b..1eb9752 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,7 @@
         <activity android:name=".view.device.SmartGatewayActivity" />
         <activity android:name=".view.ScanZigbeeActivity" />
         <activity android:name=".view.device.MotionSensorActivity" />
+        <activity android:name=".view.device.TAndHSensorActivity" />
 
         <!--适配华为（huawei）刘海屏-->
         <meta-data
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 58f9e46..74c77ba 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -163,6 +163,10 @@
                                     //人体传感器
                                     requireContext().navigatePageTo<MotionSensorActivity>()
                                 }
+                                selectedCategory.contains("wsdcg") -> {
+                                    //温湿度传感器
+                                    requireContext().navigatePageTo<TAndHSensorActivity>()
+                                }
                             }
                         } else {
                             requireContext().navigatePageTo<LoginActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
new file mode 100644
index 0000000..2267755
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class HumidityPageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_humidity
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
new file mode 100644
index 0000000..2d8a2df
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class TemperaturePageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_temperature
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
index d042a7f..aeb638b 100644
--- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
@@ -34,8 +34,32 @@
     val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们")
     val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴")
     val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置")
+    val T_H_PAGE_TITLE = arrayOf("温度记录", "湿度记录")
     val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu)
     val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话")
+
+    //TODO 模拟数据
+    val TEST_IMAGE = intArrayOf(
+        R.mipmap.t_1,
+        R.mipmap.t_2,
+        R.mipmap.t_3,
+        R.mipmap.t_4,
+        R.mipmap.t_5,
+        R.mipmap.t_6,
+        R.mipmap.t_7,
+        R.mipmap.t_8
+    )
+    val TEST_ARRAY = arrayOf(
+        "24LS01壁挂炉",
+        "多功能智能热水器",
+        "24LC01壁挂炉",
+        "16RC01热水器",
+        "TXC01油烟机",
+        "QZE03燃气灶",
+        "多功能智能油烟机",
+        "多功能智能燃气灶"
+    )
+
     //预置颜色
     val COLORS = arrayOf(
         R.color.color_1, R.color.color_2, R.color.color_3,
diff --git a/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
new file mode 100644
index 0000000..7c8dfe7
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
@@ -0,0 +1,135 @@
+package com.casic.br.view.device
+
+import android.os.Handler
+import android.util.Log
+import android.view.View
+import androidx.fragment.app.Fragment
+import com.casic.br.R
+import com.casic.br.adapter.TabPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.casic.br.extensions.selectCategory
+import com.casic.br.extensions.toBatteryImage
+import com.casic.br.fragment.th.HumidityPageFragment
+import com.casic.br.fragment.th.TemperaturePageFragment
+import com.casic.br.utils.DeserializeModel
+import com.casic.br.utils.LocaleConstant
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.tuya.smart.home.sdk.TuyaHomeSdk
+import com.tuya.smart.home.sdk.bean.HomeBean
+import com.tuya.smart.home.sdk.callback.ITuyaHomeResultCallback
+import com.tuya.smart.sdk.bean.DeviceBean
+import kotlinx.android.synthetic.main.activity_t_h_senser.*
+import kotlinx.android.synthetic.main.include_device_title.*
+import java.util.*
+import kotlin.collections.HashMap
+
+/**
+ * 温湿度传感器
+ * TODO 数据上报暂缓
+ * */
+class TAndHSensorActivity : KotlinBaseActivity() {
+
+    private val context = this@TAndHSensorActivity
+    private val dataTimer by lazy { Timer() }//数据上传Timer
+    private val dataLinkedList = LinkedList<HashMap<String, Any>>()
+    private lateinit var weakReference: WeakReferenceHandler
+    private var fragmentPages: ArrayList<Fragment> = ArrayList()
+
+    override fun initLayoutView(): Int = R.layout.activity_t_h_senser
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        initLayoutImmersionBar(rootView)
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+
+        leftBackView.setOnClickListener { finish() }
+        rightOperateView.visibility = View.GONE
+    }
+
+    override fun initData() {
+        weakReference = WeakReferenceHandler(callback)
+        //每隔5s传一次数据到服务器
+        dataTimer.schedule(object : TimerTask() {
+            override fun run() {
+                TuyaHomeSdk.newHomeInstance(DeserializeModel.getHomeId())
+                    .getHomeDetail(object : ITuyaHomeResultCallback {
+                        override fun onSuccess(bean: HomeBean) {
+                            bean.deviceList.forEach {
+                                val selectedCategory = it.selectCategory()
+                                if (selectedCategory.contains("wsdcg")) {
+                                    //温湿度传感器
+                                    val msg = weakReference.obtainMessage()
+                                    msg.what = 2022112001
+                                    msg.obj = it
+                                    weakReference.sendMessage(msg)
+                                }
+                            }
+                        }
+
+                        override fun onError(errorCode: String, errorMsg: String) {
+                            Log.d("Casic", "TAndHSensorActivity => onError: $errorMsg")
+                        }
+                    })
+            }
+        }, 0, 5000)
+
+        fragmentPages.add(TemperaturePageFragment())
+        fragmentPages.add(HumidityPageFragment())
+        viewPager.adapter =
+            TabPagerAdapter(fragmentPages, LocaleConstant.T_H_PAGE_TITLE, supportFragmentManager)
+        tabLayout.setupWithViewPager(viewPager)
+    }
+
+    private val callback = Handler.Callback { message ->
+        if (message.what == 2022112001) {
+            val it = message.obj as DeviceBean
+            deviceStateView.text = if (it.isOnline) {
+                "设备在线"
+            } else {
+                "设备已离线"
+            }
+            titleView.text = String.format(it.name + "传感器")
+
+            val dataMap = HashMap<String, Any>()
+
+            val h = it.dps["101"].toString()
+            //温湿度的值需要缩小100倍
+            humidityView.text = if (h.isBlank()) {
+                "0%"
+            } else {
+                "${h.toDouble() / 100}%"
+            }
+            dataMap["humidity"] = humidityView.text.toString().replace("%", "")
+
+            val b = it.dps["102"].toString()
+            batteryView.setBackgroundResource(b.toBatteryImage())
+            batteryValueView.text = "${b}%"
+
+            val t = it.dps["103"].toString()
+            //{"unit":"℃","min":-2000,"max":10000,"scale":2,"step":1,"type":"value"}
+            temperatureView.text = if (h.isBlank()) {
+                "0${resources.getString(R.string.temperature_unit)}"
+            } else {
+                "${t.toDouble() / 100}${resources.getString(R.string.temperature_unit)}"
+            }
+            dataMap["temperature"] = temperatureView.text.toString().replace("°C", "")
+
+            dataLinkedList.add(dataMap)
+        }
+        true
+    }
+
+    override fun initEvent() {
+
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        dataTimer.cancel()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
new file mode 100644
index 0000000..9570167
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_10"
+        android:topRightRadius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
new file mode 100644
index 0000000..b35e98c
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="@dimen/dp_10"/>
+
+    <stroke
+        android:width="@dimen/dp_10"
+        android:color="@color/mainBackColor" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_shidu.xml b/app/src/main/res/drawable/ic_shidu.xml
new file mode 100644
index 0000000..1d14648
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shidu.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M662.76,296.76c-54.68,-63.47 -107.74,-109.46 -148.67,-144.95l-1.5,-1.3c-11.97,10.77 -24.84,22.36 -37.42,34.01 -34.88,32.3 -74.98,71.57 -112.94,116.15C284.58,391.9 224,496.05 224,600.85 224,765.08 354.15,896 512,896s288,-130.92 288,-295.15c0,-110.84 -60.59,-215.12 -137.24,-304.09zM512.04,64.04c8.7,8.55 21.87,20 38.08,34.09C649.66,184.62 864,370.89 864,600.85 864,799.2 706.4,960 512,960S160,799.2 160,600.85c0,-219.68 214.57,-412.4 313.64,-501.38 16.48,-14.8 29.76,-26.73 38.33,-35.43L512,64l0.04,0.04z" />
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M500.4,544.39h-0.1c19.35,-47.63 66.08,-81.21 120.66,-81.21 54.28,0 100.8,33.22 120.34,80.44h0.17A243.66,243.66 0,0 1,746 590.54c0,131.6 -104.76,238.28 -234,238.28s-234,-106.68 -234,-238.28a244,244 0,0 1,3.64 -42.1c17.55,43.49 59.56,74.12 108.61,74.12 50.54,0 93.63,-32.53 110.15,-78.16z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_wendu.xml b/app/src/main/res/drawable/ic_wendu.xml
new file mode 100644
index 0000000..41e033d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wendu.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M324,596.69l-17.74,16.6C273.41,644.02 253,687.58 253,736c0,92.78 75.22,168 168,168s168,-75.22 168,-168c0,-49.51 -21.35,-93.96 -55.51,-124.79L515,594.54L515,215.5c0,-52.74 -42.76,-95.5 -95.5,-95.5S324,162.76 324,215.5v381.19zM268,215.5C268,131.83 335.83,64 419.5,64S571,131.83 571,215.5v354.14c45.44,41 74,100.35 74,166.36 0,123.71 -100.29,224 -224,224S197,859.71 197,736c0,-64.55 27.31,-122.73 71,-163.61L268,215.5zM419,384c-17.67,0 -32,14.33 -32,32v210.38c-42.41,14.04 -73,54.01 -73,101.12 0,58.82 47.68,106.5 106.5,106.5S527,786.32 527,727.5c0,-48.22 -32.04,-88.95 -76,-102.07L451,416c0,-17.67 -14.33,-32 -32,-32zM771,224c0,-22.09 -17.91,-40 -40,-40s-40,17.91 -40,40 17.91,40 40,40 40,-17.91 40,-40zM827,224c0,53.02 -42.98,96 -96,96s-96,-42.98 -96,-96 42.98,-96 96,-96 96,42.98 96,96z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_t_h_senser.xml b/app/src/main/res/layout/activity_t_h_senser.xml
new file mode 100644
index 0000000..8f94160
--- /dev/null
+++ b/app/src/main/res/layout/activity_t_h_senser.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/common_bkg"
+    android:orientation="vertical">
+
+    <include layout="@layout/include_device_title" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_100"
+            android:layout_marginHorizontal="@dimen/dp_50"
+            android:layout_marginVertical="@dimen/dp_20"
+            android:background="@drawable/bg_stroke_layout_gray_rectangle_10"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:padding="@dimen/dp_5">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_wendu" />
+
+                <TextView
+                    android:id="@+id/temperatureView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:text="@string/temperature_unit"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/sp_20" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="@dimen/dp_3"
+                android:layout_height="match_parent"
+                android:background="@color/mainBackColor" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_shidu" />
+
+                <TextView
+                    android:id="@+id/humidityView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:text="%"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/sp_20" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/deviceStateView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/app_name" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="@dimen/dp_20"
+            android:gravity="center_vertical">
+
+            <ImageView
+                android:id="@+id/batteryView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_10" />
+
+            <TextView
+                android:id="@+id/batteryValueView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:background="@drawable/bg_solid_layout_white_top_radius_10"
+            android:orientation="vertical">
+
+            <com.google.android.material.tabs.TabLayout
+                android:id="@+id/tabLayout"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_40"
+                android:layout_marginHorizontal="@dimen/dp_40"
+                android:layout_marginVertical="10dp"
+                app:tabIndicatorColor="@color/orangeTextColor"
+                app:tabIndicatorFullWidth="false"
+                app:tabIndicatorHeight="3dp"
+                app:tabSelectedTextColor="@color/mainTextColor"
+                app:tabTextColor="@color/subTextColor" />
+
+            <androidx.viewpager.widget.ViewPager
+                android:id="@+id/viewPager"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_cooker_service.xml b/app/src/main/res/layout/fragment_device_cooker_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_cooker_service.xml
+++ b/app/src/main/res/layout/fragment_device_cooker_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_fireplace_service.xml b/app/src/main/res/layout/fragment_device_fireplace_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_fireplace_service.xml
+++ b/app/src/main/res/layout/fragment_device_fireplace_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_rangehood_service.xml b/app/src/main/res/layout/fragment_device_rangehood_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_rangehood_service.xml
+++ b/app/src/main/res/layout/fragment_device_rangehood_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_waterheater_service.xml b/app/src/main/res/layout/fragment_device_waterheater_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_waterheater_service.xml
+++ b/app/src/main/res/layout/fragment_device_waterheater_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_favorite.xml b/app/src/main/res/layout/fragment_favorite.xml
index 8797b7a..71c0138 100644
--- a/app/src/main/res/layout/fragment_favorite.xml
+++ b/app/src/main/res/layout/fragment_favorite.xml
@@ -14,7 +14,7 @@
         <com.youth.banner.Banner
             android:id="@+id/shopBannerView"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_200"
+            android:layout_height="@dimen/dp_220"
             app:banner_indicator_gravity="left"
             app:banner_indicator_height="@dimen/dp_3"
             app:banner_indicator_margin="@dimen/dp_7"

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6abc67b..1eb9752 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,7 @@
         <activity android:name=".view.device.SmartGatewayActivity" />
         <activity android:name=".view.ScanZigbeeActivity" />
         <activity android:name=".view.device.MotionSensorActivity" />
+        <activity android:name=".view.device.TAndHSensorActivity" />
 
         <!--适配华为（huawei）刘海屏-->
         <meta-data
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 58f9e46..74c77ba 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -163,6 +163,10 @@
                                     //人体传感器
                                     requireContext().navigatePageTo<MotionSensorActivity>()
                                 }
+                                selectedCategory.contains("wsdcg") -> {
+                                    //温湿度传感器
+                                    requireContext().navigatePageTo<TAndHSensorActivity>()
+                                }
                             }
                         } else {
                             requireContext().navigatePageTo<LoginActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
new file mode 100644
index 0000000..2267755
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class HumidityPageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_humidity
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
new file mode 100644
index 0000000..2d8a2df
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class TemperaturePageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_temperature
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
index d042a7f..aeb638b 100644
--- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
@@ -34,8 +34,32 @@
     val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们")
     val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴")
     val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置")
+    val T_H_PAGE_TITLE = arrayOf("温度记录", "湿度记录")
     val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu)
     val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话")
+
+    //TODO 模拟数据
+    val TEST_IMAGE = intArrayOf(
+        R.mipmap.t_1,
+        R.mipmap.t_2,
+        R.mipmap.t_3,
+        R.mipmap.t_4,
+        R.mipmap.t_5,
+        R.mipmap.t_6,
+        R.mipmap.t_7,
+        R.mipmap.t_8
+    )
+    val TEST_ARRAY = arrayOf(
+        "24LS01壁挂炉",
+        "多功能智能热水器",
+        "24LC01壁挂炉",
+        "16RC01热水器",
+        "TXC01油烟机",
+        "QZE03燃气灶",
+        "多功能智能油烟机",
+        "多功能智能燃气灶"
+    )
+
     //预置颜色
     val COLORS = arrayOf(
         R.color.color_1, R.color.color_2, R.color.color_3,
diff --git a/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
new file mode 100644
index 0000000..7c8dfe7
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
@@ -0,0 +1,135 @@
+package com.casic.br.view.device
+
+import android.os.Handler
+import android.util.Log
+import android.view.View
+import androidx.fragment.app.Fragment
+import com.casic.br.R
+import com.casic.br.adapter.TabPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.casic.br.extensions.selectCategory
+import com.casic.br.extensions.toBatteryImage
+import com.casic.br.fragment.th.HumidityPageFragment
+import com.casic.br.fragment.th.TemperaturePageFragment
+import com.casic.br.utils.DeserializeModel
+import com.casic.br.utils.LocaleConstant
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.tuya.smart.home.sdk.TuyaHomeSdk
+import com.tuya.smart.home.sdk.bean.HomeBean
+import com.tuya.smart.home.sdk.callback.ITuyaHomeResultCallback
+import com.tuya.smart.sdk.bean.DeviceBean
+import kotlinx.android.synthetic.main.activity_t_h_senser.*
+import kotlinx.android.synthetic.main.include_device_title.*
+import java.util.*
+import kotlin.collections.HashMap
+
+/**
+ * 温湿度传感器
+ * TODO 数据上报暂缓
+ * */
+class TAndHSensorActivity : KotlinBaseActivity() {
+
+    private val context = this@TAndHSensorActivity
+    private val dataTimer by lazy { Timer() }//数据上传Timer
+    private val dataLinkedList = LinkedList<HashMap<String, Any>>()
+    private lateinit var weakReference: WeakReferenceHandler
+    private var fragmentPages: ArrayList<Fragment> = ArrayList()
+
+    override fun initLayoutView(): Int = R.layout.activity_t_h_senser
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        initLayoutImmersionBar(rootView)
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+
+        leftBackView.setOnClickListener { finish() }
+        rightOperateView.visibility = View.GONE
+    }
+
+    override fun initData() {
+        weakReference = WeakReferenceHandler(callback)
+        //每隔5s传一次数据到服务器
+        dataTimer.schedule(object : TimerTask() {
+            override fun run() {
+                TuyaHomeSdk.newHomeInstance(DeserializeModel.getHomeId())
+                    .getHomeDetail(object : ITuyaHomeResultCallback {
+                        override fun onSuccess(bean: HomeBean) {
+                            bean.deviceList.forEach {
+                                val selectedCategory = it.selectCategory()
+                                if (selectedCategory.contains("wsdcg")) {
+                                    //温湿度传感器
+                                    val msg = weakReference.obtainMessage()
+                                    msg.what = 2022112001
+                                    msg.obj = it
+                                    weakReference.sendMessage(msg)
+                                }
+                            }
+                        }
+
+                        override fun onError(errorCode: String, errorMsg: String) {
+                            Log.d("Casic", "TAndHSensorActivity => onError: $errorMsg")
+                        }
+                    })
+            }
+        }, 0, 5000)
+
+        fragmentPages.add(TemperaturePageFragment())
+        fragmentPages.add(HumidityPageFragment())
+        viewPager.adapter =
+            TabPagerAdapter(fragmentPages, LocaleConstant.T_H_PAGE_TITLE, supportFragmentManager)
+        tabLayout.setupWithViewPager(viewPager)
+    }
+
+    private val callback = Handler.Callback { message ->
+        if (message.what == 2022112001) {
+            val it = message.obj as DeviceBean
+            deviceStateView.text = if (it.isOnline) {
+                "设备在线"
+            } else {
+                "设备已离线"
+            }
+            titleView.text = String.format(it.name + "传感器")
+
+            val dataMap = HashMap<String, Any>()
+
+            val h = it.dps["101"].toString()
+            //温湿度的值需要缩小100倍
+            humidityView.text = if (h.isBlank()) {
+                "0%"
+            } else {
+                "${h.toDouble() / 100}%"
+            }
+            dataMap["humidity"] = humidityView.text.toString().replace("%", "")
+
+            val b = it.dps["102"].toString()
+            batteryView.setBackgroundResource(b.toBatteryImage())
+            batteryValueView.text = "${b}%"
+
+            val t = it.dps["103"].toString()
+            //{"unit":"℃","min":-2000,"max":10000,"scale":2,"step":1,"type":"value"}
+            temperatureView.text = if (h.isBlank()) {
+                "0${resources.getString(R.string.temperature_unit)}"
+            } else {
+                "${t.toDouble() / 100}${resources.getString(R.string.temperature_unit)}"
+            }
+            dataMap["temperature"] = temperatureView.text.toString().replace("°C", "")
+
+            dataLinkedList.add(dataMap)
+        }
+        true
+    }
+
+    override fun initEvent() {
+
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        dataTimer.cancel()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
new file mode 100644
index 0000000..9570167
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_10"
+        android:topRightRadius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
new file mode 100644
index 0000000..b35e98c
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="@dimen/dp_10"/>
+
+    <stroke
+        android:width="@dimen/dp_10"
+        android:color="@color/mainBackColor" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_shidu.xml b/app/src/main/res/drawable/ic_shidu.xml
new file mode 100644
index 0000000..1d14648
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shidu.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M662.76,296.76c-54.68,-63.47 -107.74,-109.46 -148.67,-144.95l-1.5,-1.3c-11.97,10.77 -24.84,22.36 -37.42,34.01 -34.88,32.3 -74.98,71.57 -112.94,116.15C284.58,391.9 224,496.05 224,600.85 224,765.08 354.15,896 512,896s288,-130.92 288,-295.15c0,-110.84 -60.59,-215.12 -137.24,-304.09zM512.04,64.04c8.7,8.55 21.87,20 38.08,34.09C649.66,184.62 864,370.89 864,600.85 864,799.2 706.4,960 512,960S160,799.2 160,600.85c0,-219.68 214.57,-412.4 313.64,-501.38 16.48,-14.8 29.76,-26.73 38.33,-35.43L512,64l0.04,0.04z" />
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M500.4,544.39h-0.1c19.35,-47.63 66.08,-81.21 120.66,-81.21 54.28,0 100.8,33.22 120.34,80.44h0.17A243.66,243.66 0,0 1,746 590.54c0,131.6 -104.76,238.28 -234,238.28s-234,-106.68 -234,-238.28a244,244 0,0 1,3.64 -42.1c17.55,43.49 59.56,74.12 108.61,74.12 50.54,0 93.63,-32.53 110.15,-78.16z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_wendu.xml b/app/src/main/res/drawable/ic_wendu.xml
new file mode 100644
index 0000000..41e033d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wendu.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M324,596.69l-17.74,16.6C273.41,644.02 253,687.58 253,736c0,92.78 75.22,168 168,168s168,-75.22 168,-168c0,-49.51 -21.35,-93.96 -55.51,-124.79L515,594.54L515,215.5c0,-52.74 -42.76,-95.5 -95.5,-95.5S324,162.76 324,215.5v381.19zM268,215.5C268,131.83 335.83,64 419.5,64S571,131.83 571,215.5v354.14c45.44,41 74,100.35 74,166.36 0,123.71 -100.29,224 -224,224S197,859.71 197,736c0,-64.55 27.31,-122.73 71,-163.61L268,215.5zM419,384c-17.67,0 -32,14.33 -32,32v210.38c-42.41,14.04 -73,54.01 -73,101.12 0,58.82 47.68,106.5 106.5,106.5S527,786.32 527,727.5c0,-48.22 -32.04,-88.95 -76,-102.07L451,416c0,-17.67 -14.33,-32 -32,-32zM771,224c0,-22.09 -17.91,-40 -40,-40s-40,17.91 -40,40 17.91,40 40,40 40,-17.91 40,-40zM827,224c0,53.02 -42.98,96 -96,96s-96,-42.98 -96,-96 42.98,-96 96,-96 96,42.98 96,96z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_t_h_senser.xml b/app/src/main/res/layout/activity_t_h_senser.xml
new file mode 100644
index 0000000..8f94160
--- /dev/null
+++ b/app/src/main/res/layout/activity_t_h_senser.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/common_bkg"
+    android:orientation="vertical">
+
+    <include layout="@layout/include_device_title" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_100"
+            android:layout_marginHorizontal="@dimen/dp_50"
+            android:layout_marginVertical="@dimen/dp_20"
+            android:background="@drawable/bg_stroke_layout_gray_rectangle_10"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:padding="@dimen/dp_5">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_wendu" />
+
+                <TextView
+                    android:id="@+id/temperatureView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:text="@string/temperature_unit"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/sp_20" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="@dimen/dp_3"
+                android:layout_height="match_parent"
+                android:background="@color/mainBackColor" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_shidu" />
+
+                <TextView
+                    android:id="@+id/humidityView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:text="%"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/sp_20" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/deviceStateView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/app_name" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="@dimen/dp_20"
+            android:gravity="center_vertical">
+
+            <ImageView
+                android:id="@+id/batteryView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_10" />
+
+            <TextView
+                android:id="@+id/batteryValueView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:background="@drawable/bg_solid_layout_white_top_radius_10"
+            android:orientation="vertical">
+
+            <com.google.android.material.tabs.TabLayout
+                android:id="@+id/tabLayout"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_40"
+                android:layout_marginHorizontal="@dimen/dp_40"
+                android:layout_marginVertical="10dp"
+                app:tabIndicatorColor="@color/orangeTextColor"
+                app:tabIndicatorFullWidth="false"
+                app:tabIndicatorHeight="3dp"
+                app:tabSelectedTextColor="@color/mainTextColor"
+                app:tabTextColor="@color/subTextColor" />
+
+            <androidx.viewpager.widget.ViewPager
+                android:id="@+id/viewPager"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_cooker_service.xml b/app/src/main/res/layout/fragment_device_cooker_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_cooker_service.xml
+++ b/app/src/main/res/layout/fragment_device_cooker_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_fireplace_service.xml b/app/src/main/res/layout/fragment_device_fireplace_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_fireplace_service.xml
+++ b/app/src/main/res/layout/fragment_device_fireplace_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_rangehood_service.xml b/app/src/main/res/layout/fragment_device_rangehood_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_rangehood_service.xml
+++ b/app/src/main/res/layout/fragment_device_rangehood_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_waterheater_service.xml b/app/src/main/res/layout/fragment_device_waterheater_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_waterheater_service.xml
+++ b/app/src/main/res/layout/fragment_device_waterheater_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_favorite.xml b/app/src/main/res/layout/fragment_favorite.xml
index 8797b7a..71c0138 100644
--- a/app/src/main/res/layout/fragment_favorite.xml
+++ b/app/src/main/res/layout/fragment_favorite.xml
@@ -14,7 +14,7 @@
         <com.youth.banner.Banner
             android:id="@+id/shopBannerView"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_200"
+            android:layout_height="@dimen/dp_220"
             app:banner_indicator_gravity="left"
             app:banner_indicator_height="@dimen/dp_3"
             app:banner_indicator_margin="@dimen/dp_7"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index cf0fccb..e063769 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -81,7 +81,7 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_200"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_20"
                 android:background="@color/white"
                 android:orientation="vertical">
@@ -113,7 +113,16 @@
 
                 <include layout="@layout/include_horizontal_no_margin_line" />
 
-
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recommendRecyclerView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/dp_5"
+                    android:nestedScrollingEnabled="true"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:scrollbars="none"
+                    app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+                    app:spanCount="2" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6abc67b..1eb9752 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,7 @@
         <activity android:name=".view.device.SmartGatewayActivity" />
         <activity android:name=".view.ScanZigbeeActivity" />
         <activity android:name=".view.device.MotionSensorActivity" />
+        <activity android:name=".view.device.TAndHSensorActivity" />
 
         <!--适配华为（huawei）刘海屏-->
         <meta-data
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 58f9e46..74c77ba 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -163,6 +163,10 @@
                                     //人体传感器
                                     requireContext().navigatePageTo<MotionSensorActivity>()
                                 }
+                                selectedCategory.contains("wsdcg") -> {
+                                    //温湿度传感器
+                                    requireContext().navigatePageTo<TAndHSensorActivity>()
+                                }
                             }
                         } else {
                             requireContext().navigatePageTo<LoginActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
new file mode 100644
index 0000000..2267755
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class HumidityPageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_humidity
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
new file mode 100644
index 0000000..2d8a2df
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class TemperaturePageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_temperature
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
index d042a7f..aeb638b 100644
--- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
@@ -34,8 +34,32 @@
     val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们")
     val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴")
     val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置")
+    val T_H_PAGE_TITLE = arrayOf("温度记录", "湿度记录")
     val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu)
     val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话")
+
+    //TODO 模拟数据
+    val TEST_IMAGE = intArrayOf(
+        R.mipmap.t_1,
+        R.mipmap.t_2,
+        R.mipmap.t_3,
+        R.mipmap.t_4,
+        R.mipmap.t_5,
+        R.mipmap.t_6,
+        R.mipmap.t_7,
+        R.mipmap.t_8
+    )
+    val TEST_ARRAY = arrayOf(
+        "24LS01壁挂炉",
+        "多功能智能热水器",
+        "24LC01壁挂炉",
+        "16RC01热水器",
+        "TXC01油烟机",
+        "QZE03燃气灶",
+        "多功能智能油烟机",
+        "多功能智能燃气灶"
+    )
+
     //预置颜色
     val COLORS = arrayOf(
         R.color.color_1, R.color.color_2, R.color.color_3,
diff --git a/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
new file mode 100644
index 0000000..7c8dfe7
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
@@ -0,0 +1,135 @@
+package com.casic.br.view.device
+
+import android.os.Handler
+import android.util.Log
+import android.view.View
+import androidx.fragment.app.Fragment
+import com.casic.br.R
+import com.casic.br.adapter.TabPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.casic.br.extensions.selectCategory
+import com.casic.br.extensions.toBatteryImage
+import com.casic.br.fragment.th.HumidityPageFragment
+import com.casic.br.fragment.th.TemperaturePageFragment
+import com.casic.br.utils.DeserializeModel
+import com.casic.br.utils.LocaleConstant
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.tuya.smart.home.sdk.TuyaHomeSdk
+import com.tuya.smart.home.sdk.bean.HomeBean
+import com.tuya.smart.home.sdk.callback.ITuyaHomeResultCallback
+import com.tuya.smart.sdk.bean.DeviceBean
+import kotlinx.android.synthetic.main.activity_t_h_senser.*
+import kotlinx.android.synthetic.main.include_device_title.*
+import java.util.*
+import kotlin.collections.HashMap
+
+/**
+ * 温湿度传感器
+ * TODO 数据上报暂缓
+ * */
+class TAndHSensorActivity : KotlinBaseActivity() {
+
+    private val context = this@TAndHSensorActivity
+    private val dataTimer by lazy { Timer() }//数据上传Timer
+    private val dataLinkedList = LinkedList<HashMap<String, Any>>()
+    private lateinit var weakReference: WeakReferenceHandler
+    private var fragmentPages: ArrayList<Fragment> = ArrayList()
+
+    override fun initLayoutView(): Int = R.layout.activity_t_h_senser
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        initLayoutImmersionBar(rootView)
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+
+        leftBackView.setOnClickListener { finish() }
+        rightOperateView.visibility = View.GONE
+    }
+
+    override fun initData() {
+        weakReference = WeakReferenceHandler(callback)
+        //每隔5s传一次数据到服务器
+        dataTimer.schedule(object : TimerTask() {
+            override fun run() {
+                TuyaHomeSdk.newHomeInstance(DeserializeModel.getHomeId())
+                    .getHomeDetail(object : ITuyaHomeResultCallback {
+                        override fun onSuccess(bean: HomeBean) {
+                            bean.deviceList.forEach {
+                                val selectedCategory = it.selectCategory()
+                                if (selectedCategory.contains("wsdcg")) {
+                                    //温湿度传感器
+                                    val msg = weakReference.obtainMessage()
+                                    msg.what = 2022112001
+                                    msg.obj = it
+                                    weakReference.sendMessage(msg)
+                                }
+                            }
+                        }
+
+                        override fun onError(errorCode: String, errorMsg: String) {
+                            Log.d("Casic", "TAndHSensorActivity => onError: $errorMsg")
+                        }
+                    })
+            }
+        }, 0, 5000)
+
+        fragmentPages.add(TemperaturePageFragment())
+        fragmentPages.add(HumidityPageFragment())
+        viewPager.adapter =
+            TabPagerAdapter(fragmentPages, LocaleConstant.T_H_PAGE_TITLE, supportFragmentManager)
+        tabLayout.setupWithViewPager(viewPager)
+    }
+
+    private val callback = Handler.Callback { message ->
+        if (message.what == 2022112001) {
+            val it = message.obj as DeviceBean
+            deviceStateView.text = if (it.isOnline) {
+                "设备在线"
+            } else {
+                "设备已离线"
+            }
+            titleView.text = String.format(it.name + "传感器")
+
+            val dataMap = HashMap<String, Any>()
+
+            val h = it.dps["101"].toString()
+            //温湿度的值需要缩小100倍
+            humidityView.text = if (h.isBlank()) {
+                "0%"
+            } else {
+                "${h.toDouble() / 100}%"
+            }
+            dataMap["humidity"] = humidityView.text.toString().replace("%", "")
+
+            val b = it.dps["102"].toString()
+            batteryView.setBackgroundResource(b.toBatteryImage())
+            batteryValueView.text = "${b}%"
+
+            val t = it.dps["103"].toString()
+            //{"unit":"℃","min":-2000,"max":10000,"scale":2,"step":1,"type":"value"}
+            temperatureView.text = if (h.isBlank()) {
+                "0${resources.getString(R.string.temperature_unit)}"
+            } else {
+                "${t.toDouble() / 100}${resources.getString(R.string.temperature_unit)}"
+            }
+            dataMap["temperature"] = temperatureView.text.toString().replace("°C", "")
+
+            dataLinkedList.add(dataMap)
+        }
+        true
+    }
+
+    override fun initEvent() {
+
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        dataTimer.cancel()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
new file mode 100644
index 0000000..9570167
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_10"
+        android:topRightRadius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
new file mode 100644
index 0000000..b35e98c
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="@dimen/dp_10"/>
+
+    <stroke
+        android:width="@dimen/dp_10"
+        android:color="@color/mainBackColor" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_shidu.xml b/app/src/main/res/drawable/ic_shidu.xml
new file mode 100644
index 0000000..1d14648
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shidu.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M662.76,296.76c-54.68,-63.47 -107.74,-109.46 -148.67,-144.95l-1.5,-1.3c-11.97,10.77 -24.84,22.36 -37.42,34.01 -34.88,32.3 -74.98,71.57 -112.94,116.15C284.58,391.9 224,496.05 224,600.85 224,765.08 354.15,896 512,896s288,-130.92 288,-295.15c0,-110.84 -60.59,-215.12 -137.24,-304.09zM512.04,64.04c8.7,8.55 21.87,20 38.08,34.09C649.66,184.62 864,370.89 864,600.85 864,799.2 706.4,960 512,960S160,799.2 160,600.85c0,-219.68 214.57,-412.4 313.64,-501.38 16.48,-14.8 29.76,-26.73 38.33,-35.43L512,64l0.04,0.04z" />
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M500.4,544.39h-0.1c19.35,-47.63 66.08,-81.21 120.66,-81.21 54.28,0 100.8,33.22 120.34,80.44h0.17A243.66,243.66 0,0 1,746 590.54c0,131.6 -104.76,238.28 -234,238.28s-234,-106.68 -234,-238.28a244,244 0,0 1,3.64 -42.1c17.55,43.49 59.56,74.12 108.61,74.12 50.54,0 93.63,-32.53 110.15,-78.16z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_wendu.xml b/app/src/main/res/drawable/ic_wendu.xml
new file mode 100644
index 0000000..41e033d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wendu.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M324,596.69l-17.74,16.6C273.41,644.02 253,687.58 253,736c0,92.78 75.22,168 168,168s168,-75.22 168,-168c0,-49.51 -21.35,-93.96 -55.51,-124.79L515,594.54L515,215.5c0,-52.74 -42.76,-95.5 -95.5,-95.5S324,162.76 324,215.5v381.19zM268,215.5C268,131.83 335.83,64 419.5,64S571,131.83 571,215.5v354.14c45.44,41 74,100.35 74,166.36 0,123.71 -100.29,224 -224,224S197,859.71 197,736c0,-64.55 27.31,-122.73 71,-163.61L268,215.5zM419,384c-17.67,0 -32,14.33 -32,32v210.38c-42.41,14.04 -73,54.01 -73,101.12 0,58.82 47.68,106.5 106.5,106.5S527,786.32 527,727.5c0,-48.22 -32.04,-88.95 -76,-102.07L451,416c0,-17.67 -14.33,-32 -32,-32zM771,224c0,-22.09 -17.91,-40 -40,-40s-40,17.91 -40,40 17.91,40 40,40 40,-17.91 40,-40zM827,224c0,53.02 -42.98,96 -96,96s-96,-42.98 -96,-96 42.98,-96 96,-96 96,42.98 96,96z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_t_h_senser.xml b/app/src/main/res/layout/activity_t_h_senser.xml
new file mode 100644
index 0000000..8f94160
--- /dev/null
+++ b/app/src/main/res/layout/activity_t_h_senser.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/common_bkg"
+    android:orientation="vertical">
+
+    <include layout="@layout/include_device_title" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_100"
+            android:layout_marginHorizontal="@dimen/dp_50"
+            android:layout_marginVertical="@dimen/dp_20"
+            android:background="@drawable/bg_stroke_layout_gray_rectangle_10"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:padding="@dimen/dp_5">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_wendu" />
+
+                <TextView
+                    android:id="@+id/temperatureView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:text="@string/temperature_unit"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/sp_20" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="@dimen/dp_3"
+                android:layout_height="match_parent"
+                android:background="@color/mainBackColor" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_shidu" />
+
+                <TextView
+                    android:id="@+id/humidityView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:text="%"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/sp_20" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/deviceStateView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/app_name" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="@dimen/dp_20"
+            android:gravity="center_vertical">
+
+            <ImageView
+                android:id="@+id/batteryView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_10" />
+
+            <TextView
+                android:id="@+id/batteryValueView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:background="@drawable/bg_solid_layout_white_top_radius_10"
+            android:orientation="vertical">
+
+            <com.google.android.material.tabs.TabLayout
+                android:id="@+id/tabLayout"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_40"
+                android:layout_marginHorizontal="@dimen/dp_40"
+                android:layout_marginVertical="10dp"
+                app:tabIndicatorColor="@color/orangeTextColor"
+                app:tabIndicatorFullWidth="false"
+                app:tabIndicatorHeight="3dp"
+                app:tabSelectedTextColor="@color/mainTextColor"
+                app:tabTextColor="@color/subTextColor" />
+
+            <androidx.viewpager.widget.ViewPager
+                android:id="@+id/viewPager"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_cooker_service.xml b/app/src/main/res/layout/fragment_device_cooker_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_cooker_service.xml
+++ b/app/src/main/res/layout/fragment_device_cooker_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_fireplace_service.xml b/app/src/main/res/layout/fragment_device_fireplace_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_fireplace_service.xml
+++ b/app/src/main/res/layout/fragment_device_fireplace_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_rangehood_service.xml b/app/src/main/res/layout/fragment_device_rangehood_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_rangehood_service.xml
+++ b/app/src/main/res/layout/fragment_device_rangehood_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_waterheater_service.xml b/app/src/main/res/layout/fragment_device_waterheater_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_waterheater_service.xml
+++ b/app/src/main/res/layout/fragment_device_waterheater_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_favorite.xml b/app/src/main/res/layout/fragment_favorite.xml
index 8797b7a..71c0138 100644
--- a/app/src/main/res/layout/fragment_favorite.xml
+++ b/app/src/main/res/layout/fragment_favorite.xml
@@ -14,7 +14,7 @@
         <com.youth.banner.Banner
             android:id="@+id/shopBannerView"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_200"
+            android:layout_height="@dimen/dp_220"
             app:banner_indicator_gravity="left"
             app:banner_indicator_height="@dimen/dp_3"
             app:banner_indicator_margin="@dimen/dp_7"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index cf0fccb..e063769 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -81,7 +81,7 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_200"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_20"
                 android:background="@color/white"
                 android:orientation="vertical">
@@ -113,7 +113,16 @@
 
                 <include layout="@layout/include_horizontal_no_margin_line" />
 
-
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recommendRecyclerView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/dp_5"
+                    android:nestedScrollingEnabled="true"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:scrollbars="none"
+                    app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+                    app:spanCount="2" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_humidity.xml b/app/src/main/res/layout/fragment_humidity.xml
new file mode 100644
index 0000000..77d9ef6
--- /dev/null
+++ b/app/src/main/res/layout/fragment_humidity.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6abc67b..1eb9752 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,7 @@
         <activity android:name=".view.device.SmartGatewayActivity" />
         <activity android:name=".view.ScanZigbeeActivity" />
         <activity android:name=".view.device.MotionSensorActivity" />
+        <activity android:name=".view.device.TAndHSensorActivity" />
 
         <!--适配华为（huawei）刘海屏-->
         <meta-data
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 58f9e46..74c77ba 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -163,6 +163,10 @@
                                     //人体传感器
                                     requireContext().navigatePageTo<MotionSensorActivity>()
                                 }
+                                selectedCategory.contains("wsdcg") -> {
+                                    //温湿度传感器
+                                    requireContext().navigatePageTo<TAndHSensorActivity>()
+                                }
                             }
                         } else {
                             requireContext().navigatePageTo<LoginActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
new file mode 100644
index 0000000..2267755
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class HumidityPageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_humidity
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
new file mode 100644
index 0000000..2d8a2df
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class TemperaturePageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_temperature
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
index d042a7f..aeb638b 100644
--- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
@@ -34,8 +34,32 @@
     val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们")
     val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴")
     val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置")
+    val T_H_PAGE_TITLE = arrayOf("温度记录", "湿度记录")
     val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu)
     val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话")
+
+    //TODO 模拟数据
+    val TEST_IMAGE = intArrayOf(
+        R.mipmap.t_1,
+        R.mipmap.t_2,
+        R.mipmap.t_3,
+        R.mipmap.t_4,
+        R.mipmap.t_5,
+        R.mipmap.t_6,
+        R.mipmap.t_7,
+        R.mipmap.t_8
+    )
+    val TEST_ARRAY = arrayOf(
+        "24LS01壁挂炉",
+        "多功能智能热水器",
+        "24LC01壁挂炉",
+        "16RC01热水器",
+        "TXC01油烟机",
+        "QZE03燃气灶",
+        "多功能智能油烟机",
+        "多功能智能燃气灶"
+    )
+
     //预置颜色
     val COLORS = arrayOf(
         R.color.color_1, R.color.color_2, R.color.color_3,
diff --git a/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
new file mode 100644
index 0000000..7c8dfe7
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
@@ -0,0 +1,135 @@
+package com.casic.br.view.device
+
+import android.os.Handler
+import android.util.Log
+import android.view.View
+import androidx.fragment.app.Fragment
+import com.casic.br.R
+import com.casic.br.adapter.TabPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.casic.br.extensions.selectCategory
+import com.casic.br.extensions.toBatteryImage
+import com.casic.br.fragment.th.HumidityPageFragment
+import com.casic.br.fragment.th.TemperaturePageFragment
+import com.casic.br.utils.DeserializeModel
+import com.casic.br.utils.LocaleConstant
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.tuya.smart.home.sdk.TuyaHomeSdk
+import com.tuya.smart.home.sdk.bean.HomeBean
+import com.tuya.smart.home.sdk.callback.ITuyaHomeResultCallback
+import com.tuya.smart.sdk.bean.DeviceBean
+import kotlinx.android.synthetic.main.activity_t_h_senser.*
+import kotlinx.android.synthetic.main.include_device_title.*
+import java.util.*
+import kotlin.collections.HashMap
+
+/**
+ * 温湿度传感器
+ * TODO 数据上报暂缓
+ * */
+class TAndHSensorActivity : KotlinBaseActivity() {
+
+    private val context = this@TAndHSensorActivity
+    private val dataTimer by lazy { Timer() }//数据上传Timer
+    private val dataLinkedList = LinkedList<HashMap<String, Any>>()
+    private lateinit var weakReference: WeakReferenceHandler
+    private var fragmentPages: ArrayList<Fragment> = ArrayList()
+
+    override fun initLayoutView(): Int = R.layout.activity_t_h_senser
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        initLayoutImmersionBar(rootView)
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+
+        leftBackView.setOnClickListener { finish() }
+        rightOperateView.visibility = View.GONE
+    }
+
+    override fun initData() {
+        weakReference = WeakReferenceHandler(callback)
+        //每隔5s传一次数据到服务器
+        dataTimer.schedule(object : TimerTask() {
+            override fun run() {
+                TuyaHomeSdk.newHomeInstance(DeserializeModel.getHomeId())
+                    .getHomeDetail(object : ITuyaHomeResultCallback {
+                        override fun onSuccess(bean: HomeBean) {
+                            bean.deviceList.forEach {
+                                val selectedCategory = it.selectCategory()
+                                if (selectedCategory.contains("wsdcg")) {
+                                    //温湿度传感器
+                                    val msg = weakReference.obtainMessage()
+                                    msg.what = 2022112001
+                                    msg.obj = it
+                                    weakReference.sendMessage(msg)
+                                }
+                            }
+                        }
+
+                        override fun onError(errorCode: String, errorMsg: String) {
+                            Log.d("Casic", "TAndHSensorActivity => onError: $errorMsg")
+                        }
+                    })
+            }
+        }, 0, 5000)
+
+        fragmentPages.add(TemperaturePageFragment())
+        fragmentPages.add(HumidityPageFragment())
+        viewPager.adapter =
+            TabPagerAdapter(fragmentPages, LocaleConstant.T_H_PAGE_TITLE, supportFragmentManager)
+        tabLayout.setupWithViewPager(viewPager)
+    }
+
+    private val callback = Handler.Callback { message ->
+        if (message.what == 2022112001) {
+            val it = message.obj as DeviceBean
+            deviceStateView.text = if (it.isOnline) {
+                "设备在线"
+            } else {
+                "设备已离线"
+            }
+            titleView.text = String.format(it.name + "传感器")
+
+            val dataMap = HashMap<String, Any>()
+
+            val h = it.dps["101"].toString()
+            //温湿度的值需要缩小100倍
+            humidityView.text = if (h.isBlank()) {
+                "0%"
+            } else {
+                "${h.toDouble() / 100}%"
+            }
+            dataMap["humidity"] = humidityView.text.toString().replace("%", "")
+
+            val b = it.dps["102"].toString()
+            batteryView.setBackgroundResource(b.toBatteryImage())
+            batteryValueView.text = "${b}%"
+
+            val t = it.dps["103"].toString()
+            //{"unit":"℃","min":-2000,"max":10000,"scale":2,"step":1,"type":"value"}
+            temperatureView.text = if (h.isBlank()) {
+                "0${resources.getString(R.string.temperature_unit)}"
+            } else {
+                "${t.toDouble() / 100}${resources.getString(R.string.temperature_unit)}"
+            }
+            dataMap["temperature"] = temperatureView.text.toString().replace("°C", "")
+
+            dataLinkedList.add(dataMap)
+        }
+        true
+    }
+
+    override fun initEvent() {
+
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        dataTimer.cancel()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
new file mode 100644
index 0000000..9570167
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_10"
+        android:topRightRadius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
new file mode 100644
index 0000000..b35e98c
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="@dimen/dp_10"/>
+
+    <stroke
+        android:width="@dimen/dp_10"
+        android:color="@color/mainBackColor" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_shidu.xml b/app/src/main/res/drawable/ic_shidu.xml
new file mode 100644
index 0000000..1d14648
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shidu.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M662.76,296.76c-54.68,-63.47 -107.74,-109.46 -148.67,-144.95l-1.5,-1.3c-11.97,10.77 -24.84,22.36 -37.42,34.01 -34.88,32.3 -74.98,71.57 -112.94,116.15C284.58,391.9 224,496.05 224,600.85 224,765.08 354.15,896 512,896s288,-130.92 288,-295.15c0,-110.84 -60.59,-215.12 -137.24,-304.09zM512.04,64.04c8.7,8.55 21.87,20 38.08,34.09C649.66,184.62 864,370.89 864,600.85 864,799.2 706.4,960 512,960S160,799.2 160,600.85c0,-219.68 214.57,-412.4 313.64,-501.38 16.48,-14.8 29.76,-26.73 38.33,-35.43L512,64l0.04,0.04z" />
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M500.4,544.39h-0.1c19.35,-47.63 66.08,-81.21 120.66,-81.21 54.28,0 100.8,33.22 120.34,80.44h0.17A243.66,243.66 0,0 1,746 590.54c0,131.6 -104.76,238.28 -234,238.28s-234,-106.68 -234,-238.28a244,244 0,0 1,3.64 -42.1c17.55,43.49 59.56,74.12 108.61,74.12 50.54,0 93.63,-32.53 110.15,-78.16z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_wendu.xml b/app/src/main/res/drawable/ic_wendu.xml
new file mode 100644
index 0000000..41e033d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wendu.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M324,596.69l-17.74,16.6C273.41,644.02 253,687.58 253,736c0,92.78 75.22,168 168,168s168,-75.22 168,-168c0,-49.51 -21.35,-93.96 -55.51,-124.79L515,594.54L515,215.5c0,-52.74 -42.76,-95.5 -95.5,-95.5S324,162.76 324,215.5v381.19zM268,215.5C268,131.83 335.83,64 419.5,64S571,131.83 571,215.5v354.14c45.44,41 74,100.35 74,166.36 0,123.71 -100.29,224 -224,224S197,859.71 197,736c0,-64.55 27.31,-122.73 71,-163.61L268,215.5zM419,384c-17.67,0 -32,14.33 -32,32v210.38c-42.41,14.04 -73,54.01 -73,101.12 0,58.82 47.68,106.5 106.5,106.5S527,786.32 527,727.5c0,-48.22 -32.04,-88.95 -76,-102.07L451,416c0,-17.67 -14.33,-32 -32,-32zM771,224c0,-22.09 -17.91,-40 -40,-40s-40,17.91 -40,40 17.91,40 40,40 40,-17.91 40,-40zM827,224c0,53.02 -42.98,96 -96,96s-96,-42.98 -96,-96 42.98,-96 96,-96 96,42.98 96,96z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_t_h_senser.xml b/app/src/main/res/layout/activity_t_h_senser.xml
new file mode 100644
index 0000000..8f94160
--- /dev/null
+++ b/app/src/main/res/layout/activity_t_h_senser.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/common_bkg"
+    android:orientation="vertical">
+
+    <include layout="@layout/include_device_title" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_100"
+            android:layout_marginHorizontal="@dimen/dp_50"
+            android:layout_marginVertical="@dimen/dp_20"
+            android:background="@drawable/bg_stroke_layout_gray_rectangle_10"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:padding="@dimen/dp_5">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_wendu" />
+
+                <TextView
+                    android:id="@+id/temperatureView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:text="@string/temperature_unit"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/sp_20" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="@dimen/dp_3"
+                android:layout_height="match_parent"
+                android:background="@color/mainBackColor" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_shidu" />
+
+                <TextView
+                    android:id="@+id/humidityView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:text="%"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/sp_20" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/deviceStateView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/app_name" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="@dimen/dp_20"
+            android:gravity="center_vertical">
+
+            <ImageView
+                android:id="@+id/batteryView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_10" />
+
+            <TextView
+                android:id="@+id/batteryValueView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:background="@drawable/bg_solid_layout_white_top_radius_10"
+            android:orientation="vertical">
+
+            <com.google.android.material.tabs.TabLayout
+                android:id="@+id/tabLayout"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_40"
+                android:layout_marginHorizontal="@dimen/dp_40"
+                android:layout_marginVertical="10dp"
+                app:tabIndicatorColor="@color/orangeTextColor"
+                app:tabIndicatorFullWidth="false"
+                app:tabIndicatorHeight="3dp"
+                app:tabSelectedTextColor="@color/mainTextColor"
+                app:tabTextColor="@color/subTextColor" />
+
+            <androidx.viewpager.widget.ViewPager
+                android:id="@+id/viewPager"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_cooker_service.xml b/app/src/main/res/layout/fragment_device_cooker_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_cooker_service.xml
+++ b/app/src/main/res/layout/fragment_device_cooker_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_fireplace_service.xml b/app/src/main/res/layout/fragment_device_fireplace_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_fireplace_service.xml
+++ b/app/src/main/res/layout/fragment_device_fireplace_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_rangehood_service.xml b/app/src/main/res/layout/fragment_device_rangehood_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_rangehood_service.xml
+++ b/app/src/main/res/layout/fragment_device_rangehood_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_waterheater_service.xml b/app/src/main/res/layout/fragment_device_waterheater_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_waterheater_service.xml
+++ b/app/src/main/res/layout/fragment_device_waterheater_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_favorite.xml b/app/src/main/res/layout/fragment_favorite.xml
index 8797b7a..71c0138 100644
--- a/app/src/main/res/layout/fragment_favorite.xml
+++ b/app/src/main/res/layout/fragment_favorite.xml
@@ -14,7 +14,7 @@
         <com.youth.banner.Banner
             android:id="@+id/shopBannerView"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_200"
+            android:layout_height="@dimen/dp_220"
             app:banner_indicator_gravity="left"
             app:banner_indicator_height="@dimen/dp_3"
             app:banner_indicator_margin="@dimen/dp_7"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index cf0fccb..e063769 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -81,7 +81,7 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_200"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_20"
                 android:background="@color/white"
                 android:orientation="vertical">
@@ -113,7 +113,16 @@
 
                 <include layout="@layout/include_horizontal_no_margin_line" />
 
-
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recommendRecyclerView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/dp_5"
+                    android:nestedScrollingEnabled="true"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:scrollbars="none"
+                    app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+                    app:spanCount="2" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_humidity.xml b/app/src/main/res/layout/fragment_humidity.xml
new file mode 100644
index 0000000..77d9ef6
--- /dev/null
+++ b/app/src/main/res/layout/fragment_humidity.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_temperature.xml b/app/src/main/res/layout/fragment_temperature.xml
new file mode 100644
index 0000000..77d9ef6
--- /dev/null
+++ b/app/src/main/res/layout/fragment_temperature.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6abc67b..1eb9752 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,7 @@
         <activity android:name=".view.device.SmartGatewayActivity" />
         <activity android:name=".view.ScanZigbeeActivity" />
         <activity android:name=".view.device.MotionSensorActivity" />
+        <activity android:name=".view.device.TAndHSensorActivity" />
 
         <!--适配华为（huawei）刘海屏-->
         <meta-data
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 58f9e46..74c77ba 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -163,6 +163,10 @@
                                     //人体传感器
                                     requireContext().navigatePageTo<MotionSensorActivity>()
                                 }
+                                selectedCategory.contains("wsdcg") -> {
+                                    //温湿度传感器
+                                    requireContext().navigatePageTo<TAndHSensorActivity>()
+                                }
                             }
                         } else {
                             requireContext().navigatePageTo<LoginActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
new file mode 100644
index 0000000..2267755
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class HumidityPageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_humidity
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
new file mode 100644
index 0000000..2d8a2df
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class TemperaturePageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_temperature
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
index d042a7f..aeb638b 100644
--- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
@@ -34,8 +34,32 @@
     val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们")
     val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴")
     val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置")
+    val T_H_PAGE_TITLE = arrayOf("温度记录", "湿度记录")
     val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu)
     val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话")
+
+    //TODO 模拟数据
+    val TEST_IMAGE = intArrayOf(
+        R.mipmap.t_1,
+        R.mipmap.t_2,
+        R.mipmap.t_3,
+        R.mipmap.t_4,
+        R.mipmap.t_5,
+        R.mipmap.t_6,
+        R.mipmap.t_7,
+        R.mipmap.t_8
+    )
+    val TEST_ARRAY = arrayOf(
+        "24LS01壁挂炉",
+        "多功能智能热水器",
+        "24LC01壁挂炉",
+        "16RC01热水器",
+        "TXC01油烟机",
+        "QZE03燃气灶",
+        "多功能智能油烟机",
+        "多功能智能燃气灶"
+    )
+
     //预置颜色
     val COLORS = arrayOf(
         R.color.color_1, R.color.color_2, R.color.color_3,
diff --git a/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
new file mode 100644
index 0000000..7c8dfe7
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
@@ -0,0 +1,135 @@
+package com.casic.br.view.device
+
+import android.os.Handler
+import android.util.Log
+import android.view.View
+import androidx.fragment.app.Fragment
+import com.casic.br.R
+import com.casic.br.adapter.TabPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.casic.br.extensions.selectCategory
+import com.casic.br.extensions.toBatteryImage
+import com.casic.br.fragment.th.HumidityPageFragment
+import com.casic.br.fragment.th.TemperaturePageFragment
+import com.casic.br.utils.DeserializeModel
+import com.casic.br.utils.LocaleConstant
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.tuya.smart.home.sdk.TuyaHomeSdk
+import com.tuya.smart.home.sdk.bean.HomeBean
+import com.tuya.smart.home.sdk.callback.ITuyaHomeResultCallback
+import com.tuya.smart.sdk.bean.DeviceBean
+import kotlinx.android.synthetic.main.activity_t_h_senser.*
+import kotlinx.android.synthetic.main.include_device_title.*
+import java.util.*
+import kotlin.collections.HashMap
+
+/**
+ * 温湿度传感器
+ * TODO 数据上报暂缓
+ * */
+class TAndHSensorActivity : KotlinBaseActivity() {
+
+    private val context = this@TAndHSensorActivity
+    private val dataTimer by lazy { Timer() }//数据上传Timer
+    private val dataLinkedList = LinkedList<HashMap<String, Any>>()
+    private lateinit var weakReference: WeakReferenceHandler
+    private var fragmentPages: ArrayList<Fragment> = ArrayList()
+
+    override fun initLayoutView(): Int = R.layout.activity_t_h_senser
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        initLayoutImmersionBar(rootView)
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+
+        leftBackView.setOnClickListener { finish() }
+        rightOperateView.visibility = View.GONE
+    }
+
+    override fun initData() {
+        weakReference = WeakReferenceHandler(callback)
+        //每隔5s传一次数据到服务器
+        dataTimer.schedule(object : TimerTask() {
+            override fun run() {
+                TuyaHomeSdk.newHomeInstance(DeserializeModel.getHomeId())
+                    .getHomeDetail(object : ITuyaHomeResultCallback {
+                        override fun onSuccess(bean: HomeBean) {
+                            bean.deviceList.forEach {
+                                val selectedCategory = it.selectCategory()
+                                if (selectedCategory.contains("wsdcg")) {
+                                    //温湿度传感器
+                                    val msg = weakReference.obtainMessage()
+                                    msg.what = 2022112001
+                                    msg.obj = it
+                                    weakReference.sendMessage(msg)
+                                }
+                            }
+                        }
+
+                        override fun onError(errorCode: String, errorMsg: String) {
+                            Log.d("Casic", "TAndHSensorActivity => onError: $errorMsg")
+                        }
+                    })
+            }
+        }, 0, 5000)
+
+        fragmentPages.add(TemperaturePageFragment())
+        fragmentPages.add(HumidityPageFragment())
+        viewPager.adapter =
+            TabPagerAdapter(fragmentPages, LocaleConstant.T_H_PAGE_TITLE, supportFragmentManager)
+        tabLayout.setupWithViewPager(viewPager)
+    }
+
+    private val callback = Handler.Callback { message ->
+        if (message.what == 2022112001) {
+            val it = message.obj as DeviceBean
+            deviceStateView.text = if (it.isOnline) {
+                "设备在线"
+            } else {
+                "设备已离线"
+            }
+            titleView.text = String.format(it.name + "传感器")
+
+            val dataMap = HashMap<String, Any>()
+
+            val h = it.dps["101"].toString()
+            //温湿度的值需要缩小100倍
+            humidityView.text = if (h.isBlank()) {
+                "0%"
+            } else {
+                "${h.toDouble() / 100}%"
+            }
+            dataMap["humidity"] = humidityView.text.toString().replace("%", "")
+
+            val b = it.dps["102"].toString()
+            batteryView.setBackgroundResource(b.toBatteryImage())
+            batteryValueView.text = "${b}%"
+
+            val t = it.dps["103"].toString()
+            //{"unit":"℃","min":-2000,"max":10000,"scale":2,"step":1,"type":"value"}
+            temperatureView.text = if (h.isBlank()) {
+                "0${resources.getString(R.string.temperature_unit)}"
+            } else {
+                "${t.toDouble() / 100}${resources.getString(R.string.temperature_unit)}"
+            }
+            dataMap["temperature"] = temperatureView.text.toString().replace("°C", "")
+
+            dataLinkedList.add(dataMap)
+        }
+        true
+    }
+
+    override fun initEvent() {
+
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        dataTimer.cancel()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
new file mode 100644
index 0000000..9570167
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_10"
+        android:topRightRadius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
new file mode 100644
index 0000000..b35e98c
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="@dimen/dp_10"/>
+
+    <stroke
+        android:width="@dimen/dp_10"
+        android:color="@color/mainBackColor" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_shidu.xml b/app/src/main/res/drawable/ic_shidu.xml
new file mode 100644
index 0000000..1d14648
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shidu.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M662.76,296.76c-54.68,-63.47 -107.74,-109.46 -148.67,-144.95l-1.5,-1.3c-11.97,10.77 -24.84,22.36 -37.42,34.01 -34.88,32.3 -74.98,71.57 -112.94,116.15C284.58,391.9 224,496.05 224,600.85 224,765.08 354.15,896 512,896s288,-130.92 288,-295.15c0,-110.84 -60.59,-215.12 -137.24,-304.09zM512.04,64.04c8.7,8.55 21.87,20 38.08,34.09C649.66,184.62 864,370.89 864,600.85 864,799.2 706.4,960 512,960S160,799.2 160,600.85c0,-219.68 214.57,-412.4 313.64,-501.38 16.48,-14.8 29.76,-26.73 38.33,-35.43L512,64l0.04,0.04z" />
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M500.4,544.39h-0.1c19.35,-47.63 66.08,-81.21 120.66,-81.21 54.28,0 100.8,33.22 120.34,80.44h0.17A243.66,243.66 0,0 1,746 590.54c0,131.6 -104.76,238.28 -234,238.28s-234,-106.68 -234,-238.28a244,244 0,0 1,3.64 -42.1c17.55,43.49 59.56,74.12 108.61,74.12 50.54,0 93.63,-32.53 110.15,-78.16z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_wendu.xml b/app/src/main/res/drawable/ic_wendu.xml
new file mode 100644
index 0000000..41e033d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wendu.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M324,596.69l-17.74,16.6C273.41,644.02 253,687.58 253,736c0,92.78 75.22,168 168,168s168,-75.22 168,-168c0,-49.51 -21.35,-93.96 -55.51,-124.79L515,594.54L515,215.5c0,-52.74 -42.76,-95.5 -95.5,-95.5S324,162.76 324,215.5v381.19zM268,215.5C268,131.83 335.83,64 419.5,64S571,131.83 571,215.5v354.14c45.44,41 74,100.35 74,166.36 0,123.71 -100.29,224 -224,224S197,859.71 197,736c0,-64.55 27.31,-122.73 71,-163.61L268,215.5zM419,384c-17.67,0 -32,14.33 -32,32v210.38c-42.41,14.04 -73,54.01 -73,101.12 0,58.82 47.68,106.5 106.5,106.5S527,786.32 527,727.5c0,-48.22 -32.04,-88.95 -76,-102.07L451,416c0,-17.67 -14.33,-32 -32,-32zM771,224c0,-22.09 -17.91,-40 -40,-40s-40,17.91 -40,40 17.91,40 40,40 40,-17.91 40,-40zM827,224c0,53.02 -42.98,96 -96,96s-96,-42.98 -96,-96 42.98,-96 96,-96 96,42.98 96,96z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_t_h_senser.xml b/app/src/main/res/layout/activity_t_h_senser.xml
new file mode 100644
index 0000000..8f94160
--- /dev/null
+++ b/app/src/main/res/layout/activity_t_h_senser.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/common_bkg"
+    android:orientation="vertical">
+
+    <include layout="@layout/include_device_title" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_100"
+            android:layout_marginHorizontal="@dimen/dp_50"
+            android:layout_marginVertical="@dimen/dp_20"
+            android:background="@drawable/bg_stroke_layout_gray_rectangle_10"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:padding="@dimen/dp_5">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_wendu" />
+
+                <TextView
+                    android:id="@+id/temperatureView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:text="@string/temperature_unit"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/sp_20" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="@dimen/dp_3"
+                android:layout_height="match_parent"
+                android:background="@color/mainBackColor" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_shidu" />
+
+                <TextView
+                    android:id="@+id/humidityView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:text="%"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/sp_20" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/deviceStateView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/app_name" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="@dimen/dp_20"
+            android:gravity="center_vertical">
+
+            <ImageView
+                android:id="@+id/batteryView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_10" />
+
+            <TextView
+                android:id="@+id/batteryValueView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:background="@drawable/bg_solid_layout_white_top_radius_10"
+            android:orientation="vertical">
+
+            <com.google.android.material.tabs.TabLayout
+                android:id="@+id/tabLayout"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_40"
+                android:layout_marginHorizontal="@dimen/dp_40"
+                android:layout_marginVertical="10dp"
+                app:tabIndicatorColor="@color/orangeTextColor"
+                app:tabIndicatorFullWidth="false"
+                app:tabIndicatorHeight="3dp"
+                app:tabSelectedTextColor="@color/mainTextColor"
+                app:tabTextColor="@color/subTextColor" />
+
+            <androidx.viewpager.widget.ViewPager
+                android:id="@+id/viewPager"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_cooker_service.xml b/app/src/main/res/layout/fragment_device_cooker_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_cooker_service.xml
+++ b/app/src/main/res/layout/fragment_device_cooker_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_fireplace_service.xml b/app/src/main/res/layout/fragment_device_fireplace_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_fireplace_service.xml
+++ b/app/src/main/res/layout/fragment_device_fireplace_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_rangehood_service.xml b/app/src/main/res/layout/fragment_device_rangehood_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_rangehood_service.xml
+++ b/app/src/main/res/layout/fragment_device_rangehood_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_waterheater_service.xml b/app/src/main/res/layout/fragment_device_waterheater_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_waterheater_service.xml
+++ b/app/src/main/res/layout/fragment_device_waterheater_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_favorite.xml b/app/src/main/res/layout/fragment_favorite.xml
index 8797b7a..71c0138 100644
--- a/app/src/main/res/layout/fragment_favorite.xml
+++ b/app/src/main/res/layout/fragment_favorite.xml
@@ -14,7 +14,7 @@
         <com.youth.banner.Banner
             android:id="@+id/shopBannerView"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_200"
+            android:layout_height="@dimen/dp_220"
             app:banner_indicator_gravity="left"
             app:banner_indicator_height="@dimen/dp_3"
             app:banner_indicator_margin="@dimen/dp_7"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index cf0fccb..e063769 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -81,7 +81,7 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_200"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_20"
                 android:background="@color/white"
                 android:orientation="vertical">
@@ -113,7 +113,16 @@
 
                 <include layout="@layout/include_horizontal_no_margin_line" />
 
-
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recommendRecyclerView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/dp_5"
+                    android:nestedScrollingEnabled="true"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:scrollbars="none"
+                    app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+                    app:spanCount="2" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_humidity.xml b/app/src/main/res/layout/fragment_humidity.xml
new file mode 100644
index 0000000..77d9ef6
--- /dev/null
+++ b/app/src/main/res/layout/fragment_humidity.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_temperature.xml b/app/src/main/res/layout/fragment_temperature.xml
new file mode 100644
index 0000000..77d9ef6
--- /dev/null
+++ b/app/src/main/res/layout/fragment_temperature.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_home_rv_g.xml b/app/src/main/res/layout/item_home_rv_g.xml
index 157b0b5..b9c4a77 100644
--- a/app/src/main/res/layout/item_home_rv_g.xml
+++ b/app/src/main/res/layout/item_home_rv_g.xml
@@ -5,7 +5,7 @@
     android:layout_gravity="center"
     android:gravity="center"
     android:orientation="vertical"
-    android:padding="@dimen/dp_30">
+    android:padding="@dimen/dp_20">
 
     <TextView
         android:id="@+id/homeFunctionView"

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6abc67b..1eb9752 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,7 @@
         <activity android:name=".view.device.SmartGatewayActivity" />
         <activity android:name=".view.ScanZigbeeActivity" />
         <activity android:name=".view.device.MotionSensorActivity" />
+        <activity android:name=".view.device.TAndHSensorActivity" />
 
         <!--适配华为（huawei）刘海屏-->
         <meta-data
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 58f9e46..74c77ba 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -163,6 +163,10 @@
                                     //人体传感器
                                     requireContext().navigatePageTo<MotionSensorActivity>()
                                 }
+                                selectedCategory.contains("wsdcg") -> {
+                                    //温湿度传感器
+                                    requireContext().navigatePageTo<TAndHSensorActivity>()
+                                }
                             }
                         } else {
                             requireContext().navigatePageTo<LoginActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
new file mode 100644
index 0000000..2267755
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class HumidityPageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_humidity
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
new file mode 100644
index 0000000..2d8a2df
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class TemperaturePageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_temperature
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
index d042a7f..aeb638b 100644
--- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
@@ -34,8 +34,32 @@
     val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们")
     val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴")
     val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置")
+    val T_H_PAGE_TITLE = arrayOf("温度记录", "湿度记录")
     val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu)
     val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话")
+
+    //TODO 模拟数据
+    val TEST_IMAGE = intArrayOf(
+        R.mipmap.t_1,
+        R.mipmap.t_2,
+        R.mipmap.t_3,
+        R.mipmap.t_4,
+        R.mipmap.t_5,
+        R.mipmap.t_6,
+        R.mipmap.t_7,
+        R.mipmap.t_8
+    )
+    val TEST_ARRAY = arrayOf(
+        "24LS01壁挂炉",
+        "多功能智能热水器",
+        "24LC01壁挂炉",
+        "16RC01热水器",
+        "TXC01油烟机",
+        "QZE03燃气灶",
+        "多功能智能油烟机",
+        "多功能智能燃气灶"
+    )
+
     //预置颜色
     val COLORS = arrayOf(
         R.color.color_1, R.color.color_2, R.color.color_3,
diff --git a/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
new file mode 100644
index 0000000..7c8dfe7
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
@@ -0,0 +1,135 @@
+package com.casic.br.view.device
+
+import android.os.Handler
+import android.util.Log
+import android.view.View
+import androidx.fragment.app.Fragment
+import com.casic.br.R
+import com.casic.br.adapter.TabPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.casic.br.extensions.selectCategory
+import com.casic.br.extensions.toBatteryImage
+import com.casic.br.fragment.th.HumidityPageFragment
+import com.casic.br.fragment.th.TemperaturePageFragment
+import com.casic.br.utils.DeserializeModel
+import com.casic.br.utils.LocaleConstant
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.tuya.smart.home.sdk.TuyaHomeSdk
+import com.tuya.smart.home.sdk.bean.HomeBean
+import com.tuya.smart.home.sdk.callback.ITuyaHomeResultCallback
+import com.tuya.smart.sdk.bean.DeviceBean
+import kotlinx.android.synthetic.main.activity_t_h_senser.*
+import kotlinx.android.synthetic.main.include_device_title.*
+import java.util.*
+import kotlin.collections.HashMap
+
+/**
+ * 温湿度传感器
+ * TODO 数据上报暂缓
+ * */
+class TAndHSensorActivity : KotlinBaseActivity() {
+
+    private val context = this@TAndHSensorActivity
+    private val dataTimer by lazy { Timer() }//数据上传Timer
+    private val dataLinkedList = LinkedList<HashMap<String, Any>>()
+    private lateinit var weakReference: WeakReferenceHandler
+    private var fragmentPages: ArrayList<Fragment> = ArrayList()
+
+    override fun initLayoutView(): Int = R.layout.activity_t_h_senser
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        initLayoutImmersionBar(rootView)
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+
+        leftBackView.setOnClickListener { finish() }
+        rightOperateView.visibility = View.GONE
+    }
+
+    override fun initData() {
+        weakReference = WeakReferenceHandler(callback)
+        //每隔5s传一次数据到服务器
+        dataTimer.schedule(object : TimerTask() {
+            override fun run() {
+                TuyaHomeSdk.newHomeInstance(DeserializeModel.getHomeId())
+                    .getHomeDetail(object : ITuyaHomeResultCallback {
+                        override fun onSuccess(bean: HomeBean) {
+                            bean.deviceList.forEach {
+                                val selectedCategory = it.selectCategory()
+                                if (selectedCategory.contains("wsdcg")) {
+                                    //温湿度传感器
+                                    val msg = weakReference.obtainMessage()
+                                    msg.what = 2022112001
+                                    msg.obj = it
+                                    weakReference.sendMessage(msg)
+                                }
+                            }
+                        }
+
+                        override fun onError(errorCode: String, errorMsg: String) {
+                            Log.d("Casic", "TAndHSensorActivity => onError: $errorMsg")
+                        }
+                    })
+            }
+        }, 0, 5000)
+
+        fragmentPages.add(TemperaturePageFragment())
+        fragmentPages.add(HumidityPageFragment())
+        viewPager.adapter =
+            TabPagerAdapter(fragmentPages, LocaleConstant.T_H_PAGE_TITLE, supportFragmentManager)
+        tabLayout.setupWithViewPager(viewPager)
+    }
+
+    private val callback = Handler.Callback { message ->
+        if (message.what == 2022112001) {
+            val it = message.obj as DeviceBean
+            deviceStateView.text = if (it.isOnline) {
+                "设备在线"
+            } else {
+                "设备已离线"
+            }
+            titleView.text = String.format(it.name + "传感器")
+
+            val dataMap = HashMap<String, Any>()
+
+            val h = it.dps["101"].toString()
+            //温湿度的值需要缩小100倍
+            humidityView.text = if (h.isBlank()) {
+                "0%"
+            } else {
+                "${h.toDouble() / 100}%"
+            }
+            dataMap["humidity"] = humidityView.text.toString().replace("%", "")
+
+            val b = it.dps["102"].toString()
+            batteryView.setBackgroundResource(b.toBatteryImage())
+            batteryValueView.text = "${b}%"
+
+            val t = it.dps["103"].toString()
+            //{"unit":"℃","min":-2000,"max":10000,"scale":2,"step":1,"type":"value"}
+            temperatureView.text = if (h.isBlank()) {
+                "0${resources.getString(R.string.temperature_unit)}"
+            } else {
+                "${t.toDouble() / 100}${resources.getString(R.string.temperature_unit)}"
+            }
+            dataMap["temperature"] = temperatureView.text.toString().replace("°C", "")
+
+            dataLinkedList.add(dataMap)
+        }
+        true
+    }
+
+    override fun initEvent() {
+
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        dataTimer.cancel()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
new file mode 100644
index 0000000..9570167
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_10"
+        android:topRightRadius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
new file mode 100644
index 0000000..b35e98c
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="@dimen/dp_10"/>
+
+    <stroke
+        android:width="@dimen/dp_10"
+        android:color="@color/mainBackColor" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_shidu.xml b/app/src/main/res/drawable/ic_shidu.xml
new file mode 100644
index 0000000..1d14648
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shidu.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M662.76,296.76c-54.68,-63.47 -107.74,-109.46 -148.67,-144.95l-1.5,-1.3c-11.97,10.77 -24.84,22.36 -37.42,34.01 -34.88,32.3 -74.98,71.57 -112.94,116.15C284.58,391.9 224,496.05 224,600.85 224,765.08 354.15,896 512,896s288,-130.92 288,-295.15c0,-110.84 -60.59,-215.12 -137.24,-304.09zM512.04,64.04c8.7,8.55 21.87,20 38.08,34.09C649.66,184.62 864,370.89 864,600.85 864,799.2 706.4,960 512,960S160,799.2 160,600.85c0,-219.68 214.57,-412.4 313.64,-501.38 16.48,-14.8 29.76,-26.73 38.33,-35.43L512,64l0.04,0.04z" />
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M500.4,544.39h-0.1c19.35,-47.63 66.08,-81.21 120.66,-81.21 54.28,0 100.8,33.22 120.34,80.44h0.17A243.66,243.66 0,0 1,746 590.54c0,131.6 -104.76,238.28 -234,238.28s-234,-106.68 -234,-238.28a244,244 0,0 1,3.64 -42.1c17.55,43.49 59.56,74.12 108.61,74.12 50.54,0 93.63,-32.53 110.15,-78.16z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_wendu.xml b/app/src/main/res/drawable/ic_wendu.xml
new file mode 100644
index 0000000..41e033d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wendu.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M324,596.69l-17.74,16.6C273.41,644.02 253,687.58 253,736c0,92.78 75.22,168 168,168s168,-75.22 168,-168c0,-49.51 -21.35,-93.96 -55.51,-124.79L515,594.54L515,215.5c0,-52.74 -42.76,-95.5 -95.5,-95.5S324,162.76 324,215.5v381.19zM268,215.5C268,131.83 335.83,64 419.5,64S571,131.83 571,215.5v354.14c45.44,41 74,100.35 74,166.36 0,123.71 -100.29,224 -224,224S197,859.71 197,736c0,-64.55 27.31,-122.73 71,-163.61L268,215.5zM419,384c-17.67,0 -32,14.33 -32,32v210.38c-42.41,14.04 -73,54.01 -73,101.12 0,58.82 47.68,106.5 106.5,106.5S527,786.32 527,727.5c0,-48.22 -32.04,-88.95 -76,-102.07L451,416c0,-17.67 -14.33,-32 -32,-32zM771,224c0,-22.09 -17.91,-40 -40,-40s-40,17.91 -40,40 17.91,40 40,40 40,-17.91 40,-40zM827,224c0,53.02 -42.98,96 -96,96s-96,-42.98 -96,-96 42.98,-96 96,-96 96,42.98 96,96z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_t_h_senser.xml b/app/src/main/res/layout/activity_t_h_senser.xml
new file mode 100644
index 0000000..8f94160
--- /dev/null
+++ b/app/src/main/res/layout/activity_t_h_senser.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/common_bkg"
+    android:orientation="vertical">
+
+    <include layout="@layout/include_device_title" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_100"
+            android:layout_marginHorizontal="@dimen/dp_50"
+            android:layout_marginVertical="@dimen/dp_20"
+            android:background="@drawable/bg_stroke_layout_gray_rectangle_10"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:padding="@dimen/dp_5">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_wendu" />
+
+                <TextView
+                    android:id="@+id/temperatureView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:text="@string/temperature_unit"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/sp_20" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="@dimen/dp_3"
+                android:layout_height="match_parent"
+                android:background="@color/mainBackColor" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_shidu" />
+
+                <TextView
+                    android:id="@+id/humidityView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:text="%"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/sp_20" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/deviceStateView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/app_name" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="@dimen/dp_20"
+            android:gravity="center_vertical">
+
+            <ImageView
+                android:id="@+id/batteryView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_10" />
+
+            <TextView
+                android:id="@+id/batteryValueView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:background="@drawable/bg_solid_layout_white_top_radius_10"
+            android:orientation="vertical">
+
+            <com.google.android.material.tabs.TabLayout
+                android:id="@+id/tabLayout"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_40"
+                android:layout_marginHorizontal="@dimen/dp_40"
+                android:layout_marginVertical="10dp"
+                app:tabIndicatorColor="@color/orangeTextColor"
+                app:tabIndicatorFullWidth="false"
+                app:tabIndicatorHeight="3dp"
+                app:tabSelectedTextColor="@color/mainTextColor"
+                app:tabTextColor="@color/subTextColor" />
+
+            <androidx.viewpager.widget.ViewPager
+                android:id="@+id/viewPager"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_cooker_service.xml b/app/src/main/res/layout/fragment_device_cooker_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_cooker_service.xml
+++ b/app/src/main/res/layout/fragment_device_cooker_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_fireplace_service.xml b/app/src/main/res/layout/fragment_device_fireplace_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_fireplace_service.xml
+++ b/app/src/main/res/layout/fragment_device_fireplace_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_rangehood_service.xml b/app/src/main/res/layout/fragment_device_rangehood_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_rangehood_service.xml
+++ b/app/src/main/res/layout/fragment_device_rangehood_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_waterheater_service.xml b/app/src/main/res/layout/fragment_device_waterheater_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_waterheater_service.xml
+++ b/app/src/main/res/layout/fragment_device_waterheater_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_favorite.xml b/app/src/main/res/layout/fragment_favorite.xml
index 8797b7a..71c0138 100644
--- a/app/src/main/res/layout/fragment_favorite.xml
+++ b/app/src/main/res/layout/fragment_favorite.xml
@@ -14,7 +14,7 @@
         <com.youth.banner.Banner
             android:id="@+id/shopBannerView"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_200"
+            android:layout_height="@dimen/dp_220"
             app:banner_indicator_gravity="left"
             app:banner_indicator_height="@dimen/dp_3"
             app:banner_indicator_margin="@dimen/dp_7"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index cf0fccb..e063769 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -81,7 +81,7 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_200"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_20"
                 android:background="@color/white"
                 android:orientation="vertical">
@@ -113,7 +113,16 @@
 
                 <include layout="@layout/include_horizontal_no_margin_line" />
 
-
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recommendRecyclerView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/dp_5"
+                    android:nestedScrollingEnabled="true"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:scrollbars="none"
+                    app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+                    app:spanCount="2" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_humidity.xml b/app/src/main/res/layout/fragment_humidity.xml
new file mode 100644
index 0000000..77d9ef6
--- /dev/null
+++ b/app/src/main/res/layout/fragment_humidity.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_temperature.xml b/app/src/main/res/layout/fragment_temperature.xml
new file mode 100644
index 0000000..77d9ef6
--- /dev/null
+++ b/app/src/main/res/layout/fragment_temperature.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_home_rv_g.xml b/app/src/main/res/layout/item_home_rv_g.xml
index 157b0b5..b9c4a77 100644
--- a/app/src/main/res/layout/item_home_rv_g.xml
+++ b/app/src/main/res/layout/item_home_rv_g.xml
@@ -5,7 +5,7 @@
     android:layout_gravity="center"
     android:gravity="center"
     android:orientation="vertical"
-    android:padding="@dimen/dp_30">
+    android:padding="@dimen/dp_20">
 
     <TextView
         android:id="@+id/homeFunctionView"
diff --git a/app/src/main/res/layout/item_recommend_rv_l.xml b/app/src/main/res/layout/item_recommend_rv_l.xml
index 3047be5..42e0020 100644
--- a/app/src/main/res/layout/item_recommend_rv_l.xml
+++ b/app/src/main/res/layout/item_recommend_rv_l.xml
@@ -9,6 +9,6 @@
     <ImageView
         android:id="@+id/recommendImageView"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_125"
-        android:scaleType="centerCrop" />
+        android:layout_height="wrap_content"
+        />
 </androidx.cardview.widget.CardView>
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6abc67b..1eb9752 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,7 @@
         <activity android:name=".view.device.SmartGatewayActivity" />
         <activity android:name=".view.ScanZigbeeActivity" />
         <activity android:name=".view.device.MotionSensorActivity" />
+        <activity android:name=".view.device.TAndHSensorActivity" />
 
         <!--适配华为（huawei）刘海屏-->
         <meta-data
diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 58f9e46..74c77ba 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -163,6 +163,10 @@
                                     //人体传感器
                                     requireContext().navigatePageTo<MotionSensorActivity>()
                                 }
+                                selectedCategory.contains("wsdcg") -> {
+                                    //温湿度传感器
+                                    requireContext().navigatePageTo<TAndHSensorActivity>()
+                                }
                             }
                         } else {
                             requireContext().navigatePageTo<LoginActivity>()
diff --git a/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
new file mode 100644
index 0000000..2267755
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/HumidityPageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class HumidityPageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_humidity
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
new file mode 100644
index 0000000..2d8a2df
--- /dev/null
+++ b/app/src/main/java/com/casic/br/fragment/th/TemperaturePageFragment.kt
@@ -0,0 +1,25 @@
+package com.casic.br.fragment.th
+
+import com.casic.br.R
+import com.pengxh.kt.lite.base.KotlinBaseFragment
+
+class TemperaturePageFragment : KotlinBaseFragment() {
+
+    override fun initLayoutView(): Int = R.layout.fragment_temperature
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+    override fun initEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
index d042a7f..aeb638b 100644
--- a/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/br/utils/LocaleConstant.kt
@@ -34,8 +34,32 @@
     val SETTINGS_OPERATE = arrayOf("通知设置", "清除缓存", "服务协议", "隐私声明", "关于我们")
     val HOME_FUNC_OPERATE = arrayOf("户号管理", "燃气缴费", "历史账单", "用气分析", "服务网点", "采暖补贴")
     val DEVICE_PAGE_TITLE = arrayOf("设备控制", "状态显示", "服务设置")
+    val T_H_PAGE_TITLE = arrayOf("温度记录", "湿度记录")
     val CONNECT_IMAGE = intArrayOf(R.drawable.ic_kefu, R.drawable.ic_weixiu)
     val CONNECT_ARRAY = arrayOf("客服电话", "抢修电话")
+
+    //TODO 模拟数据
+    val TEST_IMAGE = intArrayOf(
+        R.mipmap.t_1,
+        R.mipmap.t_2,
+        R.mipmap.t_3,
+        R.mipmap.t_4,
+        R.mipmap.t_5,
+        R.mipmap.t_6,
+        R.mipmap.t_7,
+        R.mipmap.t_8
+    )
+    val TEST_ARRAY = arrayOf(
+        "24LS01壁挂炉",
+        "多功能智能热水器",
+        "24LC01壁挂炉",
+        "16RC01热水器",
+        "TXC01油烟机",
+        "QZE03燃气灶",
+        "多功能智能油烟机",
+        "多功能智能燃气灶"
+    )
+
     //预置颜色
     val COLORS = arrayOf(
         R.color.color_1, R.color.color_2, R.color.color_3,
diff --git a/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
new file mode 100644
index 0000000..7c8dfe7
--- /dev/null
+++ b/app/src/main/java/com/casic/br/view/device/TAndHSensorActivity.kt
@@ -0,0 +1,135 @@
+package com.casic.br.view.device
+
+import android.os.Handler
+import android.util.Log
+import android.view.View
+import androidx.fragment.app.Fragment
+import com.casic.br.R
+import com.casic.br.adapter.TabPagerAdapter
+import com.casic.br.extensions.initLayoutImmersionBar
+import com.casic.br.extensions.selectCategory
+import com.casic.br.extensions.toBatteryImage
+import com.casic.br.fragment.th.HumidityPageFragment
+import com.casic.br.fragment.th.TemperaturePageFragment
+import com.casic.br.utils.DeserializeModel
+import com.casic.br.utils.LocaleConstant
+import com.gyf.immersionbar.ImmersionBar
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.tuya.smart.home.sdk.TuyaHomeSdk
+import com.tuya.smart.home.sdk.bean.HomeBean
+import com.tuya.smart.home.sdk.callback.ITuyaHomeResultCallback
+import com.tuya.smart.sdk.bean.DeviceBean
+import kotlinx.android.synthetic.main.activity_t_h_senser.*
+import kotlinx.android.synthetic.main.include_device_title.*
+import java.util.*
+import kotlin.collections.HashMap
+
+/**
+ * 温湿度传感器
+ * TODO 数据上报暂缓
+ * */
+class TAndHSensorActivity : KotlinBaseActivity() {
+
+    private val context = this@TAndHSensorActivity
+    private val dataTimer by lazy { Timer() }//数据上传Timer
+    private val dataLinkedList = LinkedList<HashMap<String, Any>>()
+    private lateinit var weakReference: WeakReferenceHandler
+    private var fragmentPages: ArrayList<Fragment> = ArrayList()
+
+    override fun initLayoutView(): Int = R.layout.activity_t_h_senser
+
+    override fun observeRequestState() {
+
+    }
+
+    override fun setupTopBarLayout() {
+        initLayoutImmersionBar(rootView)
+        ImmersionBar.with(this).statusBarDarkFont(true).init()
+
+        leftBackView.setOnClickListener { finish() }
+        rightOperateView.visibility = View.GONE
+    }
+
+    override fun initData() {
+        weakReference = WeakReferenceHandler(callback)
+        //每隔5s传一次数据到服务器
+        dataTimer.schedule(object : TimerTask() {
+            override fun run() {
+                TuyaHomeSdk.newHomeInstance(DeserializeModel.getHomeId())
+                    .getHomeDetail(object : ITuyaHomeResultCallback {
+                        override fun onSuccess(bean: HomeBean) {
+                            bean.deviceList.forEach {
+                                val selectedCategory = it.selectCategory()
+                                if (selectedCategory.contains("wsdcg")) {
+                                    //温湿度传感器
+                                    val msg = weakReference.obtainMessage()
+                                    msg.what = 2022112001
+                                    msg.obj = it
+                                    weakReference.sendMessage(msg)
+                                }
+                            }
+                        }
+
+                        override fun onError(errorCode: String, errorMsg: String) {
+                            Log.d("Casic", "TAndHSensorActivity => onError: $errorMsg")
+                        }
+                    })
+            }
+        }, 0, 5000)
+
+        fragmentPages.add(TemperaturePageFragment())
+        fragmentPages.add(HumidityPageFragment())
+        viewPager.adapter =
+            TabPagerAdapter(fragmentPages, LocaleConstant.T_H_PAGE_TITLE, supportFragmentManager)
+        tabLayout.setupWithViewPager(viewPager)
+    }
+
+    private val callback = Handler.Callback { message ->
+        if (message.what == 2022112001) {
+            val it = message.obj as DeviceBean
+            deviceStateView.text = if (it.isOnline) {
+                "设备在线"
+            } else {
+                "设备已离线"
+            }
+            titleView.text = String.format(it.name + "传感器")
+
+            val dataMap = HashMap<String, Any>()
+
+            val h = it.dps["101"].toString()
+            //温湿度的值需要缩小100倍
+            humidityView.text = if (h.isBlank()) {
+                "0%"
+            } else {
+                "${h.toDouble() / 100}%"
+            }
+            dataMap["humidity"] = humidityView.text.toString().replace("%", "")
+
+            val b = it.dps["102"].toString()
+            batteryView.setBackgroundResource(b.toBatteryImage())
+            batteryValueView.text = "${b}%"
+
+            val t = it.dps["103"].toString()
+            //{"unit":"℃","min":-2000,"max":10000,"scale":2,"step":1,"type":"value"}
+            temperatureView.text = if (h.isBlank()) {
+                "0${resources.getString(R.string.temperature_unit)}"
+            } else {
+                "${t.toDouble() / 100}${resources.getString(R.string.temperature_unit)}"
+            }
+            dataMap["temperature"] = temperatureView.text.toString().replace("°C", "")
+
+            dataLinkedList.add(dataMap)
+        }
+        true
+    }
+
+    override fun initEvent() {
+
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        dataTimer.cancel()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
new file mode 100644
index 0000000..9570167
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_white_top_radius_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners
+        android:topLeftRadius="@dimen/dp_10"
+        android:topRightRadius="@dimen/dp_10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
new file mode 100644
index 0000000..b35e98c
--- /dev/null
+++ b/app/src/main/res/drawable/bg_stroke_layout_gray_rectangle_10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="@dimen/dp_10"/>
+
+    <stroke
+        android:width="@dimen/dp_10"
+        android:color="@color/mainBackColor" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_shidu.xml b/app/src/main/res/drawable/ic_shidu.xml
new file mode 100644
index 0000000..1d14648
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shidu.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M662.76,296.76c-54.68,-63.47 -107.74,-109.46 -148.67,-144.95l-1.5,-1.3c-11.97,10.77 -24.84,22.36 -37.42,34.01 -34.88,32.3 -74.98,71.57 -112.94,116.15C284.58,391.9 224,496.05 224,600.85 224,765.08 354.15,896 512,896s288,-130.92 288,-295.15c0,-110.84 -60.59,-215.12 -137.24,-304.09zM512.04,64.04c8.7,8.55 21.87,20 38.08,34.09C649.66,184.62 864,370.89 864,600.85 864,799.2 706.4,960 512,960S160,799.2 160,600.85c0,-219.68 214.57,-412.4 313.64,-501.38 16.48,-14.8 29.76,-26.73 38.33,-35.43L512,64l0.04,0.04z" />
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M500.4,544.39h-0.1c19.35,-47.63 66.08,-81.21 120.66,-81.21 54.28,0 100.8,33.22 120.34,80.44h0.17A243.66,243.66 0,0 1,746 590.54c0,131.6 -104.76,238.28 -234,238.28s-234,-106.68 -234,-238.28a244,244 0,0 1,3.64 -42.1c17.55,43.49 59.56,74.12 108.61,74.12 50.54,0 93.63,-32.53 110.15,-78.16z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_wendu.xml b/app/src/main/res/drawable/ic_wendu.xml
new file mode 100644
index 0000000..41e033d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wendu.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60px"
+    android:height="60px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/mainTextColor"
+        android:pathData="M324,596.69l-17.74,16.6C273.41,644.02 253,687.58 253,736c0,92.78 75.22,168 168,168s168,-75.22 168,-168c0,-49.51 -21.35,-93.96 -55.51,-124.79L515,594.54L515,215.5c0,-52.74 -42.76,-95.5 -95.5,-95.5S324,162.76 324,215.5v381.19zM268,215.5C268,131.83 335.83,64 419.5,64S571,131.83 571,215.5v354.14c45.44,41 74,100.35 74,166.36 0,123.71 -100.29,224 -224,224S197,859.71 197,736c0,-64.55 27.31,-122.73 71,-163.61L268,215.5zM419,384c-17.67,0 -32,14.33 -32,32v210.38c-42.41,14.04 -73,54.01 -73,101.12 0,58.82 47.68,106.5 106.5,106.5S527,786.32 527,727.5c0,-48.22 -32.04,-88.95 -76,-102.07L451,416c0,-17.67 -14.33,-32 -32,-32zM771,224c0,-22.09 -17.91,-40 -40,-40s-40,17.91 -40,40 17.91,40 40,40 40,-17.91 40,-40zM827,224c0,53.02 -42.98,96 -96,96s-96,-42.98 -96,-96 42.98,-96 96,-96 96,42.98 96,96z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_t_h_senser.xml b/app/src/main/res/layout/activity_t_h_senser.xml
new file mode 100644
index 0000000..8f94160
--- /dev/null
+++ b/app/src/main/res/layout/activity_t_h_senser.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/common_bkg"
+    android:orientation="vertical">
+
+    <include layout="@layout/include_device_title" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_100"
+            android:layout_marginHorizontal="@dimen/dp_50"
+            android:layout_marginVertical="@dimen/dp_20"
+            android:background="@drawable/bg_stroke_layout_gray_rectangle_10"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:padding="@dimen/dp_5">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_wendu" />
+
+                <TextView
+                    android:id="@+id/temperatureView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:text="@string/temperature_unit"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/sp_20" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="@dimen/dp_3"
+                android:layout_height="match_parent"
+                android:background="@color/mainBackColor" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_shidu" />
+
+                <TextView
+                    android:id="@+id/humidityView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:text="%"
+                    android:textColor="@color/mainTextColor"
+                    android:textSize="@dimen/sp_20" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/deviceStateView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/app_name" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="@dimen/dp_20"
+            android:gravity="center_vertical">
+
+            <ImageView
+                android:id="@+id/batteryView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_10" />
+
+            <TextView
+                android:id="@+id/batteryValueView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:background="@drawable/bg_solid_layout_white_top_radius_10"
+            android:orientation="vertical">
+
+            <com.google.android.material.tabs.TabLayout
+                android:id="@+id/tabLayout"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_40"
+                android:layout_marginHorizontal="@dimen/dp_40"
+                android:layout_marginVertical="10dp"
+                app:tabIndicatorColor="@color/orangeTextColor"
+                app:tabIndicatorFullWidth="false"
+                app:tabIndicatorHeight="3dp"
+                app:tabSelectedTextColor="@color/mainTextColor"
+                app:tabTextColor="@color/subTextColor" />
+
+            <androidx.viewpager.widget.ViewPager
+                android:id="@+id/viewPager"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_cooker_service.xml b/app/src/main/res/layout/fragment_device_cooker_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_cooker_service.xml
+++ b/app/src/main/res/layout/fragment_device_cooker_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_fireplace_service.xml b/app/src/main/res/layout/fragment_device_fireplace_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_fireplace_service.xml
+++ b/app/src/main/res/layout/fragment_device_fireplace_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_rangehood_service.xml b/app/src/main/res/layout/fragment_device_rangehood_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_rangehood_service.xml
+++ b/app/src/main/res/layout/fragment_device_rangehood_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_waterheater_service.xml b/app/src/main/res/layout/fragment_device_waterheater_service.xml
index 77d9ef6..d354104 100644
--- a/app/src/main/res/layout/fragment_device_waterheater_service.xml
+++ b/app/src/main/res/layout/fragment_device_waterheater_service.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@mipmap/service">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_favorite.xml b/app/src/main/res/layout/fragment_favorite.xml
index 8797b7a..71c0138 100644
--- a/app/src/main/res/layout/fragment_favorite.xml
+++ b/app/src/main/res/layout/fragment_favorite.xml
@@ -14,7 +14,7 @@
         <com.youth.banner.Banner
             android:id="@+id/shopBannerView"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_200"
+            android:layout_height="@dimen/dp_220"
             app:banner_indicator_gravity="left"
             app:banner_indicator_height="@dimen/dp_3"
             app:banner_indicator_margin="@dimen/dp_7"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index cf0fccb..e063769 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -81,7 +81,7 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_200"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_20"
                 android:background="@color/white"
                 android:orientation="vertical">
@@ -113,7 +113,16 @@
 
                 <include layout="@layout/include_horizontal_no_margin_line" />
 
-
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recommendRecyclerView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/dp_5"
+                    android:nestedScrollingEnabled="true"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:scrollbars="none"
+                    app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+                    app:spanCount="2" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_humidity.xml b/app/src/main/res/layout/fragment_humidity.xml
new file mode 100644
index 0000000..77d9ef6
--- /dev/null
+++ b/app/src/main/res/layout/fragment_humidity.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_temperature.xml b/app/src/main/res/layout/fragment_temperature.xml
new file mode 100644
index 0000000..77d9ef6
--- /dev/null
+++ b/app/src/main/res/layout/fragment_temperature.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_home_rv_g.xml b/app/src/main/res/layout/item_home_rv_g.xml
index 157b0b5..b9c4a77 100644
--- a/app/src/main/res/layout/item_home_rv_g.xml
+++ b/app/src/main/res/layout/item_home_rv_g.xml
@@ -5,7 +5,7 @@
     android:layout_gravity="center"
     android:gravity="center"
     android:orientation="vertical"
-    android:padding="@dimen/dp_30">
+    android:padding="@dimen/dp_20">
 
     <TextView
         android:id="@+id/homeFunctionView"
diff --git a/app/src/main/res/layout/item_recommend_rv_l.xml b/app/src/main/res/layout/item_recommend_rv_l.xml
index 3047be5..42e0020 100644
--- a/app/src/main/res/layout/item_recommend_rv_l.xml
+++ b/app/src/main/res/layout/item_recommend_rv_l.xml
@@ -9,6 +9,6 @@
     <ImageView
         android:id="@+id/recommendImageView"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_125"
-        android:scaleType="centerCrop" />
+        android:layout_height="wrap_content"
+        />
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-xxxhdpi/service.jpg b/app/src/main/res/mipmap-xxxhdpi/service.jpg
new file mode 100644
index 0000000..187b0d9
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/service.jpg
Binary files differ