diff --git a/app/src/main/java/com/casic/br/fragment/waterheater/ControlPageFragment.kt b/app/src/main/java/com/casic/br/fragment/waterheater/ControlPageFragment.kt
index d6fde81..003e40f 100644
--- a/app/src/main/java/com/casic/br/fragment/waterheater/ControlPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/waterheater/ControlPageFragment.kt
@@ -2,9 +2,19 @@
 
 import com.casic.br.R
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.qmuiteam.qmui.widget.QMUISlider
+import kotlinx.android.synthetic.main.fragment_device_waterheater_control.*
+import kotlin.math.abs
 
 class ControlPageFragment : KotlinBaseFragment() {
 
+    private val kTag = "ControlPageFragment"
+    private val minTemp = 36
+    private var maxTemp = 60
+    private var currentProgress = 0
+    private val timeScope = intArrayOf(30, 60, 120, 180)
+    private var currentTimeProgress = 0
+
     override fun initLayoutView(): Int = R.layout.fragment_device_waterheater_control
 
     override fun setupTopBarLayout() {
@@ -12,7 +22,46 @@
     }
 
     override fun initData() {
+        //默认选中
+        modeRadioGroup.check(R.id.kitchenRadioButton)
+        setTemperatureScope()
+        setTimeScope()
+        modeRadioGroup.setOnCheckedChangeListener { group, checkedId ->
+            when (checkedId) {
+                R.id.kitchenRadioButton -> {
+                    maxTemp = 60
+                }
+                R.id.showerRadioButton -> {
+                    maxTemp = 60
+                }
+                R.id.tempRadioButton -> {
+                    maxTemp = 48
+                }
+            }
+            setTemperatureScope()
+        }
+    }
 
+    /**
+     * 设置温度范围
+     * */
+    private fun setTemperatureScope() {
+        temperatureSlider.tickCount = abs(maxTemp - minTemp)
+        temperatureSlider.currentProgress = currentProgress
+        currentTempView.text = String.format("${minTemp + currentProgress}")
+        minTempView.text = minTemp.toString()
+        maxTempView.text = maxTemp.toString()
+    }
+
+    /**
+     * 设置定时范围
+     * */
+    private fun setTimeScope() {
+        timeSeekBar.tickCount = timeScope.size - 1
+        timeSeekBar.currentProgress = currentTimeProgress
+        currentTimeView.text = timeScope[currentTimeProgress].toString()
+        minTimeView.text = "${timeScope.first()}"
+        maxTimeView.text = "${timeScope.last()}"
     }
 
     override fun observeRequestState() {
@@ -20,6 +69,59 @@
     }
 
     override fun initEvent() {
+        temperatureSlider.setCallback(object : QMUISlider.Callback {
+            override fun onProgressChange(
+                slider: QMUISlider?, progress: Int, tickCount: Int, fromUser: Boolean
+            ) {
+                currentProgress = progress
+                currentTempView.text = String.format("${minTemp + progress}")
+            }
 
+            override fun onTouchDown(
+                slider: QMUISlider?, progress: Int, tickCount: Int, hitThumb: Boolean
+            ) {
+
+            }
+
+            override fun onTouchUp(slider: QMUISlider?, progress: Int, tickCount: Int) {
+
+            }
+
+            override fun onStartMoving(slider: QMUISlider?, progress: Int, tickCount: Int) {
+
+            }
+
+            override fun onStopMoving(slider: QMUISlider?, progress: Int, tickCount: Int) {
+
+            }
+        })
+
+        timeSeekBar.setCallback(object : QMUISlider.Callback {
+            override fun onProgressChange(
+                slider: QMUISlider?, progress: Int, tickCount: Int, fromUser: Boolean
+            ) {
+                currentTimeProgress = progress
+                currentTimeView.text = timeScope[currentTimeProgress].toString()
+            }
+
+            override fun onTouchDown(
+                slider: QMUISlider?, progress: Int, tickCount: Int, hitThumb: Boolean
+            ) {
+
+            }
+
+            override fun onTouchUp(slider: QMUISlider?, progress: Int, tickCount: Int) {
+
+            }
+
+            override fun onStartMoving(slider: QMUISlider?, progress: Int, tickCount: Int) {
+
+            }
+
+            override fun onStopMoving(slider: QMUISlider?, progress: Int, tickCount: Int) {
+
+            }
+
+        })
     }
 }
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/br/fragment/waterheater/ControlPageFragment.kt b/app/src/main/java/com/casic/br/fragment/waterheater/ControlPageFragment.kt
index d6fde81..003e40f 100644
--- a/app/src/main/java/com/casic/br/fragment/waterheater/ControlPageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/waterheater/ControlPageFragment.kt
@@ -2,9 +2,19 @@
 
 import com.casic.br.R
 import com.pengxh.kt.lite.base.KotlinBaseFragment
+import com.qmuiteam.qmui.widget.QMUISlider
+import kotlinx.android.synthetic.main.fragment_device_waterheater_control.*
+import kotlin.math.abs
 
 class ControlPageFragment : KotlinBaseFragment() {
 
+    private val kTag = "ControlPageFragment"
+    private val minTemp = 36
+    private var maxTemp = 60
+    private var currentProgress = 0
+    private val timeScope = intArrayOf(30, 60, 120, 180)
+    private var currentTimeProgress = 0
+
     override fun initLayoutView(): Int = R.layout.fragment_device_waterheater_control
 
     override fun setupTopBarLayout() {
@@ -12,7 +22,46 @@
     }
 
     override fun initData() {
+        //默认选中
+        modeRadioGroup.check(R.id.kitchenRadioButton)
+        setTemperatureScope()
+        setTimeScope()
+        modeRadioGroup.setOnCheckedChangeListener { group, checkedId ->
+            when (checkedId) {
+                R.id.kitchenRadioButton -> {
+                    maxTemp = 60
+                }
+                R.id.showerRadioButton -> {
+                    maxTemp = 60
+                }
+                R.id.tempRadioButton -> {
+                    maxTemp = 48
+                }
+            }
+            setTemperatureScope()
+        }
+    }
 
+    /**
+     * 设置温度范围
+     * */
+    private fun setTemperatureScope() {
+        temperatureSlider.tickCount = abs(maxTemp - minTemp)
+        temperatureSlider.currentProgress = currentProgress
+        currentTempView.text = String.format("${minTemp + currentProgress}")
+        minTempView.text = minTemp.toString()
+        maxTempView.text = maxTemp.toString()
+    }
+
+    /**
+     * 设置定时范围
+     * */
+    private fun setTimeScope() {
+        timeSeekBar.tickCount = timeScope.size - 1
+        timeSeekBar.currentProgress = currentTimeProgress
+        currentTimeView.text = timeScope[currentTimeProgress].toString()
+        minTimeView.text = "${timeScope.first()}"
+        maxTimeView.text = "${timeScope.last()}"
     }
 
     override fun observeRequestState() {
@@ -20,6 +69,59 @@
     }
 
     override fun initEvent() {
+        temperatureSlider.setCallback(object : QMUISlider.Callback {
+            override fun onProgressChange(
+                slider: QMUISlider?, progress: Int, tickCount: Int, fromUser: Boolean
+            ) {
+                currentProgress = progress
+                currentTempView.text = String.format("${minTemp + progress}")
+            }
 
+            override fun onTouchDown(
+                slider: QMUISlider?, progress: Int, tickCount: Int, hitThumb: Boolean
+            ) {
+
+            }
+
+            override fun onTouchUp(slider: QMUISlider?, progress: Int, tickCount: Int) {
+
+            }
+
+            override fun onStartMoving(slider: QMUISlider?, progress: Int, tickCount: Int) {
+
+            }
+
+            override fun onStopMoving(slider: QMUISlider?, progress: Int, tickCount: Int) {
+
+            }
+        })
+
+        timeSeekBar.setCallback(object : QMUISlider.Callback {
+            override fun onProgressChange(
+                slider: QMUISlider?, progress: Int, tickCount: Int, fromUser: Boolean
+            ) {
+                currentTimeProgress = progress
+                currentTimeView.text = timeScope[currentTimeProgress].toString()
+            }
+
+            override fun onTouchDown(
+                slider: QMUISlider?, progress: Int, tickCount: Int, hitThumb: Boolean
+            ) {
+
+            }
+
+            override fun onTouchUp(slider: QMUISlider?, progress: Int, tickCount: Int) {
+
+            }
+
+            override fun onStartMoving(slider: QMUISlider?, progress: Int, tickCount: Int) {
+
+            }
+
+            override fun onStopMoving(slider: QMUISlider?, progress: Int, tickCount: Int) {
+
+            }
+
+        })
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_waterheater_control.xml b/app/src/main/res/layout/fragment_device_waterheater_control.xml
index 958bc4b..285a9b2 100644
--- a/app/src/main/res/layout/fragment_device_waterheater_control.xml
+++ b/app/src/main/res/layout/fragment_device_waterheater_control.xml
@@ -52,6 +52,7 @@
                 android:textSize="@dimen/sp_14" />
 
             <RadioGroup
+                android:id="@+id/modeRadioGroup"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_5"
@@ -61,6 +62,7 @@
                 android:paddingHorizontal="@dimen/dp_20">
 
                 <RadioButton
+                    android:id="@+id/kitchenRadioButton"
                     style="@style/textRadioButtonStyle"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -68,6 +70,7 @@
                     android:text="厨房" />
 
                 <RadioButton
+                    android:id="@+id/showerRadioButton"
                     style="@style/textRadioButtonStyle"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -76,6 +79,7 @@
                     android:text="舒适浴" />
 
                 <RadioButton
+                    android:id="@+id/tempRadioButton"
                     style="@style/textRadioButtonStyle"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -106,12 +110,20 @@
                     android:textSize="@dimen/sp_14" />
 
                 <TextView
+                    android:id="@+id/currentTempView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="@dimen/dp_20"
-                    android:text="32°C"
-                    android:textColor="@color/mainTextColor"
+                    android:layout_marginLeft="@dimen/dp_20"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="42"
+                    android:textColor="@color/mainThemeColor"
                     android:textSize="@dimen/sp_14" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="°C" />
             </LinearLayout>
 
             <com.qmuiteam.qmui.widget.QMUISlider
@@ -123,24 +135,38 @@
                 app:qmui_slider_bar_normal_color="@color/lightMainThemeColor"
                 app:qmui_slider_bar_progress_color="@color/mainThemeColor"
                 app:qmui_slider_bar_thumb_size="@dimen/dp_25"
-                app:qmui_slider_bar_thumb_style_attr="QMUISliderThumbStyle"
-                app:qmui_slider_bar_tick_count="20" />
+                app:qmui_slider_bar_thumb_style_attr="QMUISliderThumbStyle" />
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/minTempView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="36"
+                    android:textColor="@color/subMainThemeColor" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="°C" />
+
+                <TextView
+                    android:id="@+id/maxTempView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="60"
+                    android:textColor="@color/subMainThemeColor" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="30°C" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:text="60°C" />
-            </RelativeLayout>
+                    android:text="°C" />
+            </LinearLayout>
         </LinearLayout>
 
         <LinearLayout
@@ -165,12 +191,20 @@
                     android:textSize="@dimen/sp_14" />
 
                 <TextView
+                    android:id="@+id/currentTimeView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="@dimen/dp_20"
-                    android:text="30min"
-                    android:textColor="@color/mainTextColor"
+                    android:layout_marginLeft="@dimen/dp_20"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="30"
+                    android:textColor="@color/mainThemeColor"
                     android:textSize="@dimen/sp_14" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="min" />
             </LinearLayout>
 
             <com.qmuiteam.qmui.widget.QMUISeekBar
@@ -181,24 +215,37 @@
                 app:qmui_slider_bar_height="@dimen/dp_5"
                 app:qmui_slider_bar_normal_color="@color/lightMainThemeColor"
                 app:qmui_slider_bar_progress_color="@color/mainThemeColor"
-                app:qmui_slider_bar_thumb_size="@dimen/dp_25"
-                app:qmui_slider_bar_tick_count="4" />
+                app:qmui_slider_bar_thumb_size="@dimen/dp_25" />
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
                 <TextView
+                    android:id="@+id/minTimeView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="30min" />
+                    android:text="30"
+                    android:textColor="@color/subMainThemeColor" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="min" />
+
+                <TextView
+                    android:id="@+id/maxTimeView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="180"
+                    android:textColor="@color/subMainThemeColor" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:text="180min" />
-            </RelativeLayout>
+                    android:text="min" />
+            </LinearLayout>
         </LinearLayout>
 
         <LinearLayout