From e1ac4ab0e68024e6289e0b11756962d662749b04 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 三月 2021 17:15:23 +0800
Subject: [PATCH] Revert "Merge branch 'WJC' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into WJC"
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs | 26 ++------------------------
1 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs
index 73e6c7a..89d188b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs
@@ -42,18 +42,12 @@
/// </summary>
public override void InitFrameWhiteContent()
{
- base.SetTitleText(Language.StringByID(StringId.WaterValve));
+ base.SetTitleText(Language.StringByID(StringId.AirCleaner));
//鍒濆鍖栫涓�涓储寮曢〉鐨勫唴瀹�
this.InitFrameWhiteContent1();
//鍒锋柊鐣岄潰鐘舵��
this.RefreshFormStatu();
- //璇诲彇鐘舵��
- new System.Threading.Thread(() =>
- {
- Control.Ins.ReadFunctionsInfo(new List<string>() { device.deviceId});
- })
- { IsBackground = true }.Start();
}
/// <summary>
@@ -110,21 +104,6 @@
btnTimeSet.ButtonClickEvent = (sender, e) => {
SetControlTime();
};
-
-
- var btnTimeSetTip = new NormalViewControl(300, 30, true)
- {
- Y = btnTimeSet.Bottom ,
- Gravity = Gravity.CenterHorizontal,
- TextAlignment = TextAlignment.Center,
- TextSize = CSS_FontSize.TextFontSize,
- //TextColor = 0x00000000,
- SelectedTextColor = CSS_Color.TextualColor,
- TextColor = CSS_Color.TextualColor,
- TextID = StringId.TimeSwitch,
- };
- FrameWhiteCentet1.AddChidren(btnTimeSetTip);
-
//寮�鍏冲浘鏍�
this.btnSwitch = new IconViewControl(40);
@@ -208,7 +187,7 @@
{
btnControlTip.TextID = StringId.ControllerNotOn;
}
- this.btnSwitch.IsSelected = this.btnPictrue.IsSelected = onoffStatu.state.ToString() == "on";
+ this.btnSwitch.IsSelected = this.btnPictrue.IsSelected = onoffStatu.value.ToString() == "on";
}
if (timeStatu != null)
{
@@ -273,7 +252,6 @@
private void SetControlTime()
{
var timeControl = new BottomTimeSelectControl();
- timeControl.RowCount = 5;
timeControl.InitControl(0,0);
timeControl.FinishEvent = (type,hours,min) => {
if (type == 1)//0:鍙栨秷锛�1:纭畾
--
Gitblit v1.8.0