From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs | 243 ++++++++++++++++++++++++++----------------------
1 files changed, 132 insertions(+), 111 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
index 15f46ff..948b78c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
@@ -14,19 +14,15 @@
/// <summary>
/// 妗屽竷鎺т欢
/// </summary>
- private FrameLayout frameTable = null;
+ private NormalFrameLayout frameTable = null;
/// <summary>
- /// 鍒楄〃鎺т欢
+ /// 鍒楄〃鎺т欢(鐧借壊鑳屾櫙)
/// </summary>
- private VerticalListControl listView = null;
+ private FrameListControl listView = null;
/// <summary>
- /// 妤煎眰椤哄簭
+ /// 鏁翠釜鐣岄潰鐨勪笂涓嬫粦鍔ㄦ帶浠�
/// </summary>
- private List<string> listFloorSort = new List<string>();
- /// <summary>
- /// 鎴块棿椤哄簭
- /// </summary>
- private List<string> listRoomSort = new List<string>();
+ private VerticalFrameControl listBackContr = null;
/// <summary>
/// 褰撳墠APP鐨勪綇瀹呮ā寮� 0:杩樻病鏈夎缃湁妯″紡 1:妤煎眰妯″紡 2:娌℃湁妤煎眰妯″紡
/// </summary>
@@ -64,10 +60,16 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
+ //鏁翠釜鐣岄潰鐨勪笂涓嬫粦鍔ㄦ帶浠�
+ this.listBackContr = new VerticalFrameControl();
+ listBackContr.Height = bodyFrameLayout.Height;
+ bodyFrameLayout.AddChidren(listBackContr);
+
+ //浣忓畢琛�
var rowHome = new RowLayoutControl();
rowHome.Height = Application.GetRealHeight(173);
rowHome.BackgroundColor = UserCenterColor.Current.White;
- bodyFrameLayout.AddChidren(rowHome);
+ listBackContr.frameTable.AddChidren(rowHome);
rowHome.frameTable.UseClickStatu = false;
var btnAdreeIcon = rowHome.frameTable.AddLeftIcon(81);
@@ -77,13 +79,13 @@
var btnHomeName = rowHome.frameTable.AddLeftCaption(Common.Config.Instance.Home.Name, 700, 60);
btnHomeName.TextSize = 15;
btnHomeName.Y = Application.GetRealHeight(35);
- rowHome.frameTable.AddChidren(btnHomeName, ChidrenBindMode.BindEventOnly);
+ rowHome.frameTable.AddChidren(btnHomeName, ChidrenBindMode.BindEvent);
//褰撳墠浣忓畢
var btnNowView = rowHome.frameTable.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uNowResidence), 700, 49);
btnNowView.TextSize = 12;
btnNowView.Y = Application.GetRealHeight(95);
btnNowView.TextColor = UserCenterColor.Current.TextGrayColor1;
- rowHome.frameTable.AddChidren(btnNowView, ChidrenBindMode.BindEventOnly);
+ rowHome.frameTable.AddChidren(btnNowView, ChidrenBindMode.BindEvent);
//涓讳汉鎴栬�呯鐞嗗憳鎵嶄細鍑虹幇杩欎釜鑿滃崟
if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
{
@@ -92,6 +94,8 @@
}
//缁忕含搴�
var btnLocation = rowHome.frameTable.AddMostRightView(string.Empty, 500);
+ btnLocation.IsMoreLines = true;
+ btnLocation.TextSize = 10;
btnLocation.Text = Common.Config.Instance.Home.ResidenceAddressName;
//涓讳汉鎴栬�呯鐞嗗憳鎵嶄細鍑虹幇杩欎釜鑿滃崟
@@ -142,10 +146,10 @@
};
}
//鍒濆鍖栨甯�
- this.frameTable = new FrameLayout();
+ this.frameTable = new NormalFrameLayout();
frameTable.Y = rowHome.Bottom + Application.GetRealHeight(23);
- frameTable.Height = bodyFrameLayout.Height - rowHome.Bottom - Application.GetRealHeight(23);
- bodyFrameLayout.AddChidren(frameTable);
+ frameTable.Height = listBackContr.frameTable.Height - rowHome.Bottom - Application.GetRealHeight(23);
+ listBackContr.frameTable.AddChidren(frameTable);
//鏍规嵁鎸囧畾妯″紡,鍒濆鍖栨甯冩帶浠�
this.InitFrameTableByMode();
@@ -244,7 +248,7 @@
frameFloor.UseClickStatu = false;
frameFloor.Height = Application.GetRealHeight(115);
frameFloor.BackgroundColor = UserCenterColor.Current.White;
- frameTable.AddChidren(frameFloor);
+ this.frameTable.AddChidren(frameFloor);
//妤煎眰
var btnFloor = frameFloor.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uFloor), 200, 60);
@@ -253,11 +257,11 @@
btnFloor.TextSize = 15;
frameFloor.AddChidren(btnFloor, ChidrenBindMode.NotBind);
- listView = new VerticalListControl(29);
+ listView = new FrameListControl(29);
listView.BackgroundColor = UserCenterColor.Current.White;
listView.Y = frameFloor.Bottom;
listView.Height = frameTable.Height - frameFloor.Bottom;
- frameTable.AddChidren(listView);
+ this.frameTable.AddChidren(listView);
//鍒濆鍖栨ゼ灞傝
this.InitFloorRow();
@@ -270,26 +274,20 @@
{
//鑾峰彇妤煎眰
var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
- this.listFloorSort.Clear();
- foreach (string keys in dicFloor.Keys)
- {
- listFloorSort.Add(keys);
- }
-
- if (Common.Config.Instance.Home.FloorDics.Count == 0)
+ if (dicFloor.Count == 0)
{
return;
}
HdlThreadLogic.Current.RunMainInThread(() =>
{
- int count = listFloorSort.Count - 1;
- for (int i = 0; i < listFloorSort.Count; i++)
+ int count = dicFloor.Count;
+ foreach (var keys in dicFloor.Keys)
{
- string keys = listFloorSort[i];
- this.AddFloorRow(keys, dicFloor[keys], i != count);
+ count--;
+ this.AddFloorRow(keys, dicFloor[keys], count != 0);
}
//璋冩暣鎺т欢楂樺害
- listView.AdjustRealHeight(Application.GetRealHeight(23));
+ this.AdjustContrlTableHeight();
});
}
@@ -306,6 +304,7 @@
private void AddFloorRow(string keys, string floorName, bool addLine)
{
var frameRow = new RowLayoutControl(listView.rowSpace / 2);
+ frameRow.MainKeys = keys;
this.listView.AddChidren(frameRow);
//鍥炬爣
var btnIcon = frameRow.frameTable.AddLeftIcon(81);
@@ -328,13 +327,8 @@
if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
{
//鏇存敼
- var btnChanged = new NormalViewControl(Application.GetRealWidth(184), frameRow.Height, false);
- btnChanged.BackgroundColor = 0xff4a4a4a;
- btnChanged.TextSize = 12;
- btnChanged.TextColor = UserCenterColor.Current.White;
- btnChanged.TextAlignment = TextAlignment.Center;
+ var btnChanged = frameRow.AddEditorControl();
btnChanged.TextID = R.MyInternationalizationString.uChanged1;
- frameRow.AddRightView(btnChanged);
btnChanged.ButtonClickEvent += (sender, e) =>
{
//鍒涘缓鎴栬�呯紪杈戞ゼ灞�
@@ -358,11 +352,11 @@
Common.Config.Instance.Home.FloorDics.Remove(keys);
if (Common.Config.Instance.Home.CurrentFloorId == keys)
{
- //濡傛灉鍒犻櫎鐨勬槸褰撳墠妤煎眰鐨勮瘽
Common.Config.Instance.Home.CurrentFloorId = string.Empty;
- foreach (string floorId in Common.Config.Instance.Home.FloorDics.Keys)
+ var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
+ foreach (var floorId in dicFloor.Keys)
{
- //鎶婄涓�涓ゼ灞侷D缁欏畠
+ //鎶婄涓�涓ゼ灞傝祴鍊肩粰褰撳墠妤煎眰
Common.Config.Instance.Home.CurrentFloorId = floorId;
break;
}
@@ -378,20 +372,12 @@
listDeleteId.Add(listAllRoom[i].Id);
}
}
- //濡傛灉褰撳墠閫夋嫨鐨勬埧闂存槸鍒犻櫎瀵硅薄鐨勮瘽
- if (HdlRoomLogic.Current.CurrentRoom.FloorId == keys)
- {
- HdlRoomLogic.Current.CurrentRoom = HdlRoomLogic.Current.GetLoveRoom();
- }
//鍒犻櫎鎴块棿
foreach (string roomId in listDeleteId)
{
HdlRoomLogic.Current.RemoveRoom(roomId);
}
Common.Config.Instance.Home.Save();
- //淇濆瓨椤哄簭
- listFloorSort.Remove(keys);
- HdlRoomLogic.Current.SaveFloorSort(listFloorSort);
if (Common.Config.Instance.Home.FloorDics.Count == 0)
{
@@ -400,9 +386,27 @@
}
else
{
+ bool canMove = false;
+ for (int i = 0; i < listView.ChildrenCount; i++)
+ {
+ var myRow = listView.GetChildren(i) as RowLayoutControl;
+ if (myRow != null && myRow.MainKeys == keys)
+ {
+ canMove = true;
+ continue;
+ }
+ if (canMove == true)
+ {
+ //瀹冧箣鍚庣殑琛岋紝鍏ㄩ儴寰�涓婄Щ
+ myRow.Y -= frameRow.Height;
+ }
+ }
frameRow.RemoveFromParent();
- listView.AdjustRealHeight(Application.GetRealHeight(23));
+ //璋冩暣妗屽竷楂樺害
+ this.AdjustContrlTableHeight();
}
+ //鍒犻櫎妤煎眰鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
+ UserView.UserPage.Instance.RefreshAllForm = true;
});
};
}
@@ -460,7 +464,6 @@
Common.Config.Instance.Home.Save();
if (Common.Config.Instance.Home.CurrentFloorId == string.Empty)
{
- Common.Config.Instance.Home.CurrentFloorId = keys;
//鍒涘缓绗竴涓柊鐨勬ゼ灞傜殑璇�,闇�瑕佸幓鍒锋柊涓婚〉宸﹁竟鐨勬埧闂村垪琛�
HdlRoomLogic.Current.RefreshRoomListView();
}
@@ -473,6 +476,8 @@
//鏍规嵁鎸囧畾妯″紡,鍒濆鍖栨甯冩帶浠�
this.InitFrameTableByMode();
}
+ //鍒涘缓鎴栬�呬慨鏀规ゼ灞傜殑璇�,涓婚〉闇�瑕侀噸鏂板埛鏂�
+ UserView.UserPage.Instance.RefreshAllForm = true;
}
});
}
@@ -500,7 +505,7 @@
btnRoomList.TextSize = 15;
frameRoom.AddChidren(btnRoomList, ChidrenBindMode.NotBind);
- listView = new VerticalListControl(29);
+ listView = new FrameListControl(29);
listView.BackgroundColor = UserCenterColor.Current.White;
listView.Y = frameRoom.Bottom;
listView.Height = frameTable.Height - frameRoom.Bottom;
@@ -517,19 +522,13 @@
{
//鑾峰彇妤煎眰鐨勬埧闂�
var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(string.Empty);
- this.listRoomSort.Clear();
- for (int i = 0; i < listRoom.Count; i++)
- {
- this.listRoomSort.Add(listRoom[i].Id);
- }
-
for (int i = 0; i < listRoom.Count; i++)
{
//娣诲姞鎴块棿琛�
this.AddRoomRow(listRoom[i], i != listRoom.Count - 1);
}
- //璋冩暣鎺т欢鐪熷疄楂樺害
- listView.AdjustRealHeight(Application.GetRealHeight(23));
+ //璋冩暣妗屽竷楂樺害
+ this.AdjustContrlTableHeight();
}
#endregion
@@ -544,6 +543,7 @@
private void AddRoomRow(Common.Room room, bool addLine)
{
var frameRow = new RowLayoutControl(listView.rowSpace / 2);
+ frameRow.MainKeys = room.Id;
listView.AddChidren(frameRow);
//鍥炬爣
var btnIcon = frameRow.frameTable.AddLeftIcon(81);
@@ -569,13 +569,10 @@
//濡傛灉鏄垎浜殑鎴块棿锛屼笉鑳界紪杈戝拰淇敼
return;
}
-
//缂栬緫
var btnEditor = frameRow.AddEditorControl();
btnEditor.ButtonClickEvent += (sender, e) =>
{
- //鍏抽棴宸﹀彸鑿滃崟
- frameRow.HideMenu();
var form = new EditorRoomInforForm();
form.AddForm(room);
form.FinishEditorEvent += (roomName) =>
@@ -591,15 +588,7 @@
//纭鍒犻櫎鎴块棿?
this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uDeleteRoomMsg), () =>
{
- if (HdlRoomLogic.Current.CurrentRoom.Id == room.Id)
- {
- //濡傛灉鍒犻櫎鐨勬槸褰撳墠鎴块棿鐨勮瘽
- HdlRoomLogic.Current.CurrentRoom = HdlRoomLogic.Current.GetLoveRoom();
- }
HdlRoomLogic.Current.RemoveRoom(room.Id);
- //淇濆瓨椤哄簭
- this.listRoomSort.Remove(room.Id);
- HdlRoomLogic.Current.SaveRoomSort(string.Empty, this.listRoomSort);
var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
if (listAllRoom.Count <= 1)
@@ -609,9 +598,27 @@
}
else
{
+ bool canMove = false;
+ for (int i = 0; i < listView.ChildrenCount; i++)
+ {
+ var myRow = listView.GetChildren(i) as RowLayoutControl;
+ if (myRow != null && myRow.MainKeys == room.Id)
+ {
+ canMove = true;
+ continue;
+ }
+ if (canMove == true)
+ {
+ //瀹冧箣鍚庣殑琛岋紝鍏ㄩ儴寰�涓婄Щ
+ myRow.Y -= frameRow.Height;
+ }
+ }
frameRow.RemoveFromParent();
- listView.AdjustRealHeight(Application.GetRealHeight(23));
+ //璋冩暣妗屽竷楂樺害
+ this.AdjustContrlTableHeight();
}
+ //鍒犻櫎鎴块棿鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
+ UserView.UserPage.Instance.RefreshAllForm = true;
});
};
}
@@ -623,7 +630,7 @@
/// <summary>
/// 鍒犻櫎浣忓畢
/// </summary>
- public async void DeleteResidence()
+ private void DeleteResidence()
{
//寮�鍚繘搴︽潯
this.ShowProgressBar();
@@ -635,7 +642,7 @@
Pra.HomeId = Common.Config.Instance.Home.Id;
Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- bool result = await UserCenterLogic.GetResultStatuByRequestHttps("App/DelHome", true, Pra);
+ bool result = UserCenterLogic.GetResultStatuByRequestHttps("App/DelHome", true, Pra);
if (result == false)
{
//鍏抽棴杩涘害鏉�
@@ -651,7 +658,7 @@
HomeId = Common.Config.Instance.Home.Id,
PrimaryUserId = Common.Config.Instance.Home.MainUserDistributedMark
};
- bool result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/SubAccountDelShareHome", false, Pra2);
+ bool result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/SubAccountDelShareHome", false, Pra2);
if (result == false)
{
//鍏抽棴杩涘害鏉�
@@ -683,18 +690,17 @@
}
}
- var myHouse = Common.House.GetHouseByFilePath(Common.Config.Instance.HomeFilePathList[index]);
+ var myHouse = HdlResidenceLogic.Current.GetHouseByFilePath(Common.Config.Instance.HomeFilePathList[index]);
//鍒囨崲浣忓畢
Common.Config.Instance.HomeId = myHouse.Id;
Common.Global.CreateHomeDirectory(myHouse.Id);
Common.Config.Instance.Save();
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
- await UserCenterLogic.InitUserCenterMenmoryAndThread(false);
- HdlRoomLogic.Current.InitAllRoom();
+ UserCenterLogic.InitUserCenterMenmoryAndThread(false);
//鍒犻櫎浣忓畢
- Common.House.DeleteHouseByHouseId(deleteId);
+ HdlResidenceLogic.Current.DeleteHouseMemmory(deleteId);
Application.RunOnMainThread(() =>
{
@@ -714,47 +720,51 @@
/// <param name="latitude">绾害</param>
/// <param name="longitude">缁忓害</param>
/// <param name="addresName">浣嶇疆鍚嶇О</param>
- private async void SaveResidenceAdrress(NormalViewControl btnLocation, double latitude, double longitude, string addresName)
+ private void SaveResidenceAdrress(NormalViewControl btnLocation, double latitude, double longitude, string addresName)
{
- //寮�鍚繘搴︽潯
- this.ShowProgressBar();
-
- var Pra = new EditorResidencePra();
- Pra.HomeId = Common.Config.Instance.Home.Id;
- Pra.Name = Common.Config.Instance.Home.Name;
- Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- Pra.Latitude = latitude;
- Pra.Longitude = longitude;
-
- //缂栬緫浣忓畢
- bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("App/EditHome", true, Pra);
- if (flage == false)
+ //濡傛灉涓嶆槸铏氭嫙浣忓畢,鎵嶆洿鏂颁簯绔�
+ if (Common.Config.Instance.Home.IsVirtually == false)
{
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
- return;
- }
- //璁剧疆鍏ㄩ儴缃戝叧鐨勪綇瀹呭湴鍧�
- var listGateway = HdlGatewayLogic.Current.GetAllLocalGateway();
- foreach (var gateway in listGateway)
- {
- ZigBee.Device.ZbGateway realWay = null;
- if (HdlGatewayLogic.Current.GetRealGateway(ref realWay, gateway) == false)
- {
- //閿欒:缃戝叧瀵硅薄涓㈠け
- continue;
- }
- var result = HdlGatewayLogic.Current.SetGatewaySite(gateway, longitude, latitude, ShowErrorMode.YES);
- if (result == false)
+ //寮�鍚繘搴︽潯
+ this.ShowProgressBar();
+
+ var Pra = new EditorResidencePra();
+ Pra.HomeId = Common.Config.Instance.Home.Id;
+ Pra.Name = Common.Config.Instance.Home.Name;
+ Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ Pra.Latitude = latitude;
+ Pra.Longitude = longitude;
+
+ //缂栬緫浣忓畢
+ bool flage = UserCenterLogic.GetResultStatuByRequestHttps("App/EditHome", true, Pra);
+ if (flage == false)
{
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
return;
}
+ //璁剧疆鍏ㄩ儴缃戝叧鐨勪綇瀹呭湴鍧�
+ var listGateway = HdlGatewayLogic.Current.GetAllLocalGateway();
+ foreach (var gateway in listGateway)
+ {
+ ZigBee.Device.ZbGateway realWay = null;
+ if (HdlGatewayLogic.Current.GetRealGateway(ref realWay, gateway) == false)
+ {
+ //閿欒:缃戝叧瀵硅薄涓㈠け
+ continue;
+ }
+ var result = HdlGatewayLogic.Current.SetGatewaySite(gateway, longitude, latitude, ShowErrorMode.YES);
+ if (result == false)
+ {
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
+ return;
+ }
+ }
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
}
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
//淇濆瓨缂撳瓨
Common.Config.Instance.Home.Longitude = longitude;
Common.Config.Instance.Home.Latitude = latitude;
@@ -803,7 +813,7 @@
{
//璇疯緭鍏ヤ綇瀹呭悕绉�
string msg = Language.StringByID(R.MyInternationalizationString.uPleaseInputFloorName);
- this.ShowMassage(ShowMsgType.Error, msg);
+ this.ShowMassage(ShowMsgType.Tip, msg);
return false;
}
foreach (string floorKeys in Common.Config.Instance.Home.FloorDics.Keys)
@@ -812,13 +822,24 @@
{
//妤煎眰鍚嶇О宸茬粡瀛樺湪
string msg = Language.StringByID(R.MyInternationalizationString.uFloorNameIsExist);
- this.ShowMassage(ShowMsgType.Error, msg);
+ this.ShowMassage(ShowMsgType.Tip, msg);
return false;
}
}
return true;
}
+ /// <summary>
+ /// 璋冩暣鎺т欢妗屽竷楂樺害
+ /// </summary>
+ private void AdjustContrlTableHeight()
+ {
+ //璋冩暣妗屽竷楂樺害
+ listView.AdjustRealHeight(Application.GetRealHeight(23));
+ this.frameTable.Height = listView.Bottom;
+ this.listBackContr.AdjustTableHeight();
+ }
+
#endregion
#region 鈻� 缁撴瀯浣揰____________________________
--
Gitblit v1.8.0