From a5b3c4bae726ef6770d4bfcbf2f4b50a37ed4a15 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 06 三月 2020 15:31:36 +0800
Subject: [PATCH] 删除了郭雪城的 DeviceUi 这个类
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs | 66 ++++++++++++++++++++------------
1 files changed, 41 insertions(+), 25 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
index c6e916c..8cb0a34 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
@@ -77,6 +77,8 @@
this.newRoom = new Common.Room();
newRoom.FloorId = this.floorKeys;
newRoom.BackgroundImage = btnPic.ImagePath;
+ newRoom.Humidity = -1000;
+ newRoom.Temperatrue = -1000;
//鍒濆鍖栨甯�
var tableContr = new InformationEditorControl();
@@ -178,18 +180,11 @@
}
newRoom.FloorId = this.floorKeys;
- var result = newRoom.AddRoom(newRoom);
- if (result == false)
- {
- //鎻愮ず鐢ㄦ埛娣诲姞澶辫触
- this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.FAIL));
- }
- else
- {
- this.FinishEditorEvent?.Invoke();
- this.CloseForm();
- }
+ HdlRoomLogic.Current.AddRoom(newRoom);
+ this.FinishEditorEvent?.Invoke();
+
+ this.CloseForm();
};
}
@@ -203,7 +198,7 @@
/// <param name="control"></param>
private void ShowSelectFloor(FrameCaptionViewControl control)
{
- var dicFloor = Common.Room.CurrentRoom.GetFloorSortList();
+ var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
var listKeys = new List<string>();
var listName = new List<string>();
@@ -277,8 +272,16 @@
{
return;
}
- //鑾峰彇涓�...
- btnTemper.Text = Language.StringByID(R.MyInternationalizationString.uGetting);
+ if (newRoom.Temperatrue == -1000)
+ {
+ //娌℃湁鑾峰彇寰楀埌杩囨俯搴�
+ btnTemper.Text = Language.StringByID(R.MyInternationalizationString.Getting);
+ }
+ else
+ {
+ btnTemper.Text = this.newRoom.Temperatrue == 0 ? "0.0鈩�" : this.newRoom.Temperatrue.ToString() + "鈩�";
+ btnTemper.Text += " " + Language.StringByID(R.MyInternationalizationString.Getting);
+ }
HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
HdlGatewayReceiveLogic.Current.AddAttributeEvent("TemperatrueDevice", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, ((report) =>
@@ -288,8 +291,6 @@
{
return;
}
- //绉婚櫎鎺変簨浠�
- HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
foreach (var data in report.DeviceStatusReport.AttriBute)
{
@@ -301,6 +302,7 @@
{
//0鈩�
btnTemper.Text = "0.0鈩�";
+ this.newRoom.Temperatrue = 0;
}
else if (data.AttriButeData > 32767)
{
@@ -308,14 +310,18 @@
string strValue = (data.AttriButeData - 65536).ToString();
//灏忔暟鐐归渶瑕佷竴浣�
strValue = strValue.Substring(0, strValue.Length - 1);
- btnTemper.Text = strValue.Insert(strValue.Length - 1, ".") + "鈩�";
+ //璁板綍娓╁害
+ this.newRoom.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+ btnTemper.Text = this.newRoom.Temperatrue.ToString() + "鈩�";
}
else
{
//灏忔暟鐐归渶瑕佷竴浣�
string strValue = data.AttriButeData.ToString();
strValue = strValue.Substring(0, strValue.Length - 1);
- btnTemper.Text = strValue.Insert(strValue.Length - 1, ".") + "鈩�";
+ //璁板綍娓╁害
+ this.newRoom.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+ btnTemper.Text = this.newRoom.Temperatrue.ToString() + "鈩�";
}
});
}
@@ -373,8 +379,16 @@
{
return;
}
- //鑾峰彇涓�...
- btnHumi.Text = Language.StringByID(R.MyInternationalizationString.uGetting);
+ if (newRoom.Humidity == -1000)
+ {
+ //娌℃湁鑾峰彇寰楀埌杩囨箍搴�
+ btnHumi.Text = Language.StringByID(R.MyInternationalizationString.Getting);
+ }
+ else
+ {
+ btnHumi.Text = this.newRoom.Humidity == 0 ? "0.0%" : this.newRoom.Humidity.ToString() + "%";
+ btnHumi.Text += " " + Language.StringByID(R.MyInternationalizationString.Getting);
+ }
HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
HdlGatewayReceiveLogic.Current.AddAttributeEvent("HumidityDevice", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
@@ -384,8 +398,6 @@
{
return;
}
- //绉婚櫎鎺変簨浠�
- HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
foreach (var data in report.DeviceStatusReport.AttriBute)
{
if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
@@ -396,13 +408,16 @@
{
//0
btnHumi.Text = "0.0%";
+ this.newRoom.Humidity = 0;
}
else
{
//灏忔暟鐐归渶瑕佷竴浣�(婀垮害娌℃湁璐熸暟)
string strValue = data.AttriButeData.ToString();
strValue = strValue.Substring(0, strValue.Length - 1);
- btnHumi.Text = strValue.Insert(strValue.Length - 1, ".") + "%";
+ //璁板綍婀垮害
+ this.newRoom.Humidity = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+ btnHumi.Text = this.newRoom.Humidity.ToString() + "%";
}
});
}
@@ -511,7 +526,8 @@
}
if (string.IsNullOrEmpty(this.floorKeys) == true)
{
- if (Shared.Common.Room.Lists.Find((obj) => obj.Name == this.newRoom.Name && obj.Id != this.newRoom.Id) != null)
+ var listRoom = HdlRoomLogic.Current.GetAllListRooms();
+ if (listRoom.Find((obj) => obj.Name == this.newRoom.Name && obj.Id != this.newRoom.Id) != null)
{
this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uRoomNameIsExist));
return false;
@@ -519,7 +535,7 @@
}
else
{
- var listRoom = Common.Room.CurrentRoom.GetFloorSortRoom(this.floorKeys);
+ var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(this.floorKeys);
if (listRoom.Find((obj) => obj.Name == this.newRoom.Name && obj.Id != this.newRoom.Id) != null)
{
this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uRoomNameIsExist));
--
Gitblit v1.8.0