From 134811c790a982d505567e2ba69b5de566410367 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 09 三月 2021 10:20:06 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into temp-wxr
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs
index 3f81d26..33c247f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs
@@ -42,10 +42,8 @@
/// </summary>
public override void InitFrameWhiteContent()
{
- base.SetTitleText(Language.StringByID(StringId.AirCleaner));
+ base.SetTitleText(Language.StringByID(StringId.WaterValve));
- ////娣诲姞绗簩绱㈠紩椤�
- //this.AddSecondPage();
//鍒濆鍖栫涓�涓储寮曢〉鐨勫唴瀹�
this.InitFrameWhiteContent1();
//鍒锋柊鐣岄潰鐘舵��
@@ -176,12 +174,12 @@
{
Application.RunOnMainThread(() =>
{
- var onoffStatu = device.status.Find((obj) => obj.key == FunctionAttributeKey.OnOff);
- var timeStatu = device.status.Find((obj) => obj.key == FunctionAttributeKey.TuyaWaterTime);
+ var onoffStatu = device.attributes.Find((obj) => obj.key == FunctionAttributeKey.OnOff);
+ var timeStatu = device.attributes.Find((obj) => obj.key == FunctionAttributeKey.TuyaWaterTime);
if (onoffStatu != null)
{
- if (onoffStatu.value.ToString() == "on")
+ if (onoffStatu.state == "on")
{
btnControlTip.TextID = StringId.ControllerOn;
}
@@ -193,7 +191,7 @@
}
if (timeStatu != null)
{
- int.TryParse(timeStatu.value, out waterRunningTime);
+ int.TryParse(timeStatu.state, out waterRunningTime);
}
RefreshTimeButton();
});
@@ -254,7 +252,8 @@
private void SetControlTime()
{
var timeControl = new BottomTimeSelectControl();
- timeControl.InitControl(0,0);
+ timeControl.RowCount = 3;
+ timeControl.InitControl(0,0,162);
timeControl.FinishEvent = (type,hours,min) => {
if (type == 1)//0:鍙栨秷锛�1:纭畾
{
--
Gitblit v1.8.0