From 3292b5b7fe6c14476df002d78bf186e80f2aab08 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 09:30:30 +0800
Subject: [PATCH] 2020-05-28-1
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs | 133 ++++++++++++++++++++++++++++++--------------
1 files changed, 90 insertions(+), 43 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
index c6e916c..36f760b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
@@ -18,7 +18,7 @@
/// <summary>
/// 鍒楄〃鎺т欢
/// </summary>
- private VerticalListControl listview = null;
+ private FrameListControl listview = null;
/// <summary>
/// 妤煎眰涓婚敭
/// </summary>
@@ -54,33 +54,60 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
+ var listBackControl = new VerticalFrameControl();
+ listBackControl.Height = bodyFrameLayout.Height;
+ bodyFrameLayout.AddChidren(listBackControl);
+
+ //鍔犱竴涓櫧鑹茶儗鏅�
+ var frameBack1 = new FrameLayout();
+ frameBack1.Height = Application.GetRealHeight(450);
+ 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);
+ btnShadow.Y = Application.GetRealHeight(58);
+ btnShadow.Gravity = Gravity.CenterHorizontal;
+ btnShadow.UnSelectedImagePath = "Room/RoomShadow.png";
+ listBackControl.frameTable.AddChidren(btnShadow);
//鎴块棿鍥剧墖
var btnPic = new ImageView();
btnPic.Y = Application.GetRealHeight(60);
- btnPic.Width = Application.GetMinRealAverage(887);
- btnPic.Height = Application.GetMinRealAverage(444);
+ btnPic.Width = this.GetPictrueRealSize(824);
+ btnPic.Height = this.GetPictrueRealSize(549);
btnPic.Radius = (uint)Application.GetRealHeight(17);
btnPic.Gravity = Gravity.CenterHorizontal;
- btnPic.ImagePath = "RoomIcon/0.JPG";
- bodyFrameLayout.AddChidren(btnPic);
- var btnShadow = new PicViewControl(916, 487);
- btnShadow.Y = btnPic.Y;
- btnShadow.Gravity = Gravity.CenterHorizontal;
- btnShadow.UnSelectedImagePath = "Room/RoomShadow.png";
- bodyFrameLayout.AddChidren(btnShadow);
- btnShadow.MouseUpEventHandler += (sender, e) =>
+ btnPic.ImagePath = "RoomIcon/0.jpg";
+ listBackControl.frameTable.AddChidren(btnPic);
+ //鍥剧墖閬僵
+ var btnZhezhao = new FrameLayout();
+ btnZhezhao.Width = btnPic.Width;
+ btnZhezhao.Height = btnPic.Height;
+ btnZhezhao.Y = btnPic.Y;
+ btnZhezhao.Gravity = Gravity.CenterHorizontal;
+ btnZhezhao.Radius = (uint)Application.GetRealHeight(17);
+ btnZhezhao.BackgroundColor = UserCenterColor.Current.PictrueZhezhaoColor;
+ listBackControl.frameTable.AddChidren(btnZhezhao);
+ btnZhezhao.MouseUpEventHandler += (sender, e) =>
{
//鎴块棿鍥剧墖閫夋嫨
this.RoomPictrueSelect(btnPic);
};
+ //鍙樻洿涓�涓嬮偅涓櫧鑹茶儗鏅殑Y杞�,瀹冨埌鍥剧墖鐨勪腑闂翠綅缃�
+ frameBack1.Y = btnPic.Y + btnPic.Height / 2;
+
this.newRoom = new Common.Room();
newRoom.FloorId = this.floorKeys;
newRoom.BackgroundImage = btnPic.ImagePath;
-
- //鍒濆鍖栨甯�
- var tableContr = new InformationEditorControl();
- this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 562, 1175);
+ newRoom.Humidity = -1000;
+ newRoom.Temperatrue = -1000;
//娣诲姞鍏ㄩ儴鑿滃崟
this.AddAllMenuRow(tableContr, btnPic);
@@ -152,7 +179,7 @@
};
//鍒濆鍖栨甯冨畬鎴�
- tableContr.FinishInitControl(bodyFrameLayout, this.listview);
+ tableContr.FinishInitControl();
tableContr = null;
//淇濆瓨
var btnFinish = new BottomClickButton();
@@ -178,18 +205,19 @@
}
newRoom.FloorId = this.floorKeys;
- var result = newRoom.AddRoom(newRoom);
- if (result == false)
+ if (newRoom.Humidity == -1000)
{
- //鎻愮ず鐢ㄦ埛娣诲姞澶辫触
- this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.FAIL));
+ newRoom.Humidity = 0;
}
- else
+ if (newRoom.Temperatrue == -1000)
{
- this.FinishEditorEvent?.Invoke();
+ newRoom.Temperatrue = 0;
+ }
- this.CloseForm();
- }
+ HdlRoomLogic.Current.AddRoom(newRoom);
+ this.FinishEditorEvent?.Invoke();
+
+ this.CloseForm();
};
}
@@ -203,7 +231,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 +305,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 +324,6 @@
{
return;
}
- //绉婚櫎鎺変簨浠�
- HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
foreach (var data in report.DeviceStatusReport.AttriBute)
{
@@ -301,6 +335,7 @@
{
//0鈩�
btnTemper.Text = "0.0鈩�";
+ this.newRoom.Temperatrue = 0;
}
else if (data.AttriButeData > 32767)
{
@@ -308,14 +343,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 +412,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 +431,6 @@
{
return;
}
- //绉婚櫎鎺変簨浠�
- HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
foreach (var data in report.DeviceStatusReport.AttriBute)
{
if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
@@ -396,13 +441,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() + "%";
}
});
}
@@ -427,11 +475,9 @@
//榛樿鍥惧簱
menuContr.AddMenu(Language.StringByID(R.MyInternationalizationString.LocalPicture), () =>
{
- var localPic = new Phone.Device.Room.AddRoomSelectPicByLocal();
- Shared.Phone.UserView.HomePage.Instance.AddChidren(localPic);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- localPic.Show();
- localPic.action = (imgPath) =>
+ var form = new SelectLocalRoomImageForm();
+ form.AddForm();
+ form.FinishSelectEvent = (imgPath) =>
{
if (string.IsNullOrEmpty(imgPath) == true)
{
@@ -511,7 +557,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 +566,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