diff --git a/app/build.gradle b/app/build.gradle index 627fa46..46ceda0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,4 +113,6 @@ //选择器 implementation 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.8' implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.8' + //图表 + implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 627fa46..46ceda0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,4 +113,6 @@ //选择器 implementation 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.8' implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.8' + //图表 + implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c22d64a..a519f6e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -58,6 +58,7 @@ + + (deviceId) } - //水汽量消耗 + //水气量消耗 gasConsumeLayout.setOnClickListener { - + requireContext().navigatePageTo(deviceId) } } diff --git a/app/build.gradle b/app/build.gradle index 627fa46..46ceda0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,4 +113,6 @@ //选择器 implementation 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.8' implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.8' + //图表 + implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c22d64a..a519f6e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -58,6 +58,7 @@ + (deviceId) } - //水汽量消耗 + //水气量消耗 gasConsumeLayout.setOnClickListener { - + requireContext().navigatePageTo(deviceId) } } 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 new file mode 100644 index 0000000..873a103 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt @@ -0,0 +1,58 @@ +package com.casic.br.view.device.waterheater + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_gas_consume.* +import kotlinx.android.synthetic.main.include_base_title.* + +class GasConsumeActivity : KotlinBaseActivity() { + + private val kTag = "GasConsumeActivity" + + override fun initLayoutView(): Int = R.layout.activity_gas_consume + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "水气量消耗" + } + + override fun initData() { + //默认选中 + dateRadioGroup.check(R.id.dayRadioButton) + setLineChartData() + } + + override fun initEvent() { + dateRadioGroup.setOnCheckedChangeListener { _, checkedId -> + when (checkedId) { + R.id.dayRadioButton -> { + + } + R.id.monthRadioButton -> { + + } + R.id.yearRadioButton -> { + + } + } + setLineChartData() + } + } + + /** + * 设置温度范围 + * */ + private fun setLineChartData() { + + } +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 627fa46..46ceda0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,4 +113,6 @@ //选择器 implementation 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.8' implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.8' + //图表 + implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c22d64a..a519f6e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -58,6 +58,7 @@ + (deviceId) } - //水汽量消耗 + //水气量消耗 gasConsumeLayout.setOnClickListener { - + requireContext().navigatePageTo(deviceId) } } 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 new file mode 100644 index 0000000..873a103 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt @@ -0,0 +1,58 @@ +package com.casic.br.view.device.waterheater + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_gas_consume.* +import kotlinx.android.synthetic.main.include_base_title.* + +class GasConsumeActivity : KotlinBaseActivity() { + + private val kTag = "GasConsumeActivity" + + override fun initLayoutView(): Int = R.layout.activity_gas_consume + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "水气量消耗" + } + + override fun initData() { + //默认选中 + dateRadioGroup.check(R.id.dayRadioButton) + setLineChartData() + } + + override fun initEvent() { + dateRadioGroup.setOnCheckedChangeListener { _, checkedId -> + when (checkedId) { + R.id.dayRadioButton -> { + + } + R.id.monthRadioButton -> { + + } + R.id.yearRadioButton -> { + + } + } + setLineChartData() + } + } + + /** + * 设置温度范围 + * */ + private fun setLineChartData() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt index 9c64a9f..edac8d1 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt @@ -3,18 +3,19 @@ import android.graphics.Color import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.SliderCallback import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.qmuiteam.qmui.widget.QMUISlider import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_once_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* import kotlin.math.abs class OnceConfigActivity : KotlinBaseActivity() { @@ -63,7 +64,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "单次参数设置" } diff --git a/app/build.gradle b/app/build.gradle index 627fa46..46ceda0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,4 +113,6 @@ //选择器 implementation 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.8' implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.8' + //图表 + implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c22d64a..a519f6e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -58,6 +58,7 @@ + (deviceId) } - //水汽量消耗 + //水气量消耗 gasConsumeLayout.setOnClickListener { - + requireContext().navigatePageTo(deviceId) } } 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 new file mode 100644 index 0000000..873a103 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt @@ -0,0 +1,58 @@ +package com.casic.br.view.device.waterheater + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_gas_consume.* +import kotlinx.android.synthetic.main.include_base_title.* + +class GasConsumeActivity : KotlinBaseActivity() { + + private val kTag = "GasConsumeActivity" + + override fun initLayoutView(): Int = R.layout.activity_gas_consume + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "水气量消耗" + } + + override fun initData() { + //默认选中 + dateRadioGroup.check(R.id.dayRadioButton) + setLineChartData() + } + + override fun initEvent() { + dateRadioGroup.setOnCheckedChangeListener { _, checkedId -> + when (checkedId) { + R.id.dayRadioButton -> { + + } + R.id.monthRadioButton -> { + + } + R.id.yearRadioButton -> { + + } + } + setLineChartData() + } + } + + /** + * 设置温度范围 + * */ + private fun setLineChartData() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt index 9c64a9f..edac8d1 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt @@ -3,18 +3,19 @@ import android.graphics.Color import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.SliderCallback import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.qmuiteam.qmui.widget.QMUISlider import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_once_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* import kotlin.math.abs class OnceConfigActivity : KotlinBaseActivity() { @@ -63,7 +64,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "单次参数设置" } diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt index 3d4287d..25f89bc 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt @@ -6,16 +6,17 @@ import com.alibaba.fastjson.JSONObject import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.TuyaDeviceListener import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_time_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* class TimeConfigActivity : KotlinBaseActivity() { @@ -30,7 +31,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "预约时间设定" } diff --git a/app/build.gradle b/app/build.gradle index 627fa46..46ceda0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,4 +113,6 @@ //选择器 implementation 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.8' implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.8' + //图表 + implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c22d64a..a519f6e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -58,6 +58,7 @@ + (deviceId) } - //水汽量消耗 + //水气量消耗 gasConsumeLayout.setOnClickListener { - + requireContext().navigatePageTo(deviceId) } } 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 new file mode 100644 index 0000000..873a103 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt @@ -0,0 +1,58 @@ +package com.casic.br.view.device.waterheater + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_gas_consume.* +import kotlinx.android.synthetic.main.include_base_title.* + +class GasConsumeActivity : KotlinBaseActivity() { + + private val kTag = "GasConsumeActivity" + + override fun initLayoutView(): Int = R.layout.activity_gas_consume + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "水气量消耗" + } + + override fun initData() { + //默认选中 + dateRadioGroup.check(R.id.dayRadioButton) + setLineChartData() + } + + override fun initEvent() { + dateRadioGroup.setOnCheckedChangeListener { _, checkedId -> + when (checkedId) { + R.id.dayRadioButton -> { + + } + R.id.monthRadioButton -> { + + } + R.id.yearRadioButton -> { + + } + } + setLineChartData() + } + } + + /** + * 设置温度范围 + * */ + private fun setLineChartData() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt index 9c64a9f..edac8d1 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt @@ -3,18 +3,19 @@ import android.graphics.Color import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.SliderCallback import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.qmuiteam.qmui.widget.QMUISlider import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_once_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* import kotlin.math.abs class OnceConfigActivity : KotlinBaseActivity() { @@ -63,7 +64,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "单次参数设置" } diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt index 3d4287d..25f89bc 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt @@ -6,16 +6,17 @@ import com.alibaba.fastjson.JSONObject import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.TuyaDeviceListener import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_time_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* class TimeConfigActivity : KotlinBaseActivity() { @@ -30,7 +31,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "预约时间设定" } diff --git a/app/src/main/res/drawable/ic_date_left.xml b/app/src/main/res/drawable/ic_date_left.xml new file mode 100644 index 0000000..3bcd8f5 --- /dev/null +++ b/app/src/main/res/drawable/ic_date_left.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/build.gradle b/app/build.gradle index 627fa46..46ceda0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,4 +113,6 @@ //选择器 implementation 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.8' implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.8' + //图表 + implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c22d64a..a519f6e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -58,6 +58,7 @@ + (deviceId) } - //水汽量消耗 + //水气量消耗 gasConsumeLayout.setOnClickListener { - + requireContext().navigatePageTo(deviceId) } } 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 new file mode 100644 index 0000000..873a103 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt @@ -0,0 +1,58 @@ +package com.casic.br.view.device.waterheater + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_gas_consume.* +import kotlinx.android.synthetic.main.include_base_title.* + +class GasConsumeActivity : KotlinBaseActivity() { + + private val kTag = "GasConsumeActivity" + + override fun initLayoutView(): Int = R.layout.activity_gas_consume + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "水气量消耗" + } + + override fun initData() { + //默认选中 + dateRadioGroup.check(R.id.dayRadioButton) + setLineChartData() + } + + override fun initEvent() { + dateRadioGroup.setOnCheckedChangeListener { _, checkedId -> + when (checkedId) { + R.id.dayRadioButton -> { + + } + R.id.monthRadioButton -> { + + } + R.id.yearRadioButton -> { + + } + } + setLineChartData() + } + } + + /** + * 设置温度范围 + * */ + private fun setLineChartData() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt index 9c64a9f..edac8d1 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt @@ -3,18 +3,19 @@ import android.graphics.Color import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.SliderCallback import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.qmuiteam.qmui.widget.QMUISlider import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_once_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* import kotlin.math.abs class OnceConfigActivity : KotlinBaseActivity() { @@ -63,7 +64,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "单次参数设置" } diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt index 3d4287d..25f89bc 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt @@ -6,16 +6,17 @@ import com.alibaba.fastjson.JSONObject import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.TuyaDeviceListener import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_time_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* class TimeConfigActivity : KotlinBaseActivity() { @@ -30,7 +31,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "预约时间设定" } diff --git a/app/src/main/res/drawable/ic_date_left.xml b/app/src/main/res/drawable/ic_date_left.xml new file mode 100644 index 0000000..3bcd8f5 --- /dev/null +++ b/app/src/main/res/drawable/ic_date_left.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas.xml b/app/src/main/res/drawable/ic_gas.xml new file mode 100644 index 0000000..01edafd --- /dev/null +++ b/app/src/main/res/drawable/ic_gas.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/build.gradle b/app/build.gradle index 627fa46..46ceda0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,4 +113,6 @@ //选择器 implementation 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.8' implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.8' + //图表 + implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c22d64a..a519f6e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -58,6 +58,7 @@ + (deviceId) } - //水汽量消耗 + //水气量消耗 gasConsumeLayout.setOnClickListener { - + requireContext().navigatePageTo(deviceId) } } 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 new file mode 100644 index 0000000..873a103 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt @@ -0,0 +1,58 @@ +package com.casic.br.view.device.waterheater + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_gas_consume.* +import kotlinx.android.synthetic.main.include_base_title.* + +class GasConsumeActivity : KotlinBaseActivity() { + + private val kTag = "GasConsumeActivity" + + override fun initLayoutView(): Int = R.layout.activity_gas_consume + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "水气量消耗" + } + + override fun initData() { + //默认选中 + dateRadioGroup.check(R.id.dayRadioButton) + setLineChartData() + } + + override fun initEvent() { + dateRadioGroup.setOnCheckedChangeListener { _, checkedId -> + when (checkedId) { + R.id.dayRadioButton -> { + + } + R.id.monthRadioButton -> { + + } + R.id.yearRadioButton -> { + + } + } + setLineChartData() + } + } + + /** + * 设置温度范围 + * */ + private fun setLineChartData() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt index 9c64a9f..edac8d1 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt @@ -3,18 +3,19 @@ import android.graphics.Color import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.SliderCallback import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.qmuiteam.qmui.widget.QMUISlider import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_once_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* import kotlin.math.abs class OnceConfigActivity : KotlinBaseActivity() { @@ -63,7 +64,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "单次参数设置" } diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt index 3d4287d..25f89bc 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt @@ -6,16 +6,17 @@ import com.alibaba.fastjson.JSONObject import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.TuyaDeviceListener import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_time_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* class TimeConfigActivity : KotlinBaseActivity() { @@ -30,7 +31,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "预约时间设定" } diff --git a/app/src/main/res/drawable/ic_date_left.xml b/app/src/main/res/drawable/ic_date_left.xml new file mode 100644 index 0000000..3bcd8f5 --- /dev/null +++ b/app/src/main/res/drawable/ic_date_left.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas.xml b/app/src/main/res/drawable/ic_gas.xml new file mode 100644 index 0000000..01edafd --- /dev/null +++ b/app/src/main/res/drawable/ic_gas.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas_selected.xml b/app/src/main/res/drawable/ic_gas_selected.xml new file mode 100644 index 0000000..5bb890b --- /dev/null +++ b/app/src/main/res/drawable/ic_gas_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/build.gradle b/app/build.gradle index 627fa46..46ceda0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,4 +113,6 @@ //选择器 implementation 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.8' implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.8' + //图表 + implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c22d64a..a519f6e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -58,6 +58,7 @@ + (deviceId) } - //水汽量消耗 + //水气量消耗 gasConsumeLayout.setOnClickListener { - + requireContext().navigatePageTo(deviceId) } } 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 new file mode 100644 index 0000000..873a103 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt @@ -0,0 +1,58 @@ +package com.casic.br.view.device.waterheater + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_gas_consume.* +import kotlinx.android.synthetic.main.include_base_title.* + +class GasConsumeActivity : KotlinBaseActivity() { + + private val kTag = "GasConsumeActivity" + + override fun initLayoutView(): Int = R.layout.activity_gas_consume + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "水气量消耗" + } + + override fun initData() { + //默认选中 + dateRadioGroup.check(R.id.dayRadioButton) + setLineChartData() + } + + override fun initEvent() { + dateRadioGroup.setOnCheckedChangeListener { _, checkedId -> + when (checkedId) { + R.id.dayRadioButton -> { + + } + R.id.monthRadioButton -> { + + } + R.id.yearRadioButton -> { + + } + } + setLineChartData() + } + } + + /** + * 设置温度范围 + * */ + private fun setLineChartData() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt index 9c64a9f..edac8d1 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt @@ -3,18 +3,19 @@ import android.graphics.Color import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.SliderCallback import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.qmuiteam.qmui.widget.QMUISlider import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_once_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* import kotlin.math.abs class OnceConfigActivity : KotlinBaseActivity() { @@ -63,7 +64,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "单次参数设置" } diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt index 3d4287d..25f89bc 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt @@ -6,16 +6,17 @@ import com.alibaba.fastjson.JSONObject import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.TuyaDeviceListener import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_time_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* class TimeConfigActivity : KotlinBaseActivity() { @@ -30,7 +31,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "预约时间设定" } diff --git a/app/src/main/res/drawable/ic_date_left.xml b/app/src/main/res/drawable/ic_date_left.xml new file mode 100644 index 0000000..3bcd8f5 --- /dev/null +++ b/app/src/main/res/drawable/ic_date_left.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas.xml b/app/src/main/res/drawable/ic_gas.xml new file mode 100644 index 0000000..01edafd --- /dev/null +++ b/app/src/main/res/drawable/ic_gas.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas_selected.xml b/app/src/main/res/drawable/ic_gas_selected.xml new file mode 100644 index 0000000..5bb890b --- /dev/null +++ b/app/src/main/res/drawable/ic_gas_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_water.xml b/app/src/main/res/drawable/ic_water.xml new file mode 100644 index 0000000..fb175a1 --- /dev/null +++ b/app/src/main/res/drawable/ic_water.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/build.gradle b/app/build.gradle index 627fa46..46ceda0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,4 +113,6 @@ //选择器 implementation 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.8' implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.8' + //图表 + implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c22d64a..a519f6e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -58,6 +58,7 @@ + (deviceId) } - //水汽量消耗 + //水气量消耗 gasConsumeLayout.setOnClickListener { - + requireContext().navigatePageTo(deviceId) } } 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 new file mode 100644 index 0000000..873a103 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt @@ -0,0 +1,58 @@ +package com.casic.br.view.device.waterheater + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_gas_consume.* +import kotlinx.android.synthetic.main.include_base_title.* + +class GasConsumeActivity : KotlinBaseActivity() { + + private val kTag = "GasConsumeActivity" + + override fun initLayoutView(): Int = R.layout.activity_gas_consume + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "水气量消耗" + } + + override fun initData() { + //默认选中 + dateRadioGroup.check(R.id.dayRadioButton) + setLineChartData() + } + + override fun initEvent() { + dateRadioGroup.setOnCheckedChangeListener { _, checkedId -> + when (checkedId) { + R.id.dayRadioButton -> { + + } + R.id.monthRadioButton -> { + + } + R.id.yearRadioButton -> { + + } + } + setLineChartData() + } + } + + /** + * 设置温度范围 + * */ + private fun setLineChartData() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt index 9c64a9f..edac8d1 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt @@ -3,18 +3,19 @@ import android.graphics.Color import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.SliderCallback import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.qmuiteam.qmui.widget.QMUISlider import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_once_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* import kotlin.math.abs class OnceConfigActivity : KotlinBaseActivity() { @@ -63,7 +64,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "单次参数设置" } diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt index 3d4287d..25f89bc 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt @@ -6,16 +6,17 @@ import com.alibaba.fastjson.JSONObject import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.TuyaDeviceListener import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_time_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* class TimeConfigActivity : KotlinBaseActivity() { @@ -30,7 +31,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "预约时间设定" } diff --git a/app/src/main/res/drawable/ic_date_left.xml b/app/src/main/res/drawable/ic_date_left.xml new file mode 100644 index 0000000..3bcd8f5 --- /dev/null +++ b/app/src/main/res/drawable/ic_date_left.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas.xml b/app/src/main/res/drawable/ic_gas.xml new file mode 100644 index 0000000..01edafd --- /dev/null +++ b/app/src/main/res/drawable/ic_gas.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas_selected.xml b/app/src/main/res/drawable/ic_gas_selected.xml new file mode 100644 index 0000000..5bb890b --- /dev/null +++ b/app/src/main/res/drawable/ic_gas_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_water.xml b/app/src/main/res/drawable/ic_water.xml new file mode 100644 index 0000000..fb175a1 --- /dev/null +++ b/app/src/main/res/drawable/ic_water.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_water_selected.xml b/app/src/main/res/drawable/ic_water_selected.xml new file mode 100644 index 0000000..f07e248 --- /dev/null +++ b/app/src/main/res/drawable/ic_water_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/build.gradle b/app/build.gradle index 627fa46..46ceda0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,4 +113,6 @@ //选择器 implementation 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.8' implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.8' + //图表 + implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c22d64a..a519f6e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -58,6 +58,7 @@ + (deviceId) } - //水汽量消耗 + //水气量消耗 gasConsumeLayout.setOnClickListener { - + requireContext().navigatePageTo(deviceId) } } 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 new file mode 100644 index 0000000..873a103 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt @@ -0,0 +1,58 @@ +package com.casic.br.view.device.waterheater + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_gas_consume.* +import kotlinx.android.synthetic.main.include_base_title.* + +class GasConsumeActivity : KotlinBaseActivity() { + + private val kTag = "GasConsumeActivity" + + override fun initLayoutView(): Int = R.layout.activity_gas_consume + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "水气量消耗" + } + + override fun initData() { + //默认选中 + dateRadioGroup.check(R.id.dayRadioButton) + setLineChartData() + } + + override fun initEvent() { + dateRadioGroup.setOnCheckedChangeListener { _, checkedId -> + when (checkedId) { + R.id.dayRadioButton -> { + + } + R.id.monthRadioButton -> { + + } + R.id.yearRadioButton -> { + + } + } + setLineChartData() + } + } + + /** + * 设置温度范围 + * */ + private fun setLineChartData() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt index 9c64a9f..edac8d1 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt @@ -3,18 +3,19 @@ import android.graphics.Color import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.SliderCallback import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.qmuiteam.qmui.widget.QMUISlider import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_once_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* import kotlin.math.abs class OnceConfigActivity : KotlinBaseActivity() { @@ -63,7 +64,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "单次参数设置" } diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt index 3d4287d..25f89bc 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt @@ -6,16 +6,17 @@ import com.alibaba.fastjson.JSONObject import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.TuyaDeviceListener import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_time_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* class TimeConfigActivity : KotlinBaseActivity() { @@ -30,7 +31,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "预约时间设定" } diff --git a/app/src/main/res/drawable/ic_date_left.xml b/app/src/main/res/drawable/ic_date_left.xml new file mode 100644 index 0000000..3bcd8f5 --- /dev/null +++ b/app/src/main/res/drawable/ic_date_left.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas.xml b/app/src/main/res/drawable/ic_gas.xml new file mode 100644 index 0000000..01edafd --- /dev/null +++ b/app/src/main/res/drawable/ic_gas.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas_selected.xml b/app/src/main/res/drawable/ic_gas_selected.xml new file mode 100644 index 0000000..5bb890b --- /dev/null +++ b/app/src/main/res/drawable/ic_gas_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_water.xml b/app/src/main/res/drawable/ic_water.xml new file mode 100644 index 0000000..fb175a1 --- /dev/null +++ b/app/src/main/res/drawable/ic_water.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_water_selected.xml b/app/src/main/res/drawable/ic_water_selected.xml new file mode 100644 index 0000000..f07e248 --- /dev/null +++ b/app/src/main/res/drawable/ic_water_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/selector_clear_gas_check_box.xml b/app/src/main/res/drawable/selector_clear_gas_check_box.xml new file mode 100644 index 0000000..8654938 --- /dev/null +++ b/app/src/main/res/drawable/selector_clear_gas_check_box.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 627fa46..46ceda0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,4 +113,6 @@ //选择器 implementation 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.8' implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.8' + //图表 + implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c22d64a..a519f6e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -58,6 +58,7 @@ + (deviceId) } - //水汽量消耗 + //水气量消耗 gasConsumeLayout.setOnClickListener { - + requireContext().navigatePageTo(deviceId) } } 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 new file mode 100644 index 0000000..873a103 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt @@ -0,0 +1,58 @@ +package com.casic.br.view.device.waterheater + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_gas_consume.* +import kotlinx.android.synthetic.main.include_base_title.* + +class GasConsumeActivity : KotlinBaseActivity() { + + private val kTag = "GasConsumeActivity" + + override fun initLayoutView(): Int = R.layout.activity_gas_consume + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "水气量消耗" + } + + override fun initData() { + //默认选中 + dateRadioGroup.check(R.id.dayRadioButton) + setLineChartData() + } + + override fun initEvent() { + dateRadioGroup.setOnCheckedChangeListener { _, checkedId -> + when (checkedId) { + R.id.dayRadioButton -> { + + } + R.id.monthRadioButton -> { + + } + R.id.yearRadioButton -> { + + } + } + setLineChartData() + } + } + + /** + * 设置温度范围 + * */ + private fun setLineChartData() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt index 9c64a9f..edac8d1 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt @@ -3,18 +3,19 @@ import android.graphics.Color import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.SliderCallback import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.qmuiteam.qmui.widget.QMUISlider import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_once_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* import kotlin.math.abs class OnceConfigActivity : KotlinBaseActivity() { @@ -63,7 +64,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "单次参数设置" } diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt index 3d4287d..25f89bc 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt @@ -6,16 +6,17 @@ import com.alibaba.fastjson.JSONObject import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.TuyaDeviceListener import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_time_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* class TimeConfigActivity : KotlinBaseActivity() { @@ -30,7 +31,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "预约时间设定" } diff --git a/app/src/main/res/drawable/ic_date_left.xml b/app/src/main/res/drawable/ic_date_left.xml new file mode 100644 index 0000000..3bcd8f5 --- /dev/null +++ b/app/src/main/res/drawable/ic_date_left.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas.xml b/app/src/main/res/drawable/ic_gas.xml new file mode 100644 index 0000000..01edafd --- /dev/null +++ b/app/src/main/res/drawable/ic_gas.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas_selected.xml b/app/src/main/res/drawable/ic_gas_selected.xml new file mode 100644 index 0000000..5bb890b --- /dev/null +++ b/app/src/main/res/drawable/ic_gas_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_water.xml b/app/src/main/res/drawable/ic_water.xml new file mode 100644 index 0000000..fb175a1 --- /dev/null +++ b/app/src/main/res/drawable/ic_water.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_water_selected.xml b/app/src/main/res/drawable/ic_water_selected.xml new file mode 100644 index 0000000..f07e248 --- /dev/null +++ b/app/src/main/res/drawable/ic_water_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/selector_clear_gas_check_box.xml b/app/src/main/res/drawable/selector_clear_gas_check_box.xml new file mode 100644 index 0000000..8654938 --- /dev/null +++ b/app/src/main/res/drawable/selector_clear_gas_check_box.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_clear_water_check_box.xml b/app/src/main/res/drawable/selector_clear_water_check_box.xml new file mode 100644 index 0000000..c9ee9e9 --- /dev/null +++ b/app/src/main/res/drawable/selector_clear_water_check_box.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 627fa46..46ceda0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,4 +113,6 @@ //选择器 implementation 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.8' implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.8' + //图表 + implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c22d64a..a519f6e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -58,6 +58,7 @@ + (deviceId) } - //水汽量消耗 + //水气量消耗 gasConsumeLayout.setOnClickListener { - + requireContext().navigatePageTo(deviceId) } } 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 new file mode 100644 index 0000000..873a103 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt @@ -0,0 +1,58 @@ +package com.casic.br.view.device.waterheater + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_gas_consume.* +import kotlinx.android.synthetic.main.include_base_title.* + +class GasConsumeActivity : KotlinBaseActivity() { + + private val kTag = "GasConsumeActivity" + + override fun initLayoutView(): Int = R.layout.activity_gas_consume + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "水气量消耗" + } + + override fun initData() { + //默认选中 + dateRadioGroup.check(R.id.dayRadioButton) + setLineChartData() + } + + override fun initEvent() { + dateRadioGroup.setOnCheckedChangeListener { _, checkedId -> + when (checkedId) { + R.id.dayRadioButton -> { + + } + R.id.monthRadioButton -> { + + } + R.id.yearRadioButton -> { + + } + } + setLineChartData() + } + } + + /** + * 设置温度范围 + * */ + private fun setLineChartData() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt index 9c64a9f..edac8d1 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt @@ -3,18 +3,19 @@ import android.graphics.Color import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.SliderCallback import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.qmuiteam.qmui.widget.QMUISlider import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_once_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* import kotlin.math.abs class OnceConfigActivity : KotlinBaseActivity() { @@ -63,7 +64,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "单次参数设置" } diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt index 3d4287d..25f89bc 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt @@ -6,16 +6,17 @@ import com.alibaba.fastjson.JSONObject import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.TuyaDeviceListener import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_time_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* class TimeConfigActivity : KotlinBaseActivity() { @@ -30,7 +31,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "预约时间设定" } diff --git a/app/src/main/res/drawable/ic_date_left.xml b/app/src/main/res/drawable/ic_date_left.xml new file mode 100644 index 0000000..3bcd8f5 --- /dev/null +++ b/app/src/main/res/drawable/ic_date_left.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas.xml b/app/src/main/res/drawable/ic_gas.xml new file mode 100644 index 0000000..01edafd --- /dev/null +++ b/app/src/main/res/drawable/ic_gas.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas_selected.xml b/app/src/main/res/drawable/ic_gas_selected.xml new file mode 100644 index 0000000..5bb890b --- /dev/null +++ b/app/src/main/res/drawable/ic_gas_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_water.xml b/app/src/main/res/drawable/ic_water.xml new file mode 100644 index 0000000..fb175a1 --- /dev/null +++ b/app/src/main/res/drawable/ic_water.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_water_selected.xml b/app/src/main/res/drawable/ic_water_selected.xml new file mode 100644 index 0000000..f07e248 --- /dev/null +++ b/app/src/main/res/drawable/ic_water_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/selector_clear_gas_check_box.xml b/app/src/main/res/drawable/selector_clear_gas_check_box.xml new file mode 100644 index 0000000..8654938 --- /dev/null +++ b/app/src/main/res/drawable/selector_clear_gas_check_box.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_clear_water_check_box.xml b/app/src/main/res/drawable/selector_clear_water_check_box.xml new file mode 100644 index 0000000..c9ee9e9 --- /dev/null +++ b/app/src/main/res/drawable/selector_clear_water_check_box.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_date_color.xml b/app/src/main/res/drawable/selector_date_color.xml new file mode 100644 index 0000000..f0a4918 --- /dev/null +++ b/app/src/main/res/drawable/selector_date_color.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 627fa46..46ceda0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,4 +113,6 @@ //选择器 implementation 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.8' implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.8' + //图表 + implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c22d64a..a519f6e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -58,6 +58,7 @@ + (deviceId) } - //水汽量消耗 + //水气量消耗 gasConsumeLayout.setOnClickListener { - + requireContext().navigatePageTo(deviceId) } } 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 new file mode 100644 index 0000000..873a103 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt @@ -0,0 +1,58 @@ +package com.casic.br.view.device.waterheater + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_gas_consume.* +import kotlinx.android.synthetic.main.include_base_title.* + +class GasConsumeActivity : KotlinBaseActivity() { + + private val kTag = "GasConsumeActivity" + + override fun initLayoutView(): Int = R.layout.activity_gas_consume + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "水气量消耗" + } + + override fun initData() { + //默认选中 + dateRadioGroup.check(R.id.dayRadioButton) + setLineChartData() + } + + override fun initEvent() { + dateRadioGroup.setOnCheckedChangeListener { _, checkedId -> + when (checkedId) { + R.id.dayRadioButton -> { + + } + R.id.monthRadioButton -> { + + } + R.id.yearRadioButton -> { + + } + } + setLineChartData() + } + } + + /** + * 设置温度范围 + * */ + private fun setLineChartData() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt index 9c64a9f..edac8d1 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt @@ -3,18 +3,19 @@ import android.graphics.Color import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.SliderCallback import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.qmuiteam.qmui.widget.QMUISlider import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_once_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* import kotlin.math.abs class OnceConfigActivity : KotlinBaseActivity() { @@ -63,7 +64,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "单次参数设置" } diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt index 3d4287d..25f89bc 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt @@ -6,16 +6,17 @@ import com.alibaba.fastjson.JSONObject import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.TuyaDeviceListener import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_time_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* class TimeConfigActivity : KotlinBaseActivity() { @@ -30,7 +31,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "预约时间设定" } diff --git a/app/src/main/res/drawable/ic_date_left.xml b/app/src/main/res/drawable/ic_date_left.xml new file mode 100644 index 0000000..3bcd8f5 --- /dev/null +++ b/app/src/main/res/drawable/ic_date_left.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas.xml b/app/src/main/res/drawable/ic_gas.xml new file mode 100644 index 0000000..01edafd --- /dev/null +++ b/app/src/main/res/drawable/ic_gas.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas_selected.xml b/app/src/main/res/drawable/ic_gas_selected.xml new file mode 100644 index 0000000..5bb890b --- /dev/null +++ b/app/src/main/res/drawable/ic_gas_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_water.xml b/app/src/main/res/drawable/ic_water.xml new file mode 100644 index 0000000..fb175a1 --- /dev/null +++ b/app/src/main/res/drawable/ic_water.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_water_selected.xml b/app/src/main/res/drawable/ic_water_selected.xml new file mode 100644 index 0000000..f07e248 --- /dev/null +++ b/app/src/main/res/drawable/ic_water_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/selector_clear_gas_check_box.xml b/app/src/main/res/drawable/selector_clear_gas_check_box.xml new file mode 100644 index 0000000..8654938 --- /dev/null +++ b/app/src/main/res/drawable/selector_clear_gas_check_box.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_clear_water_check_box.xml b/app/src/main/res/drawable/selector_clear_water_check_box.xml new file mode 100644 index 0000000..c9ee9e9 --- /dev/null +++ b/app/src/main/res/drawable/selector_clear_water_check_box.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_date_color.xml b/app/src/main/res/drawable/selector_date_color.xml new file mode 100644 index 0000000..f0a4918 --- /dev/null +++ b/app/src/main/res/drawable/selector_date_color.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_date_radio_button.xml b/app/src/main/res/drawable/selector_date_radio_button.xml new file mode 100644 index 0000000..5f43ab8 --- /dev/null +++ b/app/src/main/res/drawable/selector_date_radio_button.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 627fa46..46ceda0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,4 +113,6 @@ //选择器 implementation 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.8' implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.8' + //图表 + implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c22d64a..a519f6e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -58,6 +58,7 @@ + (deviceId) } - //水汽量消耗 + //水气量消耗 gasConsumeLayout.setOnClickListener { - + requireContext().navigatePageTo(deviceId) } } 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 new file mode 100644 index 0000000..873a103 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt @@ -0,0 +1,58 @@ +package com.casic.br.view.device.waterheater + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_gas_consume.* +import kotlinx.android.synthetic.main.include_base_title.* + +class GasConsumeActivity : KotlinBaseActivity() { + + private val kTag = "GasConsumeActivity" + + override fun initLayoutView(): Int = R.layout.activity_gas_consume + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "水气量消耗" + } + + override fun initData() { + //默认选中 + dateRadioGroup.check(R.id.dayRadioButton) + setLineChartData() + } + + override fun initEvent() { + dateRadioGroup.setOnCheckedChangeListener { _, checkedId -> + when (checkedId) { + R.id.dayRadioButton -> { + + } + R.id.monthRadioButton -> { + + } + R.id.yearRadioButton -> { + + } + } + setLineChartData() + } + } + + /** + * 设置温度范围 + * */ + private fun setLineChartData() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt index 9c64a9f..edac8d1 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt @@ -3,18 +3,19 @@ import android.graphics.Color import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.SliderCallback import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.qmuiteam.qmui.widget.QMUISlider import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_once_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* import kotlin.math.abs class OnceConfigActivity : KotlinBaseActivity() { @@ -63,7 +64,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "单次参数设置" } diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt index 3d4287d..25f89bc 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt @@ -6,16 +6,17 @@ import com.alibaba.fastjson.JSONObject import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.TuyaDeviceListener import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_time_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* class TimeConfigActivity : KotlinBaseActivity() { @@ -30,7 +31,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "预约时间设定" } diff --git a/app/src/main/res/drawable/ic_date_left.xml b/app/src/main/res/drawable/ic_date_left.xml new file mode 100644 index 0000000..3bcd8f5 --- /dev/null +++ b/app/src/main/res/drawable/ic_date_left.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas.xml b/app/src/main/res/drawable/ic_gas.xml new file mode 100644 index 0000000..01edafd --- /dev/null +++ b/app/src/main/res/drawable/ic_gas.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas_selected.xml b/app/src/main/res/drawable/ic_gas_selected.xml new file mode 100644 index 0000000..5bb890b --- /dev/null +++ b/app/src/main/res/drawable/ic_gas_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_water.xml b/app/src/main/res/drawable/ic_water.xml new file mode 100644 index 0000000..fb175a1 --- /dev/null +++ b/app/src/main/res/drawable/ic_water.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_water_selected.xml b/app/src/main/res/drawable/ic_water_selected.xml new file mode 100644 index 0000000..f07e248 --- /dev/null +++ b/app/src/main/res/drawable/ic_water_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/selector_clear_gas_check_box.xml b/app/src/main/res/drawable/selector_clear_gas_check_box.xml new file mode 100644 index 0000000..8654938 --- /dev/null +++ b/app/src/main/res/drawable/selector_clear_gas_check_box.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_clear_water_check_box.xml b/app/src/main/res/drawable/selector_clear_water_check_box.xml new file mode 100644 index 0000000..c9ee9e9 --- /dev/null +++ b/app/src/main/res/drawable/selector_clear_water_check_box.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_date_color.xml b/app/src/main/res/drawable/selector_date_color.xml new file mode 100644 index 0000000..f0a4918 --- /dev/null +++ b/app/src/main/res/drawable/selector_date_color.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_date_radio_button.xml b/app/src/main/res/drawable/selector_date_radio_button.xml new file mode 100644 index 0000000..5f43ab8 --- /dev/null +++ b/app/src/main/res/drawable/selector_date_radio_button.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_add_time_config.xml b/app/src/main/res/layout/activity_add_time_config.xml index cac2610..d647d1a 100644 --- a/app/src/main/res/layout/activity_add_time_config.xml +++ b/app/src/main/res/layout/activity_add_time_config.xml @@ -2,7 +2,6 @@ diff --git a/app/build.gradle b/app/build.gradle index 627fa46..46ceda0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,4 +113,6 @@ //选择器 implementation 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.8' implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.8' + //图表 + implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c22d64a..a519f6e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -58,6 +58,7 @@ + (deviceId) } - //水汽量消耗 + //水气量消耗 gasConsumeLayout.setOnClickListener { - + requireContext().navigatePageTo(deviceId) } } 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 new file mode 100644 index 0000000..873a103 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt @@ -0,0 +1,58 @@ +package com.casic.br.view.device.waterheater + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_gas_consume.* +import kotlinx.android.synthetic.main.include_base_title.* + +class GasConsumeActivity : KotlinBaseActivity() { + + private val kTag = "GasConsumeActivity" + + override fun initLayoutView(): Int = R.layout.activity_gas_consume + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "水气量消耗" + } + + override fun initData() { + //默认选中 + dateRadioGroup.check(R.id.dayRadioButton) + setLineChartData() + } + + override fun initEvent() { + dateRadioGroup.setOnCheckedChangeListener { _, checkedId -> + when (checkedId) { + R.id.dayRadioButton -> { + + } + R.id.monthRadioButton -> { + + } + R.id.yearRadioButton -> { + + } + } + setLineChartData() + } + } + + /** + * 设置温度范围 + * */ + private fun setLineChartData() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt index 9c64a9f..edac8d1 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt @@ -3,18 +3,19 @@ import android.graphics.Color import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.SliderCallback import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.qmuiteam.qmui.widget.QMUISlider import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_once_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* import kotlin.math.abs class OnceConfigActivity : KotlinBaseActivity() { @@ -63,7 +64,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "单次参数设置" } diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt index 3d4287d..25f89bc 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt @@ -6,16 +6,17 @@ import com.alibaba.fastjson.JSONObject import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.TuyaDeviceListener import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_time_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* class TimeConfigActivity : KotlinBaseActivity() { @@ -30,7 +31,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "预约时间设定" } diff --git a/app/src/main/res/drawable/ic_date_left.xml b/app/src/main/res/drawable/ic_date_left.xml new file mode 100644 index 0000000..3bcd8f5 --- /dev/null +++ b/app/src/main/res/drawable/ic_date_left.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas.xml b/app/src/main/res/drawable/ic_gas.xml new file mode 100644 index 0000000..01edafd --- /dev/null +++ b/app/src/main/res/drawable/ic_gas.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas_selected.xml b/app/src/main/res/drawable/ic_gas_selected.xml new file mode 100644 index 0000000..5bb890b --- /dev/null +++ b/app/src/main/res/drawable/ic_gas_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_water.xml b/app/src/main/res/drawable/ic_water.xml new file mode 100644 index 0000000..fb175a1 --- /dev/null +++ b/app/src/main/res/drawable/ic_water.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_water_selected.xml b/app/src/main/res/drawable/ic_water_selected.xml new file mode 100644 index 0000000..f07e248 --- /dev/null +++ b/app/src/main/res/drawable/ic_water_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/selector_clear_gas_check_box.xml b/app/src/main/res/drawable/selector_clear_gas_check_box.xml new file mode 100644 index 0000000..8654938 --- /dev/null +++ b/app/src/main/res/drawable/selector_clear_gas_check_box.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_clear_water_check_box.xml b/app/src/main/res/drawable/selector_clear_water_check_box.xml new file mode 100644 index 0000000..c9ee9e9 --- /dev/null +++ b/app/src/main/res/drawable/selector_clear_water_check_box.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_date_color.xml b/app/src/main/res/drawable/selector_date_color.xml new file mode 100644 index 0000000..f0a4918 --- /dev/null +++ b/app/src/main/res/drawable/selector_date_color.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_date_radio_button.xml b/app/src/main/res/drawable/selector_date_radio_button.xml new file mode 100644 index 0000000..5f43ab8 --- /dev/null +++ b/app/src/main/res/drawable/selector_date_radio_button.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_add_time_config.xml b/app/src/main/res/layout/activity_add_time_config.xml index cac2610..d647d1a 100644 --- a/app/src/main/res/layout/activity_add_time_config.xml +++ b/app/src/main/res/layout/activity_add_time_config.xml @@ -2,7 +2,6 @@ diff --git a/app/src/main/res/layout/activity_gas_consume.xml b/app/src/main/res/layout/activity_gas_consume.xml new file mode 100644 index 0000000..db9526b --- /dev/null +++ b/app/src/main/res/layout/activity_gas_consume.xml @@ -0,0 +1,265 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 627fa46..46ceda0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,4 +113,6 @@ //选择器 implementation 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.8' implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.8' + //图表 + implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c22d64a..a519f6e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -58,6 +58,7 @@ + (deviceId) } - //水汽量消耗 + //水气量消耗 gasConsumeLayout.setOnClickListener { - + requireContext().navigatePageTo(deviceId) } } 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 new file mode 100644 index 0000000..873a103 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt @@ -0,0 +1,58 @@ +package com.casic.br.view.device.waterheater + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_gas_consume.* +import kotlinx.android.synthetic.main.include_base_title.* + +class GasConsumeActivity : KotlinBaseActivity() { + + private val kTag = "GasConsumeActivity" + + override fun initLayoutView(): Int = R.layout.activity_gas_consume + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "水气量消耗" + } + + override fun initData() { + //默认选中 + dateRadioGroup.check(R.id.dayRadioButton) + setLineChartData() + } + + override fun initEvent() { + dateRadioGroup.setOnCheckedChangeListener { _, checkedId -> + when (checkedId) { + R.id.dayRadioButton -> { + + } + R.id.monthRadioButton -> { + + } + R.id.yearRadioButton -> { + + } + } + setLineChartData() + } + } + + /** + * 设置温度范围 + * */ + private fun setLineChartData() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt index 9c64a9f..edac8d1 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt @@ -3,18 +3,19 @@ import android.graphics.Color import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.SliderCallback import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.qmuiteam.qmui.widget.QMUISlider import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_once_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* import kotlin.math.abs class OnceConfigActivity : KotlinBaseActivity() { @@ -63,7 +64,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "单次参数设置" } diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt index 3d4287d..25f89bc 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt @@ -6,16 +6,17 @@ import com.alibaba.fastjson.JSONObject import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.TuyaDeviceListener import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_time_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* class TimeConfigActivity : KotlinBaseActivity() { @@ -30,7 +31,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "预约时间设定" } diff --git a/app/src/main/res/drawable/ic_date_left.xml b/app/src/main/res/drawable/ic_date_left.xml new file mode 100644 index 0000000..3bcd8f5 --- /dev/null +++ b/app/src/main/res/drawable/ic_date_left.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas.xml b/app/src/main/res/drawable/ic_gas.xml new file mode 100644 index 0000000..01edafd --- /dev/null +++ b/app/src/main/res/drawable/ic_gas.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas_selected.xml b/app/src/main/res/drawable/ic_gas_selected.xml new file mode 100644 index 0000000..5bb890b --- /dev/null +++ b/app/src/main/res/drawable/ic_gas_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_water.xml b/app/src/main/res/drawable/ic_water.xml new file mode 100644 index 0000000..fb175a1 --- /dev/null +++ b/app/src/main/res/drawable/ic_water.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_water_selected.xml b/app/src/main/res/drawable/ic_water_selected.xml new file mode 100644 index 0000000..f07e248 --- /dev/null +++ b/app/src/main/res/drawable/ic_water_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/selector_clear_gas_check_box.xml b/app/src/main/res/drawable/selector_clear_gas_check_box.xml new file mode 100644 index 0000000..8654938 --- /dev/null +++ b/app/src/main/res/drawable/selector_clear_gas_check_box.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_clear_water_check_box.xml b/app/src/main/res/drawable/selector_clear_water_check_box.xml new file mode 100644 index 0000000..c9ee9e9 --- /dev/null +++ b/app/src/main/res/drawable/selector_clear_water_check_box.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_date_color.xml b/app/src/main/res/drawable/selector_date_color.xml new file mode 100644 index 0000000..f0a4918 --- /dev/null +++ b/app/src/main/res/drawable/selector_date_color.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_date_radio_button.xml b/app/src/main/res/drawable/selector_date_radio_button.xml new file mode 100644 index 0000000..5f43ab8 --- /dev/null +++ b/app/src/main/res/drawable/selector_date_radio_button.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_add_time_config.xml b/app/src/main/res/layout/activity_add_time_config.xml index cac2610..d647d1a 100644 --- a/app/src/main/res/layout/activity_add_time_config.xml +++ b/app/src/main/res/layout/activity_add_time_config.xml @@ -2,7 +2,6 @@ diff --git a/app/src/main/res/layout/activity_gas_consume.xml b/app/src/main/res/layout/activity_gas_consume.xml new file mode 100644 index 0000000..db9526b --- /dev/null +++ b/app/src/main/res/layout/activity_gas_consume.xml @@ -0,0 +1,265 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_once_config.xml b/app/src/main/res/layout/activity_once_config.xml index 49a370e..dc0e742 100644 --- a/app/src/main/res/layout/activity_once_config.xml +++ b/app/src/main/res/layout/activity_once_config.xml @@ -4,10 +4,9 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@mipmap/common_bkg" android:orientation="vertical"> - + + (deviceId) } - //水汽量消耗 + //水气量消耗 gasConsumeLayout.setOnClickListener { - + requireContext().navigatePageTo(deviceId) } } 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 new file mode 100644 index 0000000..873a103 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt @@ -0,0 +1,58 @@ +package com.casic.br.view.device.waterheater + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_gas_consume.* +import kotlinx.android.synthetic.main.include_base_title.* + +class GasConsumeActivity : KotlinBaseActivity() { + + private val kTag = "GasConsumeActivity" + + override fun initLayoutView(): Int = R.layout.activity_gas_consume + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "水气量消耗" + } + + override fun initData() { + //默认选中 + dateRadioGroup.check(R.id.dayRadioButton) + setLineChartData() + } + + override fun initEvent() { + dateRadioGroup.setOnCheckedChangeListener { _, checkedId -> + when (checkedId) { + R.id.dayRadioButton -> { + + } + R.id.monthRadioButton -> { + + } + R.id.yearRadioButton -> { + + } + } + setLineChartData() + } + } + + /** + * 设置温度范围 + * */ + private fun setLineChartData() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt index 9c64a9f..edac8d1 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt @@ -3,18 +3,19 @@ import android.graphics.Color import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.SliderCallback import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.qmuiteam.qmui.widget.QMUISlider import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_once_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* import kotlin.math.abs class OnceConfigActivity : KotlinBaseActivity() { @@ -63,7 +64,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "单次参数设置" } diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt index 3d4287d..25f89bc 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt @@ -6,16 +6,17 @@ import com.alibaba.fastjson.JSONObject import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.TuyaDeviceListener import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_time_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* class TimeConfigActivity : KotlinBaseActivity() { @@ -30,7 +31,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "预约时间设定" } diff --git a/app/src/main/res/drawable/ic_date_left.xml b/app/src/main/res/drawable/ic_date_left.xml new file mode 100644 index 0000000..3bcd8f5 --- /dev/null +++ b/app/src/main/res/drawable/ic_date_left.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas.xml b/app/src/main/res/drawable/ic_gas.xml new file mode 100644 index 0000000..01edafd --- /dev/null +++ b/app/src/main/res/drawable/ic_gas.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas_selected.xml b/app/src/main/res/drawable/ic_gas_selected.xml new file mode 100644 index 0000000..5bb890b --- /dev/null +++ b/app/src/main/res/drawable/ic_gas_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_water.xml b/app/src/main/res/drawable/ic_water.xml new file mode 100644 index 0000000..fb175a1 --- /dev/null +++ b/app/src/main/res/drawable/ic_water.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_water_selected.xml b/app/src/main/res/drawable/ic_water_selected.xml new file mode 100644 index 0000000..f07e248 --- /dev/null +++ b/app/src/main/res/drawable/ic_water_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/selector_clear_gas_check_box.xml b/app/src/main/res/drawable/selector_clear_gas_check_box.xml new file mode 100644 index 0000000..8654938 --- /dev/null +++ b/app/src/main/res/drawable/selector_clear_gas_check_box.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_clear_water_check_box.xml b/app/src/main/res/drawable/selector_clear_water_check_box.xml new file mode 100644 index 0000000..c9ee9e9 --- /dev/null +++ b/app/src/main/res/drawable/selector_clear_water_check_box.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_date_color.xml b/app/src/main/res/drawable/selector_date_color.xml new file mode 100644 index 0000000..f0a4918 --- /dev/null +++ b/app/src/main/res/drawable/selector_date_color.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_date_radio_button.xml b/app/src/main/res/drawable/selector_date_radio_button.xml new file mode 100644 index 0000000..5f43ab8 --- /dev/null +++ b/app/src/main/res/drawable/selector_date_radio_button.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_add_time_config.xml b/app/src/main/res/layout/activity_add_time_config.xml index cac2610..d647d1a 100644 --- a/app/src/main/res/layout/activity_add_time_config.xml +++ b/app/src/main/res/layout/activity_add_time_config.xml @@ -2,7 +2,6 @@ diff --git a/app/src/main/res/layout/activity_gas_consume.xml b/app/src/main/res/layout/activity_gas_consume.xml new file mode 100644 index 0000000..db9526b --- /dev/null +++ b/app/src/main/res/layout/activity_gas_consume.xml @@ -0,0 +1,265 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_once_config.xml b/app/src/main/res/layout/activity_once_config.xml index 49a370e..dc0e742 100644 --- a/app/src/main/res/layout/activity_once_config.xml +++ b/app/src/main/res/layout/activity_once_config.xml @@ -4,10 +4,9 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@mipmap/common_bkg" android:orientation="vertical"> - + - + + (deviceId) } - //水汽量消耗 + //水气量消耗 gasConsumeLayout.setOnClickListener { - + requireContext().navigatePageTo(deviceId) } } 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 new file mode 100644 index 0000000..873a103 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt @@ -0,0 +1,58 @@ +package com.casic.br.view.device.waterheater + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_gas_consume.* +import kotlinx.android.synthetic.main.include_base_title.* + +class GasConsumeActivity : KotlinBaseActivity() { + + private val kTag = "GasConsumeActivity" + + override fun initLayoutView(): Int = R.layout.activity_gas_consume + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "水气量消耗" + } + + override fun initData() { + //默认选中 + dateRadioGroup.check(R.id.dayRadioButton) + setLineChartData() + } + + override fun initEvent() { + dateRadioGroup.setOnCheckedChangeListener { _, checkedId -> + when (checkedId) { + R.id.dayRadioButton -> { + + } + R.id.monthRadioButton -> { + + } + R.id.yearRadioButton -> { + + } + } + setLineChartData() + } + } + + /** + * 设置温度范围 + * */ + private fun setLineChartData() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt index 9c64a9f..edac8d1 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt @@ -3,18 +3,19 @@ import android.graphics.Color import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.SliderCallback import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.qmuiteam.qmui.widget.QMUISlider import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_once_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* import kotlin.math.abs class OnceConfigActivity : KotlinBaseActivity() { @@ -63,7 +64,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "单次参数设置" } diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt index 3d4287d..25f89bc 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt @@ -6,16 +6,17 @@ import com.alibaba.fastjson.JSONObject import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.TuyaDeviceListener import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_time_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* class TimeConfigActivity : KotlinBaseActivity() { @@ -30,7 +31,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "预约时间设定" } diff --git a/app/src/main/res/drawable/ic_date_left.xml b/app/src/main/res/drawable/ic_date_left.xml new file mode 100644 index 0000000..3bcd8f5 --- /dev/null +++ b/app/src/main/res/drawable/ic_date_left.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas.xml b/app/src/main/res/drawable/ic_gas.xml new file mode 100644 index 0000000..01edafd --- /dev/null +++ b/app/src/main/res/drawable/ic_gas.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas_selected.xml b/app/src/main/res/drawable/ic_gas_selected.xml new file mode 100644 index 0000000..5bb890b --- /dev/null +++ b/app/src/main/res/drawable/ic_gas_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_water.xml b/app/src/main/res/drawable/ic_water.xml new file mode 100644 index 0000000..fb175a1 --- /dev/null +++ b/app/src/main/res/drawable/ic_water.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_water_selected.xml b/app/src/main/res/drawable/ic_water_selected.xml new file mode 100644 index 0000000..f07e248 --- /dev/null +++ b/app/src/main/res/drawable/ic_water_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/selector_clear_gas_check_box.xml b/app/src/main/res/drawable/selector_clear_gas_check_box.xml new file mode 100644 index 0000000..8654938 --- /dev/null +++ b/app/src/main/res/drawable/selector_clear_gas_check_box.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_clear_water_check_box.xml b/app/src/main/res/drawable/selector_clear_water_check_box.xml new file mode 100644 index 0000000..c9ee9e9 --- /dev/null +++ b/app/src/main/res/drawable/selector_clear_water_check_box.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_date_color.xml b/app/src/main/res/drawable/selector_date_color.xml new file mode 100644 index 0000000..f0a4918 --- /dev/null +++ b/app/src/main/res/drawable/selector_date_color.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_date_radio_button.xml b/app/src/main/res/drawable/selector_date_radio_button.xml new file mode 100644 index 0000000..5f43ab8 --- /dev/null +++ b/app/src/main/res/drawable/selector_date_radio_button.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_add_time_config.xml b/app/src/main/res/layout/activity_add_time_config.xml index cac2610..d647d1a 100644 --- a/app/src/main/res/layout/activity_add_time_config.xml +++ b/app/src/main/res/layout/activity_add_time_config.xml @@ -2,7 +2,6 @@ diff --git a/app/src/main/res/layout/activity_gas_consume.xml b/app/src/main/res/layout/activity_gas_consume.xml new file mode 100644 index 0000000..db9526b --- /dev/null +++ b/app/src/main/res/layout/activity_gas_consume.xml @@ -0,0 +1,265 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_once_config.xml b/app/src/main/res/layout/activity_once_config.xml index 49a370e..dc0e742 100644 --- a/app/src/main/res/layout/activity_once_config.xml +++ b/app/src/main/res/layout/activity_once_config.xml @@ -4,10 +4,9 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@mipmap/common_bkg" android:orientation="vertical"> - + - + + android:text="水气量消耗" /> diff --git a/app/build.gradle b/app/build.gradle index 627fa46..46ceda0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,4 +113,6 @@ //选择器 implementation 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.8' implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.8' + //图表 + implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c22d64a..a519f6e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -58,6 +58,7 @@ + (deviceId) } - //水汽量消耗 + //水气量消耗 gasConsumeLayout.setOnClickListener { - + requireContext().navigatePageTo(deviceId) } } 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 new file mode 100644 index 0000000..873a103 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt @@ -0,0 +1,58 @@ +package com.casic.br.view.device.waterheater + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_gas_consume.* +import kotlinx.android.synthetic.main.include_base_title.* + +class GasConsumeActivity : KotlinBaseActivity() { + + private val kTag = "GasConsumeActivity" + + override fun initLayoutView(): Int = R.layout.activity_gas_consume + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "水气量消耗" + } + + override fun initData() { + //默认选中 + dateRadioGroup.check(R.id.dayRadioButton) + setLineChartData() + } + + override fun initEvent() { + dateRadioGroup.setOnCheckedChangeListener { _, checkedId -> + when (checkedId) { + R.id.dayRadioButton -> { + + } + R.id.monthRadioButton -> { + + } + R.id.yearRadioButton -> { + + } + } + setLineChartData() + } + } + + /** + * 设置温度范围 + * */ + private fun setLineChartData() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt index 9c64a9f..edac8d1 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt @@ -3,18 +3,19 @@ import android.graphics.Color import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.SliderCallback import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.qmuiteam.qmui.widget.QMUISlider import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_once_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* import kotlin.math.abs class OnceConfigActivity : KotlinBaseActivity() { @@ -63,7 +64,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "单次参数设置" } diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt index 3d4287d..25f89bc 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt @@ -6,16 +6,17 @@ import com.alibaba.fastjson.JSONObject import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.TuyaDeviceListener import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_time_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* class TimeConfigActivity : KotlinBaseActivity() { @@ -30,7 +31,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "预约时间设定" } diff --git a/app/src/main/res/drawable/ic_date_left.xml b/app/src/main/res/drawable/ic_date_left.xml new file mode 100644 index 0000000..3bcd8f5 --- /dev/null +++ b/app/src/main/res/drawable/ic_date_left.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas.xml b/app/src/main/res/drawable/ic_gas.xml new file mode 100644 index 0000000..01edafd --- /dev/null +++ b/app/src/main/res/drawable/ic_gas.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas_selected.xml b/app/src/main/res/drawable/ic_gas_selected.xml new file mode 100644 index 0000000..5bb890b --- /dev/null +++ b/app/src/main/res/drawable/ic_gas_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_water.xml b/app/src/main/res/drawable/ic_water.xml new file mode 100644 index 0000000..fb175a1 --- /dev/null +++ b/app/src/main/res/drawable/ic_water.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_water_selected.xml b/app/src/main/res/drawable/ic_water_selected.xml new file mode 100644 index 0000000..f07e248 --- /dev/null +++ b/app/src/main/res/drawable/ic_water_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/selector_clear_gas_check_box.xml b/app/src/main/res/drawable/selector_clear_gas_check_box.xml new file mode 100644 index 0000000..8654938 --- /dev/null +++ b/app/src/main/res/drawable/selector_clear_gas_check_box.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_clear_water_check_box.xml b/app/src/main/res/drawable/selector_clear_water_check_box.xml new file mode 100644 index 0000000..c9ee9e9 --- /dev/null +++ b/app/src/main/res/drawable/selector_clear_water_check_box.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_date_color.xml b/app/src/main/res/drawable/selector_date_color.xml new file mode 100644 index 0000000..f0a4918 --- /dev/null +++ b/app/src/main/res/drawable/selector_date_color.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_date_radio_button.xml b/app/src/main/res/drawable/selector_date_radio_button.xml new file mode 100644 index 0000000..5f43ab8 --- /dev/null +++ b/app/src/main/res/drawable/selector_date_radio_button.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_add_time_config.xml b/app/src/main/res/layout/activity_add_time_config.xml index cac2610..d647d1a 100644 --- a/app/src/main/res/layout/activity_add_time_config.xml +++ b/app/src/main/res/layout/activity_add_time_config.xml @@ -2,7 +2,6 @@ diff --git a/app/src/main/res/layout/activity_gas_consume.xml b/app/src/main/res/layout/activity_gas_consume.xml new file mode 100644 index 0000000..db9526b --- /dev/null +++ b/app/src/main/res/layout/activity_gas_consume.xml @@ -0,0 +1,265 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_once_config.xml b/app/src/main/res/layout/activity_once_config.xml index 49a370e..dc0e742 100644 --- a/app/src/main/res/layout/activity_once_config.xml +++ b/app/src/main/res/layout/activity_once_config.xml @@ -4,10 +4,9 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@mipmap/common_bkg" android:orientation="vertical"> - + - + + android:text="水气量消耗" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 180e301..589ee16 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,5 +2,6 @@ 智慧厨房 中国航天科工集团 °C + m³ 未知 \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 627fa46..46ceda0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,4 +113,6 @@ //选择器 implementation 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.8' implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.8' + //图表 + implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c22d64a..a519f6e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -58,6 +58,7 @@ + (deviceId) } - //水汽量消耗 + //水气量消耗 gasConsumeLayout.setOnClickListener { - + requireContext().navigatePageTo(deviceId) } } 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 new file mode 100644 index 0000000..873a103 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/device/waterheater/GasConsumeActivity.kt @@ -0,0 +1,58 @@ +package com.casic.br.view.device.waterheater + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_gas_consume.* +import kotlinx.android.synthetic.main.include_base_title.* + +class GasConsumeActivity : KotlinBaseActivity() { + + private val kTag = "GasConsumeActivity" + + override fun initLayoutView(): Int = R.layout.activity_gas_consume + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "水气量消耗" + } + + override fun initData() { + //默认选中 + dateRadioGroup.check(R.id.dayRadioButton) + setLineChartData() + } + + override fun initEvent() { + dateRadioGroup.setOnCheckedChangeListener { _, checkedId -> + when (checkedId) { + R.id.dayRadioButton -> { + + } + R.id.monthRadioButton -> { + + } + R.id.yearRadioButton -> { + + } + } + setLineChartData() + } + } + + /** + * 设置温度范围 + * */ + private fun setLineChartData() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt index 9c64a9f..edac8d1 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/OnceConfigActivity.kt @@ -3,18 +3,19 @@ import android.graphics.Color import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.SliderCallback import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.qmuiteam.qmui.widget.QMUISlider import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_once_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* import kotlin.math.abs class OnceConfigActivity : KotlinBaseActivity() { @@ -63,7 +64,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "单次参数设置" } diff --git a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt index 3d4287d..25f89bc 100644 --- a/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt +++ b/app/src/main/java/com/casic/br/view/device/waterheater/TimeConfigActivity.kt @@ -6,16 +6,17 @@ import com.alibaba.fastjson.JSONObject import com.casic.br.R import com.casic.br.extensions.createCommand -import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.CommandManager import com.casic.br.utils.TuyaDeviceListener import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.tuya.smart.home.sdk.TuyaHomeSdk import com.tuya.smart.sdk.api.ITuyaDevice import kotlinx.android.synthetic.main.activity_time_config.* -import kotlinx.android.synthetic.main.include_left_back_title.* +import kotlinx.android.synthetic.main.include_base_title.* class TimeConfigActivity : KotlinBaseActivity() { @@ -30,7 +31,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + leftBackView.setOnClickListener { finish() } titleView.text = "预约时间设定" } diff --git a/app/src/main/res/drawable/ic_date_left.xml b/app/src/main/res/drawable/ic_date_left.xml new file mode 100644 index 0000000..3bcd8f5 --- /dev/null +++ b/app/src/main/res/drawable/ic_date_left.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas.xml b/app/src/main/res/drawable/ic_gas.xml new file mode 100644 index 0000000..01edafd --- /dev/null +++ b/app/src/main/res/drawable/ic_gas.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_gas_selected.xml b/app/src/main/res/drawable/ic_gas_selected.xml new file mode 100644 index 0000000..5bb890b --- /dev/null +++ b/app/src/main/res/drawable/ic_gas_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_water.xml b/app/src/main/res/drawable/ic_water.xml new file mode 100644 index 0000000..fb175a1 --- /dev/null +++ b/app/src/main/res/drawable/ic_water.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_water_selected.xml b/app/src/main/res/drawable/ic_water_selected.xml new file mode 100644 index 0000000..f07e248 --- /dev/null +++ b/app/src/main/res/drawable/ic_water_selected.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/selector_clear_gas_check_box.xml b/app/src/main/res/drawable/selector_clear_gas_check_box.xml new file mode 100644 index 0000000..8654938 --- /dev/null +++ b/app/src/main/res/drawable/selector_clear_gas_check_box.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_clear_water_check_box.xml b/app/src/main/res/drawable/selector_clear_water_check_box.xml new file mode 100644 index 0000000..c9ee9e9 --- /dev/null +++ b/app/src/main/res/drawable/selector_clear_water_check_box.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_date_color.xml b/app/src/main/res/drawable/selector_date_color.xml new file mode 100644 index 0000000..f0a4918 --- /dev/null +++ b/app/src/main/res/drawable/selector_date_color.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_date_radio_button.xml b/app/src/main/res/drawable/selector_date_radio_button.xml new file mode 100644 index 0000000..5f43ab8 --- /dev/null +++ b/app/src/main/res/drawable/selector_date_radio_button.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_add_time_config.xml b/app/src/main/res/layout/activity_add_time_config.xml index cac2610..d647d1a 100644 --- a/app/src/main/res/layout/activity_add_time_config.xml +++ b/app/src/main/res/layout/activity_add_time_config.xml @@ -2,7 +2,6 @@ diff --git a/app/src/main/res/layout/activity_gas_consume.xml b/app/src/main/res/layout/activity_gas_consume.xml new file mode 100644 index 0000000..db9526b --- /dev/null +++ b/app/src/main/res/layout/activity_gas_consume.xml @@ -0,0 +1,265 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_once_config.xml b/app/src/main/res/layout/activity_once_config.xml index 49a370e..dc0e742 100644 --- a/app/src/main/res/layout/activity_once_config.xml +++ b/app/src/main/res/layout/activity_once_config.xml @@ -4,10 +4,9 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@mipmap/common_bkg" android:orientation="vertical"> - + - + + android:text="水气量消耗" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 180e301..589ee16 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,5 +2,6 @@ 智慧厨房 中国航天科工集团 °C + m³ 未知 \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index e64d0f3..73f5c35 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -84,4 +84,18 @@ 8dp 0.4 + +