From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs | 58 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
index 3634974..505ebc9 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
@@ -67,15 +67,11 @@
//鍔犱竴涓櫧鑹茶儗鏅�
var frameBack1 = new FrameLayout();
- frameBack1.Height = Application.GetRealHeight(450);
+ frameBack1.Height = Application.GetRealHeight(750);
frameBack1.Y = Application.GetRealHeight(196);
frameBack1.BackgroundColor = UserCenterColor.Current.White;
frameBack1.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
listBackControl.frameTable.AddChidren(frameBack1);
-
- //鍒濆鍖栦俊鎭甯�
- var tableContr = new InformationEditorControl();
- this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 1175);
//鎴块棿鍥剧墖搴曢儴闃村奖
var btnShadow = new PicViewControl(853, 593);
@@ -109,7 +105,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) =>
{
@@ -118,8 +114,9 @@
};
}
- //鍙樻洿涓�涓嬮偅涓櫧鑹茶儗鏅殑Y杞�,瀹冨埌鍥剧墖鐨勪腑闂翠綅缃�
- frameBack1.Y = btnPic.Y + btnPic.Height / 2;
+ //鍒濆鍖栦俊鎭甯�
+ var tableContr = new InformationEditorControl();
+ this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), bodyFrameLayout.Height - btnShadow.Bottom, false);
//娣诲姞鍏ㄩ儴鑿滃崟
this.AddAllMenuRow(tableContr, btnPic);
@@ -140,6 +137,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 +164,7 @@
//搴曠嚎
btnBelone.AddBottomLine();
//鍒嗕韩鐨勬埧闂翠笉鑳戒慨鏀�
- if (this.editorRoom.IsSharedRoom == false)
+ if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsShowTemplate == false)
{
//鍙崇澶�
btnBelone.AddRightArrow();
@@ -188,7 +186,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 +195,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 +212,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 +221,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 +233,7 @@
tableContr = null;
//鍒嗕韩鐨勬埧闂翠笉鑳戒繚瀛�
- if (this.editorRoom.IsSharedRoom == true)
+ if (this.editorRoom.IsSharedRoom == true|| Common.Config.Instance.Home.IsShowTemplate == true)
{
return;
}
@@ -262,7 +264,7 @@
Common.Global.DeleteFilebyHomeId(editorRoom.BackgroundImage);
}
//澶囦唤
- HdlAutoBackupLogic.DeleteFile(editorRoom.BackgroundImage);
+ HdlBackupLogic.Current.DeleteAutoBackFileStatu(editorRoom.BackgroundImage);
}
//鑷畾涔夊浘鐗�
if (cloneRoom.BackgroundImageType == 1 || cloneRoom.BackgroundImageType == 2)
@@ -273,7 +275,7 @@
Shared.IO.FileUtils.WriteFileByBytes(picFullName, btnPic.ImageBytes);
cloneRoom.BackgroundImage = picName;
//澶囦唤
- HdlAutoBackupLogic.AddOrEditorFile(picName);
+ HdlBackupLogic.Current.AddOrEditorAutoBackFileStatu(picName);
}
}
@@ -352,7 +354,7 @@
private void ShowTemperatrueDevice(NormalViewControl btnTemper)
{
var listDevice = new List<ZigBee.Device.CommonDevice>();
- foreach (var device in Common.LocalDevice.Current.listAllDevice)
+ foreach (var device in HdlDeviceCommonLogic.Current.listAllDevice)
{
//鑾峰彇娓╁害浼犳劅鍣�
if (device is ZigBee.Device.TemperatureSensor && ((ZigBee.Device.TemperatureSensor)device).SensorDiv == 1)
@@ -376,7 +378,7 @@
btnTemper.Text = Language.StringByID(R.MyInternationalizationString.uNothing);
return;
}
- cloneRoom.TemperatrueDevice = Common.LocalDevice.Current.GetDeviceMainKeys(list[0]);
+ cloneRoom.TemperatrueDevice = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(list[0]);
//鑾峰彇娓╁害鍊�
this.GetTemperatrueValue(btnTemper, cloneRoom.TemperatrueDevice);
};
@@ -389,7 +391,7 @@
/// <param name="deviceKey"></param>
private void GetTemperatrueValue(NormalViewControl btnTemper, string deviceKey)
{
- var device = Common.LocalDevice.Current.GetDevice(deviceKey);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKey);
if (device == null)
{
return;
@@ -401,14 +403,14 @@
HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
HdlGatewayReceiveLogic.Current.AddAttributeEvent("TemperatrueDevice", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, ((report) =>
{
- string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
+ string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(report);
if (cloneRoom.TemperatrueDevice != mainKeys || btnTemper == null
|| report.DeviceStatusReport.CluterID != 1026)
{
return;
}
receiveData = true;
- var localDevice = Common.LocalDevice.Current.GetDevice(mainKeys);
+ var localDevice = HdlDeviceCommonLogic.Current.GetDevice(mainKeys);
HdlThreadLogic.Current.RunMain(() =>
{
decimal temperatrue = (decimal)device.GetType().InvokeMember("currentTemperature", System.Reflection.BindingFlags.GetField, null, device, null);
@@ -431,7 +433,7 @@
{
//鍘昏幏鍙栬澶囧垪琛ㄧ殑淇℃伅
System.Threading.Thread.Sleep(1500);
- var result = Common.LocalDevice.Current.ReadDeviceEpointDeviceInfo(device);
+ var result = HdlDeviceCommonLogic.Current.ReadDeviceEpointDeviceInfo(device);
if (result != null)
{
device.AttributeStatus.Clear();
@@ -513,7 +515,7 @@
private void ShowHumidityDevice(NormalViewControl btnHumi)
{
var listDevice = new List<ZigBee.Device.CommonDevice>();
- foreach (var device in Common.LocalDevice.Current.listAllDevice)
+ foreach (var device in HdlDeviceCommonLogic.Current.listAllDevice)
{
//鑾峰彇婀垮害浼犳劅鍣�
if (device is ZigBee.Device.TemperatureSensor && ((ZigBee.Device.TemperatureSensor)device).SensorDiv == 2)
@@ -542,7 +544,7 @@
btnHumi.Text = Language.StringByID(R.MyInternationalizationString.uNothing);
return;
}
- cloneRoom.HumidityDevice = Common.LocalDevice.Current.GetDeviceMainKeys(list[0]);
+ cloneRoom.HumidityDevice = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(list[0]);
//鑾峰彇婀垮害鍊�
this.GetHumidityValue(btnHumi, cloneRoom.HumidityDevice);
};
@@ -555,7 +557,7 @@
/// <param name="deviceKey"></param>
private void GetHumidityValue(NormalViewControl btnHumi, string deviceKey)
{
- var device = Common.LocalDevice.Current.GetDevice(deviceKey);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKey);
if (device == null)
{
return;
@@ -567,14 +569,14 @@
HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
HdlGatewayReceiveLogic.Current.AddAttributeEvent("HumidityDevice", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
{
- string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
+ string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(report);
if (cloneRoom.HumidityDevice != mainKeys || btnHumi == null
|| report.DeviceStatusReport.CluterID != 1029)
{
return;
}
receiveData = true;
- var localDevice = Common.LocalDevice.Current.GetDevice(mainKeys);
+ var localDevice = HdlDeviceCommonLogic.Current.GetDevice(mainKeys);
HdlThreadLogic.Current.RunMain(() =>
{
decimal humidity = (decimal)localDevice.GetType().InvokeMember("currentHumidity", System.Reflection.BindingFlags.GetField, null, localDevice, null);
@@ -597,7 +599,7 @@
{
//鍘昏幏鍙栬澶囧垪琛ㄧ殑淇℃伅
System.Threading.Thread.Sleep(1500);
- var result = Common.LocalDevice.Current.ReadDeviceEpointDeviceInfo(device);
+ var result = HdlDeviceCommonLogic.Current.ReadDeviceEpointDeviceInfo(device);
if (result != null)
{
device.AttributeStatus.Clear();
--
Gitblit v1.8.0