From f14dcfd967404e197e7ec995ca8d6f2b090d3b7d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 11 九月 2020 09:16:59 +0800
Subject: [PATCH] 优化多功能面板：绑定温湿度传感器目标，和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp20200825/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
old mode 100644
new mode 100755
similarity index 97%
rename from ZigbeeApp20200825/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
index 3634974..87177a9
--- a/ZigbeeApp20200825/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
@@ -109,7 +109,7 @@
btnZhezhao.Radius = (uint)Application.GetRealHeight(17);
listBackControl.frameTable.AddChidren(btnZhezhao);
//鍒嗕韩鐨勬埧闂翠笉鑳界紪杈�
- if (this.editorRoom.IsSharedRoom == false)
+ if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsShowTemplate == false)
{
btnZhezhao.MouseUpEventHandler += (sender, e) =>
{
@@ -140,6 +140,7 @@
{
txtRoomName = new FrameCaptionInputControl(Language.StringByID(R.MyInternationalizationString.uRoomName), this.cloneRoom.Name, this.listview.rowSpace / 2);
txtRoomName.txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputRoomName);
+ txtRoomName.txtInput.MaxByte = 48;//闄愬埗鍙兘杈撳叆48涓瓧鑺�
listview.AddChidren(txtRoomName);
txtRoomName.InitControl();
//搴曠嚎
@@ -166,7 +167,7 @@
//搴曠嚎
btnBelone.AddBottomLine();
//鍒嗕韩鐨勬埧闂翠笉鑳戒慨鏀�
- if (this.editorRoom.IsSharedRoom == false)
+ if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsShowTemplate == false)
{
//鍙崇澶�
btnBelone.AddRightArrow();
@@ -188,7 +189,8 @@
//搴曠嚎
rowTemperature.AddBottomLine();
//鍒嗕韩鐨勬埧闂翠笉鑳戒慨鏀� 鎴栬�呭綋鍓嶄綇瀹呬笉鏄櫄鎷熺殑
- if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsVirtually == false)
+ if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsVirtually == false
+ && Common.Config.Instance.Home.IsShowTemplate == false)
{
rowTemperature.ButtonClickEvent += (sender, e) =>
{
@@ -196,7 +198,8 @@
this.ShowTemperatrueDevice(btnTemper);
};
}
- if (string.IsNullOrEmpty(cloneRoom.TemperatrueDevice) == false)
+ if (string.IsNullOrEmpty(cloneRoom.TemperatrueDevice) == false
+ && Common.Config.Instance.Home.IsShowTemplate == false)
{
//鑾峰彇娓╁害
this.GetTemperatrueValue(btnTemper, cloneRoom.TemperatrueDevice);
@@ -212,7 +215,8 @@
//搴曠嚎
rowHumidity.AddBottomLine();
//鍒嗕韩鐨勬埧闂翠笉鑳戒慨鏀� 鎴栬�呭綋鍓嶄綇瀹呬笉鏄櫄鎷熺殑
- if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsVirtually == false)
+ if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsVirtually == false
+ && Common.Config.Instance.Home.IsShowTemplate == false)
{
rowHumidity.ButtonClickEvent += (sender, e) =>
{
@@ -220,7 +224,8 @@
this.ShowHumidityDevice(btnHumi);
};
}
- if (string.IsNullOrEmpty(cloneRoom.HumidityDevice) == false)
+ if (string.IsNullOrEmpty(cloneRoom.HumidityDevice) == false
+ && Common.Config.Instance.Home.IsShowTemplate == false)
{
//鑾峰彇婀垮害
this.GetHumidityValue(btnHumi, cloneRoom.HumidityDevice);
@@ -231,7 +236,7 @@
tableContr = null;
//鍒嗕韩鐨勬埧闂翠笉鑳戒繚瀛�
- if (this.editorRoom.IsSharedRoom == true)
+ if (this.editorRoom.IsSharedRoom == true|| Common.Config.Instance.Home.IsShowTemplate == true)
{
return;
}
--
Gitblit v1.8.0