From cc0d80c7d86c6d0167269b3408c4b30c24ce84e9 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 23 三月 2020 16:55:37 +0800
Subject: [PATCH] ？？？？？？？
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs | 191 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 137 insertions(+), 54 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
index 08fce6b..a849299 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
@@ -12,7 +12,7 @@
#region 鈻� 鍙橀噺澹版槑___________________________
/// <summary>
- /// 缁撴潫缂栬緫鍚嶇О鐨勪簨浠�
+ /// 缁撴潫缂栬緫鐨勪簨浠�
/// </summary>
public Action<string> FinishEditorEvent = null;
/// <summary>
@@ -42,8 +42,18 @@
/// <param name="i_editorRoom">缂栬緫鐨勬埧闂村璞�</param>
public void ShowForm(Common.Room i_editorRoom = null)
{
+ //寮勪竴鐐瑰垵濮嬪��
this.editorRoom = i_editorRoom;
- this.cloneRoom = i_editorRoom.CloneRoomClass();
+ this.cloneRoom = HdlRoomLogic.Current.CloneRoomClass(i_editorRoom);
+ if (i_editorRoom.HumidityDevice == string.Empty)
+ {
+ this.cloneRoom.Humidity = -1000;
+ }
+ if (i_editorRoom.TemperatrueDevice == string.Empty)
+ {
+ this.cloneRoom.Temperatrue = -1000;
+ }
+
//璁剧疆澶撮儴淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uEditorRoom));
@@ -59,18 +69,31 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
+ //鍔犱竴涓櫧鑹茶儗鏅�
+ 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);
+ bodyFrameLayout.AddChidren(frameBack1);
+
+ //鍒濆鍖栦俊鎭甯�
+ var tableContr = new InformationEditorControl();
+ this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 613, 1175);
+
+ //鎴块棿鍥剧墖搴曢儴闃村奖
+ var btnShadow = new PicViewControl(994, 588);
+ btnShadow.Y = Application.GetRealHeight(58);
+ btnShadow.Gravity = Gravity.CenterHorizontal;
+ btnShadow.UnSelectedImagePath = "Room/RoomShadow.png";
+ bodyFrameLayout.AddChidren(btnShadow);
//鎴块棿鍥剧墖
- var framePic = new FrameLayout();
- framePic.Y = Application.GetRealHeight(60);
- framePic.Width = Application.GetMinRealAverage(887);
- framePic.Height = Application.GetMinRealAverage(444);
- framePic.Gravity = Gravity.CenterHorizontal;
- framePic.Radius = (uint)Application.GetRealHeight(17);
- framePic.BackgroundColor = UserCenterColor.Current.BodyFrameLayout;
- bodyFrameLayout.AddChidren(framePic);
var btnPic = new ImageView();
+ btnPic.Y = Application.GetRealHeight(60);
+ btnPic.Width = Application.GetMinRealAverage(965);
+ btnPic.Height = Application.GetMinRealAverage(544);
btnPic.Radius = (uint)Application.GetRealHeight(17);
- framePic.AddChidren(btnPic);
+ btnPic.Gravity = Gravity.CenterHorizontal;
if (this.editorRoom.BackgroundImageType == 0)
{
btnPic.ImagePath = this.editorRoom.BackgroundImage;
@@ -79,22 +102,24 @@
{
btnPic.ImageBytes = Common.Global.ReadFileByHomeId(this.editorRoom.BackgroundImage);
}
- //鍦ㄤ笂闈㈡斁涓�灞傞槾褰�
- var btnPicBack = new FrameLayout();
- btnPicBack.Radius = (uint)Application.GetRealHeight(17);
- btnPicBack.BackgroundColor = 0x26000000;
- framePic.AddChidren(btnPicBack);
- btnPicBack.MouseUpEventHandler += (sender, e) =>
+ bodyFrameLayout.AddChidren(btnPic);
+ //鍥剧墖閬僵
+ var btnZhezhao = new FrameLayout();
+ btnZhezhao.Width = btnPic.Width;
+ btnZhezhao.Height = btnPic.Height;
+ btnZhezhao.Y = btnPic.Y;
+ btnZhezhao.Gravity = Gravity.CenterHorizontal;
+ btnZhezhao.Radius = btnPic.Radius;
+ bodyFrameLayout.AddChidren(btnZhezhao);
+ //鍒嗕韩鐨勬埧闂翠笉鑳戒慨鏀�
+ if (this.editorRoom.IsSharedRoom == false)
{
- //鎴块棿鍥剧墖閫夋嫨
- this.RoomPictrueSelect(btnPic);
- };
- //娣诲姞闃村奖鐗规晥
- framePic.SetViewShadow(true);
-
- //鍒濆鍖栨甯�
- var tableContr = new InformationEditorControl();
- this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 562, 1175);
+ btnZhezhao.MouseUpEventHandler += (sender, e) =>
+ {
+ //鎴块棿鍥剧墖閫夋嫨
+ this.RoomPictrueSelect(btnPic);
+ };
+ }
//娣诲姞鍏ㄩ儴鑿滃崟
this.AddAllMenuRow(tableContr, btnPic);
@@ -128,11 +153,15 @@
btnBelone.AddRightArrow();
//搴曠嚎
btnBelone.AddBottomLine();
- btnBelone.ButtonClickEvent += (sender, e) =>
+ //鍒嗕韩鐨勬埧闂翠笉鑳戒慨鏀�
+ if (this.editorRoom.IsSharedRoom == false)
{
- //妤煎眰閫夋嫨
- this.ShowSelectFloor(btnBelone);
- };
+ btnBelone.ButtonClickEvent += (sender, e) =>
+ {
+ //妤煎眰閫夋嫨
+ this.ShowSelectFloor(btnBelone);
+ };
+ }
}
//銆愭俯搴︺��
@@ -144,11 +173,15 @@
var btnTemper = rowTemperature.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uNothing), 300);
//搴曠嚎
rowTemperature.AddBottomLine();
- rowTemperature.ButtonClickEvent += (sender, e) =>
+ //鍒嗕韩鐨勬埧闂翠笉鑳戒慨鏀�
+ if (this.editorRoom.IsSharedRoom == false)
{
- //鏄剧ず娓╁害浼犳劅鍣ㄥ垪琛�
- this.ShowTemperatrueDevice(btnTemper);
- };
+ rowTemperature.ButtonClickEvent += (sender, e) =>
+ {
+ //鏄剧ず娓╁害浼犳劅鍣ㄥ垪琛�
+ this.ShowTemperatrueDevice(btnTemper);
+ };
+ }
if (string.IsNullOrEmpty(cloneRoom.TemperatrueDevice) == false)
{
//鑾峰彇娓╁害
@@ -164,11 +197,15 @@
var btnHumi = rowHumidity.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uNothing), 300);
//搴曠嚎
rowHumidity.AddBottomLine();
- rowHumidity.ButtonClickEvent += (sender, e) =>
+ //鍒嗕韩鐨勬埧闂翠笉鑳戒慨鏀�
+ if (this.editorRoom.IsSharedRoom == false)
{
- //鏄剧ず婀垮害浼犳劅鍣ㄥ垪琛�
- this.ShowHumidityDevice(btnHumi);
- };
+ rowHumidity.ButtonClickEvent += (sender, e) =>
+ {
+ //鏄剧ず婀垮害浼犳劅鍣ㄥ垪琛�
+ this.ShowHumidityDevice(btnHumi);
+ };
+ }
if (string.IsNullOrEmpty(cloneRoom.HumidityDevice) == false)
{
//鑾峰彇婀垮害
@@ -178,6 +215,13 @@
//鍒濆鍖栨甯冨畬鎴�
tableContr.FinishInitControl(bodyFrameLayout, this.listview);
tableContr = null;
+
+ //鍒嗕韩鐨勬埧闂翠笉鑳戒慨鏀�
+ if (this.editorRoom.IsSharedRoom == true)
+ {
+ return;
+ }
+
//淇濆瓨
var btnFinish = new BottomClickButton();
btnFinish.TextID = R.MyInternationalizationString.uSave;
@@ -216,15 +260,34 @@
}
}
+ bool changedFloor = editorRoom.FloorId != cloneRoom.FloorId;
editorRoom.FloorId = cloneRoom.FloorId;
editorRoom.Name = cloneRoom.Name;
editorRoom.HumidityDevice = cloneRoom.HumidityDevice;
+ if (cloneRoom.Humidity != -1000)
+ {
+ editorRoom.Humidity = cloneRoom.Humidity;
+ }
editorRoom.TemperatrueDevice = cloneRoom.TemperatrueDevice;
+ if (cloneRoom.Temperatrue != -1000)
+ {
+ editorRoom.Temperatrue = cloneRoom.Temperatrue;
+ }
editorRoom.BackgroundImage = cloneRoom.BackgroundImage;
editorRoom.BackgroundImageType = cloneRoom.BackgroundImageType;
editorRoom.Save();
FinishEditorEvent?.Invoke(this.editorRoom.Name);
+ if (changedFloor == false)
+ {
+ //鍒锋柊宸︽粦鐨勬埧闂村垪琛ㄧ晫闈㈢殑鎸囧畾鎴块棿鐨勪俊鎭�
+ MainPage.ListRoomViewFrom.Instance.RefreshRoomInfo(this.editorRoom);
+ }
+ else
+ {
+ //鍒锋柊宸︽粦鐨勬埧闂村垪琛ㄧ晫闈㈢殑鎴块棿鍒楄〃淇℃伅
+ MainPage.ListRoomViewFrom.Instance.RefreshListRoom();
+ }
this.CloseForm();
};
}
@@ -239,7 +302,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>();
@@ -313,8 +376,16 @@
{
return;
}
- //鑾峰彇涓�...
- btnTemper.Text = Language.StringByID(R.MyInternationalizationString.uGetting);
+ if (cloneRoom.Temperatrue == -1000)
+ {
+ //娌℃湁鑾峰彇寰楀埌杩囨俯搴�
+ btnTemper.Text = Language.StringByID(R.MyInternationalizationString.Getting);
+ }
+ else
+ {
+ btnTemper.Text = this.cloneRoom.Temperatrue == 0 ? "0.0鈩�" : this.cloneRoom.Temperatrue.ToString() + "鈩�";
+ btnTemper.Text += " " + Language.StringByID(R.MyInternationalizationString.Getting);
+ }
HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
HdlGatewayReceiveLogic.Current.AddAttributeEvent("TemperatrueDevice", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, ((report) =>
@@ -324,8 +395,6 @@
{
return;
}
- //绉婚櫎鎺変簨浠�
- HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
foreach (var data in report.DeviceStatusReport.AttriBute)
{
@@ -337,6 +406,7 @@
{
//0鈩�
btnTemper.Text = "0.0鈩�";
+ this.cloneRoom.Temperatrue = 0;
}
else if (data.AttriButeData > 32767)
{
@@ -344,14 +414,18 @@
string strValue = (data.AttriButeData - 65536).ToString();
//灏忔暟鐐归渶瑕佷竴浣�
strValue = strValue.Substring(0, strValue.Length - 1);
- btnTemper.Text = strValue.Insert(strValue.Length - 1, ".") + "鈩�";
+ //璁板綍娓╁害
+ this.cloneRoom.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+ btnTemper.Text = this.cloneRoom.Temperatrue.ToString() + "鈩�";
}
else
{
//灏忔暟鐐归渶瑕佷竴浣�
string strValue = data.AttriButeData.ToString();
strValue = strValue.Substring(0, strValue.Length - 1);
- btnTemper.Text = strValue.Insert(strValue.Length - 1, ".") + "鈩�";
+ //璁板綍娓╁害
+ this.cloneRoom.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+ btnTemper.Text = this.cloneRoom.Temperatrue.ToString() + "鈩�";
}
});
}
@@ -409,8 +483,16 @@
{
return;
}
- //鑾峰彇涓�...
- btnHumi.Text = Language.StringByID(R.MyInternationalizationString.uGetting);
+ if (cloneRoom.Humidity == -1000)
+ {
+ //娌℃湁鑾峰彇寰楀埌杩囨箍搴�
+ btnHumi.Text = Language.StringByID(R.MyInternationalizationString.Getting);
+ }
+ else
+ {
+ btnHumi.Text = this.cloneRoom.Humidity == 0 ? "0.0%" : this.cloneRoom.Humidity.ToString() + "%";
+ btnHumi.Text += " " + Language.StringByID(R.MyInternationalizationString.Getting);
+ }
HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
HdlGatewayReceiveLogic.Current.AddAttributeEvent("HumidityDevice", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
@@ -420,8 +502,6 @@
{
return;
}
- //绉婚櫎鎺変簨浠�
- HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
foreach (var data in report.DeviceStatusReport.AttriBute)
{
if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
@@ -432,13 +512,16 @@
{
//0
btnHumi.Text = "0.0%";
+ this.cloneRoom.Humidity = 0;
}
else
{
//灏忔暟鐐归渶瑕佷竴浣�(婀垮害娌℃湁璐熸暟)
string strValue = data.AttriButeData.ToString();
strValue = strValue.Substring(0, strValue.Length - 1);
- btnHumi.Text = strValue.Insert(strValue.Length - 1, ".") + "%";
+ //璁板綍婀垮害
+ this.cloneRoom.Humidity = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+ btnHumi.Text = this.cloneRoom.Humidity.ToString() + "%";
}
});
}
@@ -494,7 +577,7 @@
this.cloneRoom.BackgroundImageType = 1;
imageContr.ImageBytes = Shared.IO.FileUtils.ReadFile(imagePath);
System.IO.File.Delete(imagePath);
- }, "HdlPic", 2, 1);
+ }, "HdlPic", 16, 9);
});
//鎴戠殑鐩稿唽
menuContr.AddMenu(Language.StringByID(R.MyInternationalizationString.MyAblums), () =>
@@ -511,7 +594,7 @@
imageContr.ImageBytes = Shared.IO.FileUtils.ReadFile(imagePath);
System.IO.File.Delete(imagePath);
- }, "HdlPic", 2, 1);
+ }, "HdlPic", 16, 9);
});
}
@@ -550,7 +633,7 @@
}
if (string.IsNullOrEmpty(this.cloneRoom.FloorId) == true)
{
- if (Shared.Common.Room.Lists.Find((obj) => obj.Name == this.cloneRoom.Name && obj.Id != this.cloneRoom.Id) != null)
+ if (HdlRoomLogic.Current.GetAllListRooms().Find((obj) => obj.Name == this.cloneRoom.Name && obj.Id != this.cloneRoom.Id) != null)
{
this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.HadSameRoom));
return false;
@@ -558,7 +641,7 @@
}
else
{
- var listRoom = Common.Room.CurrentRoom.GetFloorSortRoom(this.cloneRoom.FloorId);
+ var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(this.cloneRoom.FloorId);
if (listRoom.Find((obj) => obj.Name == this.cloneRoom.Name && obj.Id != this.cloneRoom.Id) != null)
{
this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.HadSameRoom));
--
Gitblit v1.8.0