diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt
index b59019c..ffa9f8a 100644
--- a/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt
+++ b/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt
@@ -15,12 +15,14 @@
 import com.tuya.smart.sdk.api.ITuyaDevice
 import kotlinx.android.synthetic.main.activity_gas_consume.*
 import kotlinx.android.synthetic.main.include_base_title.*
+import java.util.*
 
 class GasConsumeActivity : KotlinBaseActivity() {
 
     private val kTag = "GasConsumeActivity"
     private lateinit var deviceId: String
     private lateinit var deviceInstance: ITuyaDevice
+    private lateinit var calendar: Calendar
 
     override fun initLayoutView(): Int = R.layout.activity_gas_consume
 
@@ -37,10 +39,17 @@
     }
 
     override fun initData() {
+        calendar = Calendar.getInstance()
         //默认选中
         dateRadioGroup.check(R.id.dayRadioButton)
         setLineChartData()
 
+        setDate(
+            calendar.get(Calendar.YEAR),
+            calendar.get(Calendar.MONTH) + 1,
+            calendar.get(Calendar.DATE)
+        )
+
         deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
         deviceInstance = TuyaHomeSdk.newDeviceInstance(deviceId)
         CommandManager.getTuyaDp(deviceInstance, "105")
@@ -83,6 +92,52 @@
             setLineChartData()
         }
 
+        lastDateView.setOnClickListener {
+            val currentYear = calendar.get(Calendar.YEAR)
+            val currentMonth = calendar.get(Calendar.MONTH) + 1
+            val currentDay = calendar.get(Calendar.DATE)
+            when {
+                dayRadioButton.isChecked -> {
+                    //日 减一天
+                    calendar.add(Calendar.DATE, -1)
+                    setDate(currentYear, currentMonth, calendar.get(Calendar.DATE))
+                }
+                monthRadioButton.isChecked -> {
+                    //月 减一月
+                    calendar.add(Calendar.MONTH, -1)
+                    setDate(currentYear, calendar.get(Calendar.MONTH) + 1, currentDay)
+                }
+                else -> {
+                    //年 减一年
+                    calendar.add(Calendar.YEAR, -1)
+                    setDate(calendar.get(Calendar.YEAR), currentMonth, currentDay)
+                }
+            }
+        }
+
+        nextDateView.setOnClickListener {
+            val currentYear = calendar.get(Calendar.YEAR)
+            val currentMonth = calendar.get(Calendar.MONTH) + 1
+            val currentDay = calendar.get(Calendar.DATE)
+            when {
+                dayRadioButton.isChecked -> {
+                    //日 加一天
+                    calendar.add(Calendar.DATE, 1)
+                    setDate(currentYear, currentMonth, calendar.get(Calendar.DATE))
+                }
+                monthRadioButton.isChecked -> {
+                    //月 加一月
+                    calendar.add(Calendar.MONTH, 1)
+                    setDate(currentYear, calendar.get(Calendar.MONTH) + 1, currentDay)
+                }
+                else -> {
+                    //年 加一年
+                    calendar.add(Calendar.YEAR, 1)
+                    setDate(calendar.get(Calendar.YEAR), currentMonth, currentDay)
+                }
+            }
+        }
+
         clearTotalWaterCheckBox.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 CommandManager.sendTuyaDp(deviceInstance, "107".createCommand(true))
@@ -96,6 +151,14 @@
         }
     }
 
+    private fun setDate(year: Int, month: Int, day: Int) {
+        when {
+            dayRadioButton.isChecked -> dateView.text = String.format("$year-$month-${day}")
+            monthRadioButton.isChecked -> dateView.text = String.format("$year-$month")
+            else -> dateView.text = year.toString()
+        }
+    }
+
     /**
      * 设置温度范围
      * */

diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt
index b59019c..ffa9f8a 100644
--- a/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt
+++ b/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt
@@ -15,12 +15,14 @@
 import com.tuya.smart.sdk.api.ITuyaDevice
 import kotlinx.android.synthetic.main.activity_gas_consume.*
 import kotlinx.android.synthetic.main.include_base_title.*
+import java.util.*
 
 class GasConsumeActivity : KotlinBaseActivity() {
 
     private val kTag = "GasConsumeActivity"
     private lateinit var deviceId: String
     private lateinit var deviceInstance: ITuyaDevice
+    private lateinit var calendar: Calendar
 
     override fun initLayoutView(): Int = R.layout.activity_gas_consume
 
@@ -37,10 +39,17 @@
     }
 
     override fun initData() {
+        calendar = Calendar.getInstance()
         //默认选中
         dateRadioGroup.check(R.id.dayRadioButton)
         setLineChartData()
 
+        setDate(
+            calendar.get(Calendar.YEAR),
+            calendar.get(Calendar.MONTH) + 1,
+            calendar.get(Calendar.DATE)
+        )
+
         deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
         deviceInstance = TuyaHomeSdk.newDeviceInstance(deviceId)
         CommandManager.getTuyaDp(deviceInstance, "105")
@@ -83,6 +92,52 @@
             setLineChartData()
         }
 
+        lastDateView.setOnClickListener {
+            val currentYear = calendar.get(Calendar.YEAR)
+            val currentMonth = calendar.get(Calendar.MONTH) + 1
+            val currentDay = calendar.get(Calendar.DATE)
+            when {
+                dayRadioButton.isChecked -> {
+                    //日 减一天
+                    calendar.add(Calendar.DATE, -1)
+                    setDate(currentYear, currentMonth, calendar.get(Calendar.DATE))
+                }
+                monthRadioButton.isChecked -> {
+                    //月 减一月
+                    calendar.add(Calendar.MONTH, -1)
+                    setDate(currentYear, calendar.get(Calendar.MONTH) + 1, currentDay)
+                }
+                else -> {
+                    //年 减一年
+                    calendar.add(Calendar.YEAR, -1)
+                    setDate(calendar.get(Calendar.YEAR), currentMonth, currentDay)
+                }
+            }
+        }
+
+        nextDateView.setOnClickListener {
+            val currentYear = calendar.get(Calendar.YEAR)
+            val currentMonth = calendar.get(Calendar.MONTH) + 1
+            val currentDay = calendar.get(Calendar.DATE)
+            when {
+                dayRadioButton.isChecked -> {
+                    //日 加一天
+                    calendar.add(Calendar.DATE, 1)
+                    setDate(currentYear, currentMonth, calendar.get(Calendar.DATE))
+                }
+                monthRadioButton.isChecked -> {
+                    //月 加一月
+                    calendar.add(Calendar.MONTH, 1)
+                    setDate(currentYear, calendar.get(Calendar.MONTH) + 1, currentDay)
+                }
+                else -> {
+                    //年 加一年
+                    calendar.add(Calendar.YEAR, 1)
+                    setDate(calendar.get(Calendar.YEAR), currentMonth, currentDay)
+                }
+            }
+        }
+
         clearTotalWaterCheckBox.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 CommandManager.sendTuyaDp(deviceInstance, "107".createCommand(true))
@@ -96,6 +151,14 @@
         }
     }
 
+    private fun setDate(year: Int, month: Int, day: Int) {
+        when {
+            dayRadioButton.isChecked -> dateView.text = String.format("$year-$month-${day}")
+            monthRadioButton.isChecked -> dateView.text = String.format("$year-$month")
+            else -> dateView.text = year.toString()
+        }
+    }
+
     /**
      * 设置温度范围
      * */
diff --git a/app/src/main/res/layout/activity_gas_consume.xml b/app/src/main/res/layout/activity_gas_consume.xml
index bb314be..2b2473a 100644
--- a/app/src/main/res/layout/activity_gas_consume.xml
+++ b/app/src/main/res/layout/activity_gas_consume.xml
@@ -57,20 +57,23 @@
             android:gravity="center">
 
             <ImageView
+                android:id="@+id/lastDateView"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:paddingHorizontal="@dimen/dp_5"
                 android:src="@drawable/ic_date_left" />
 
             <TextView
+                android:id="@+id/dateView"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="2022/09/26"
+                android:text="--/--/--"
                 android:textColor="@color/mainTextColor" />
 
             <ImageView
+                android:id="@+id/nextDateView"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:paddingHorizontal="@dimen/dp_5"