From 9ef48d7b2da7c408b53f73be0f6eef3cbac1c84a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 19 十一月 2020 10:23:45 +0800
Subject: [PATCH] Evoyo.Home1.1.0120111601_Release
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs | 888 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 708 insertions(+), 180 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs
index 042d257..e3836b1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs
@@ -43,6 +43,10 @@
/// 鎵�鏈夌殑鎴块棿淇℃伅
/// </summary>
private Dictionary<string, Room> dicRooms = new Dictionary<string, Room>();
+ /// <summary>
+ /// 鐗╃悊璁惧灞炰簬鍝釜鎴块棿鐨勮褰�
+ /// </summary>
+ private Dictionary<string, string> dicDeviceRoomId = null;
#endregion
@@ -61,18 +65,20 @@
this.dicRooms.Clear();
//妫�娴嬫垜鐨勫枩鐖辫繖涓埧闂村璞�
this.CheckLoveRoom();
-
- foreach (var roomId in Config.Instance.Home.ListRooms)
+
+ var listFile = HdlFileLogic.Current.GetRootPathListFile();
+ foreach (var fileName in listFile)
{
- //浠庢枃浠堕噷闈㈣幏鍙栨埧闂村璞�
- var room = this.GetRoomByFilePath($"Room_{roomId}.json");
- if (room != null)
+ if (fileName.StartsWith("Room_") == true)
{
- this.dicRooms[room.Id] = (room);
+ //浠庢枃浠堕噷闈㈣幏鍙栨埧闂村璞�
+ var room = this.GetRoomByFilePath(fileName);
+ if (room != null)
+ {
+ this.dicRooms[room.Id] = (room);
+ }
}
}
- //璁剧疆褰撳墠妤煎眰鐨処D
- Config.Instance.Home.SetCurrentFloorId();
//椤轰究鍒锋柊鍦烘櫙
HdlSceneLogic.Current.ReFreshByLocal();
//鍒锋柊鎴块棿瑙嗗浘鍒楄〃
@@ -84,17 +90,13 @@
/// </summary>
public void RefreshAllRoomByLocation()
{
- var homeTemp = Config.Instance.Home;
- homeTemp.ListRooms.Clear();
-
- var listFile = Global.FileListByHomeId();
+ var listFile = HdlFileLogic.Current.GetRootPathListFile();
//鎴戠殑鍠滅埍鐨勬埧闂村繀椤昏鍦ㄧ0浣嶆墠琛�
string fRoom = "Room_Favorite.json";
if (listFile.Contains(fRoom) == true)
{
listFile.Remove(fRoom);
- homeTemp.ListRooms.Add("Favorite");
}
var listRoomFile = new List<string>();
@@ -103,7 +105,6 @@
if (fileName.StartsWith("Room_"))
{
string roomId = fileName.Replace("Room_", string.Empty).Replace(".json", string.Empty);
- homeTemp.ListRooms.Add(roomId);
listRoomFile.Add(fileName);
}
}
@@ -117,8 +118,7 @@
this.CheckAdminFloorData(listRoomFile);
}
- homeTemp.Save(false);
- InitAllRoom();
+ this.InitAllRoom();
}
/// <summary>
@@ -128,7 +128,7 @@
{
Application.RunOnMainThread(() =>
{
- MainPage.ListRoomViewFrom.Instance?.RefreshListRoom();
+ MainPage.LeftListRoomViewFrom.Instance?.RefreshListRoom();
});
}
@@ -215,15 +215,12 @@
/// <param name="rorefreshRoomViewom">鏄惁鍒锋柊鎴块棿瑙嗗浘鍒楄〃鐣岄潰</param>
public void AddRoom(Room room, bool refreshRoomView = true)
{
- if (Global.IsExistsByHomeId(room.FileName) == true
- || Config.Instance.Home.ListRooms.Contains(room.Id) == true)
+ if (Global.IsExistsByHomeId(room.FileName) == true)
{
return;
}
//娣诲姞鍒扮紦瀛�
this.dicRooms[room.Id] = room;
- //鎶婃埧闂碔D娣诲姞鍒颁綇瀹�
- Config.Instance.Home.AddRoomId(room.Id);
//鐢熸垚鏂囦欢
room.Save();
//澶囦唤
@@ -243,9 +240,21 @@
/// 鍒犻櫎鎴块棿
/// </summary>
/// <param name="roomId">鎴块棿ID</param>
+ /// <param name="refreshLeftView">鏄惁鍒锋柊宸︽粦鐣岄潰(姝ゅ彉閲忕洰鍓嶆槸缁欏垹闄ゅ叏閮ㄦ埧闂寸敤鐨�)</param>
/// <returns></returns>
- public void RemoveRoom(string roomId)
+ public void RemoveRoom(string roomId, bool refreshLeftView = true)
{
+ if (this.NowMainPageRoom != null && this.NowMainPageRoom.Id == roomId)
+ {
+ //褰撳垹闄ょ殑鏄富椤电殑鎴块棿鐨勬椂鍊�
+ this.NowMainPageRoom = this.GetLoveRoom();
+ }
+ if (this.NowCategoryRoom != null && this.NowCategoryRoom.Id == roomId)
+ {
+ //褰撳垹闄ょ殑鏄垎绫荤殑鎴块棿鐨勬椂鍊�
+ this.NowCategoryRoom = this.GetLoveRoom();
+ }
+
//鏍规嵁鎴块棿Id锛岃幏鍙栨埧闂村璞�
var room = this.GetRoomById(roomId);
if (room == null)
@@ -279,8 +288,6 @@
}
loveRoom.Save(false);
}
-
- Config.Instance.Home.RemoveRoomId(roomId);
this.dicRooms.Remove(roomId);
string roomFilePath = room.FileName;
@@ -292,10 +299,31 @@
HdlAutoBackupLogic.DeleteFile(roomFilePath);
//鏍规嵁鎴块棿ID,绉婚櫎鎸囧畾鐨勭湡瀹炵墿鐞嗚澶囩殑鎵�灞炴埧闂磋褰�
- Common.LocalDevice.Current.DeleteRealDeviceByRoomId(roomId);
+ HdlRoomLogic.Current.DeleteRealDeviceByRoomId(roomId);
+ if (refreshLeftView == true)
+ {
+ //鍒锋柊鎴块棿瑙嗗浘鍒楄〃
+ this.RefreshRoomListView();
+ }
+ }
- //鍒锋柊鎴块棿瑙嗗浘鍒楄〃
- this.RefreshRoomListView();
+ /// <summary>
+ /// 鍒犻櫎鍏ㄩ儴鐨勬埧闂�
+ /// </summary>
+ public void DeleteAllRoom()
+ {
+ var listRoomId = new List<string>();
+ foreach (var room in this.dicRooms.Values)
+ {
+ if (room.IsLove == false)
+ {
+ listRoomId.Add(room.Id);
+ }
+ }
+ foreach (var roomId in listRoomId)
+ {
+ this.RemoveRoom(roomId, false);
+ }
}
#endregion
@@ -357,7 +385,7 @@
public string GetRoomNameByDevice(CommonDevice device)
{
var room = this.GetRoomByDevice(device);
- return this.GetFloorRoomName(room);
+ return this.GetRoomName(room);
}
/// <summary>
@@ -365,7 +393,7 @@
/// </summary>
/// <returns>鎴块棿鍚�</returns>
/// <param name="room">鎴块棿瀵硅薄</param>
- public string GetFloorRoomName(Room room)
+ public string GetRoomName(Room room)
{
if (room == null)
{
@@ -466,7 +494,7 @@
}
}
}
- return listRoom;
+ return this.SortRoom(listRoom);
}
/// <summary>
@@ -480,36 +508,7 @@
{
listRoom.Add(room);
}
- return listRoom;
- }
-
- /// <summary>
- /// 鑾峰彇褰撳墠妤煎眰鐨勬埧闂村悕绉�
- /// </summary>
- /// <param name="id"></param>
- /// <returns></returns>
- public List<string> GetRoomNamesByFloorId(string id)
- {
- var listName = new List<string>();
- if (Config.Instance.Home.FloorDics.Count == 0)
- {
- //娌℃湁妤煎眰
- foreach (var room in this.dicRooms.Values)
- {
- listName.Add(room.Name);
- }
- }
- else
- {
- foreach (var room in this.dicRooms.Values)
- {
- if (room.FloorId == id)
- {
- listName.Add(room.Name);
- }
- }
- }
- return listName;
+ return this.SortRoom(listRoom);
}
/// <summary>
@@ -541,17 +540,223 @@
}
}
}
+ listRoom = this.SortRoom(listRoom);
+
listRoom.Insert(0, GetLoveRoom());
return listRoom;
}
/// <summary>
- /// 鑾峰彇褰撳墠妤煎眰鐨勬埧闂�(鎷兼帴浜嗐�愬父鐢ㄣ�戝湪绗竴浣�)
+ /// 鑾峰彇缃戝叧鎵�鍦ㄧ殑鎴块棿
+ /// </summary>
+ /// <param name="zbGateway">缃戝叧瀵硅薄</param>
+ /// <returns></returns>
+ public Room GetRoomByGateway(ZbGateway zbGateway)
+ {
+ return this.GetRoomByGateway(zbGateway.GwId);
+ }
+
+ /// <summary>
+ /// 鑾峰彇缃戝叧鎵�鍦ㄧ殑鎴块棿
+ /// </summary>
+ /// <param name="gatewayId">缃戝叧ID</param>
+ /// <returns></returns>
+ public Room GetRoomByGateway(string gatewayId)
+ {
+ var localGateway = HdlGatewayLogic.Current.GetLocalGateway(gatewayId);
+ if (localGateway == null)
+ {
+ return null;
+ }
+ return HdlRoomLogic.Current.GetRoomById(localGateway.RoomId);
+ }
+
+ /// <summary>
+ /// 鍙樻洿缃戝叧鎴块棿
+ /// </summary>
+ /// <param name="gwId">缃戝叧Id</param>
+ /// <param name="roomId">鎴块棿ID</param>
+ public void ChangedGatewayRoom(string gwId, string roomId)
+ {
+ var localGateway = HdlGatewayLogic.Current.GetLocalGateway(gwId);
+ if (localGateway != null)
+ {
+ localGateway.RoomId = roomId;
+ localGateway.ReSave();
+ //娣诲姞澶囦唤
+ HdlAutoBackupLogic.AddOrEditorFile(localGateway.FilePath);
+ }
+ }
+
+ #endregion
+
+
+ #region 鈻� 鐗╃悊璁惧鎵�灞炴埧闂確__________________
+
+ /// <summary>
+ /// 鍒濆鍖栫墿鐞嗚澶囨墍灞炴埧闂寸殑璁板綍
+ /// </summary>
+ public void InitRealDeviceRoomId()
+ {
+ this.dicDeviceRoomId = new Dictionary<string, string>();
+ string fullName = DirNameResourse.DeviceRoomIdFile;
+ var strData = HdlFileLogic.Current.ReadFileTextContent(fullName);
+ if (strData != null)
+ {
+ this.dicDeviceRoomId = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(strData);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鐗╃悊璁惧鎵�灞炴埧闂寸殑璁板綍
/// </summary>
/// <returns></returns>
- public List<Room> GetRoomsByCurrentFloorIdAppendLoveRoom()
+ public Dictionary<string, string> GetAllRealDeviceRoomData()
{
- return this.GetRoomsByFloorIdAppendLoveRoom(Config.Instance.Home.CurrentFloorId);
+ return this.dicDeviceRoomId;
+ }
+
+ /// <summary>
+ /// 淇濆瓨鐗╃悊璁惧鎵�灞炴埧闂寸殑璁板綍
+ /// </summary>
+ /// <param name="listDevice">闇�瑕佷繚瀛樼殑璁惧瀵硅薄</param>
+ /// <param name="roomId">闇�瑕佷繚瀛樼殑鍝釜璁惧鐨勬埧闂碔D</param>
+ /// <param name="saveRoadDevice">濡傛灉鍙湁涓�涓洖璺�,鏄惁鎶婂洖璺殑鎴块棿涓�璧蜂慨鏀�</param>
+ public void SaveRealDeviceRoomId(List<CommonDevice> listDevice, string roomId, bool saveRoadDevice = true)
+ {
+ if (listDevice == null || listDevice.Count == 0)
+ {
+ return;
+ }
+ //濡傛灉璁惧鍙湁涓�涓洖璺紝濡傛灉鏀瑰彉浜嗙湡瀹炶澶囧尯鍩燂紝鍒欏畠鐨勫洖璺殑鍖哄煙涔熶竴璧锋敼浜�
+ if (saveRoadDevice == true && listDevice.Count == 1)
+ {
+ if ((listDevice[0] is OTADevice) == false)
+ {
+ //ota璁惧涓嶉渶瑕佸鐞�
+ HdlRoomLogic.Current.ChangedRoom(listDevice[0], roomId, false);
+ }
+ }
+ bool save = false;
+ if (roomId == string.Empty)
+ {
+ //閫夋嫨鐨勬槸鏈垎閰�
+ this.dicDeviceRoomId.Remove(listDevice[0].DeviceAddr);
+ save = true;
+ }
+ else
+ {
+ if (this.dicDeviceRoomId.ContainsKey(listDevice[0].DeviceAddr) == false)
+ {
+ this.dicDeviceRoomId[listDevice[0].DeviceAddr] = roomId;
+ save = true;
+ }
+ else
+ {
+ //2020.05.18杩藉姞:濡傛灉璁板綍鐨勬埧闂碔D鏄笉瀛樺湪鐨勮瘽,鍒欓噸鏂拌鐩�
+ var room = HdlRoomLogic.Current.GetRoomById(this.dicDeviceRoomId[listDevice[0].DeviceAddr]);
+ if (room == null || this.dicDeviceRoomId[listDevice[0].DeviceAddr] != roomId)
+ {
+ this.dicDeviceRoomId[listDevice[0].DeviceAddr] = roomId;
+ save = true;
+ }
+ }
+ }
+
+ if (save == true)
+ {
+ //淇濆瓨璁板綍
+ HdlFileLogic.Current.SaveFileContent(DirNameResourse.DeviceRoomIdFile, this.dicDeviceRoomId);
+
+ //娣诲姞鑷姩澶囦唤
+ HdlAutoBackupLogic.AddOrEditorFile(DirNameResourse.DeviceRoomIdFile);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鐪熷疄鐗╃悊璁惧鐨勬埧闂村悕瀛�
+ /// </summary>
+ /// <param name="device">璁惧鐨勬煇涓�涓洖璺�</param>
+ /// <returns></returns>
+ public string GeteRealDeviceRoomName(CommonDevice device)
+ {
+ if (this.dicDeviceRoomId.ContainsKey(device.DeviceAddr) == false)
+ {
+ //鏈垎閰嶅尯鍩�
+ return Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
+ }
+ var room = HdlRoomLogic.Current.GetRoomById(this.dicDeviceRoomId[device.DeviceAddr]);
+ return HdlRoomLogic.Current.GetRoomName(room);
+ }
+
+ /// <summary>
+ /// 鑾峰彇鐪熷疄鐗╃悊璁惧灞炰簬鍝釜鎴块棿
+ /// </summary>
+ /// <param name="device">璁惧鐨勬煇涓�涓洖璺�</param>
+ /// <returns></returns>
+ public Room GeteRealDeviceRoom(CommonDevice device)
+ {
+ if (this.dicDeviceRoomId.ContainsKey(device.DeviceAddr) == false)
+ {
+ return null;
+ }
+ return HdlRoomLogic.Current.GetRoomById(this.dicDeviceRoomId[device.DeviceAddr]);
+ }
+
+ /// <summary>
+ /// 灏嗙湡瀹炵墿鐞嗚澶囦粠鎴块棿涓Щ闄�
+ /// </summary>
+ /// <param name="device">闅忎究涓�涓洖璺�</param>
+ public void DeleteRealDeviceFromRoom(CommonDevice device)
+ {
+ //灏嗙湡瀹炵墿鐞嗚澶囦粠鎴块棿涓Щ闄�
+ this.DeleteRealDeviceFromRoom(new List<string>() { device.DeviceAddr });
+ }
+
+ /// <summary>
+ /// 灏嗙湡瀹炵墿鐞嗚澶囦粠鎴块棿涓Щ闄�
+ /// </summary>
+ /// <param name="listMac">璁惧Mac鍦板潃</param>
+ public void DeleteRealDeviceFromRoom(List<string> listMac)
+ {
+ bool save = false;
+ foreach (var deviceMacAddr in listMac)
+ {
+ if (this.dicDeviceRoomId.ContainsKey(deviceMacAddr) == true)
+ {
+ this.dicDeviceRoomId.Remove(deviceMacAddr);
+ save = true;
+ }
+ }
+ if (save == false)
+ {
+ //娌℃湁鏀瑰彉,涓嶉渶瑕佷繚瀛�
+ return;
+ }
+ //淇濆瓨璁板綍
+ HdlFileLogic.Current.SaveFileContent(DirNameResourse.DeviceRoomIdFile, this.dicDeviceRoomId);
+
+ //娣诲姞鑷姩澶囦唤
+ HdlAutoBackupLogic.AddOrEditorFile(DirNameResourse.DeviceRoomIdFile);
+ }
+
+ /// <summary>
+ /// 鏍规嵁鎴块棿ID,绉婚櫎鎸囧畾鐨勭湡瀹炵墿鐞嗚澶囩殑鎵�灞炴埧闂磋褰�
+ /// </summary>
+ /// <param name="i_RoomId"></param>
+ public void DeleteRealDeviceByRoomId(string i_RoomId)
+ {
+ var listDeleteKey = new List<string>();
+ foreach (var deviceAddr in this.dicDeviceRoomId.Keys)
+ {
+ if (this.dicDeviceRoomId[deviceAddr] == i_RoomId
+ && listDeleteKey.Contains(deviceAddr) == false)
+ {
+ listDeleteKey.Add(deviceAddr);
+ }
+ }
+ //灏嗙湡瀹炵墿鐞嗚澶囦粠鎴块棿涓Щ闄�
+ this.DeleteRealDeviceFromRoom(listDeleteKey);
}
#endregion
@@ -571,8 +776,10 @@
{
//浠庡師鏉ョ殑鎴块棿绉婚櫎璁惧
this.DeleteDevice(device);
+ //绉婚櫎鎴戠殑鍠滅埍
+ this.DeleteLoveDevice(device);
//璁惧鏀瑰彉鎴块棿鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
- UserView.UserPage.Instance.RefreshForm = true;
+ UserView.UserPage.Instance.RefreshAllForm = true;
return;
}
//鎴块棿鏄惁淇敼
@@ -590,7 +797,7 @@
this.AddDevice(room, device, saveRealRoom);
}
//璁惧鏀瑰彉鎴块棿鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
- UserView.UserPage.Instance.RefreshForm = true;
+ UserView.UserPage.Instance.RefreshAllForm = true;
}
/// <summary>
@@ -607,25 +814,6 @@
return true;
}
return false;
- }
-
- /// <summary>
- /// 鑾峰彇鎴块棿鎵�鍦ㄥ尯鍩�
- /// 妤煎眰,鎴块棿鍚�
- /// </summary>
- /// <returns></returns>
- public string GetZoneName(Room i_room)
- {
- if (string.IsNullOrEmpty(i_room.FloorId))
- {
- return i_room.Name;
- }
- var floorName = Config.Instance.Home.GetFloorNameById(i_room.FloorId);
- if (floorName == null)
- {
- return i_room.Name;
- }
- return $"{floorName}锛寋i_room.Name}";
}
#endregion
@@ -657,7 +845,7 @@
if (i_room.IsLove == false && saveRealRoom == true && LocalDevice.Current.GetDevicesCountByMac(device.DeviceAddr) == 1)
{
//濡傛灉鍙湁涓�涓洖璺�,鍒欎慨鏀圭湡瀹炵墿鐞嗚澶囩殑鎴块棿
- LocalDevice.Current.SaveRealDeviceRoomId(new List<CommonDevice>() { device }, i_room.Id, false);
+ this.SaveRealDeviceRoomId(new List<CommonDevice>() { device }, i_room.Id, false);
}
}
}
@@ -682,6 +870,8 @@
//淇濆瓨鍒版湰鍦�
loveRoom.ListDevice.Add(mainkeys);
loveRoom.Save();
+ //娣诲姞鏀惰棌璁惧鏃�,闇�瑕佸埛鏂颁富椤�
+ UserView.UserPage.Instance.RefreshAllForm = true;
}
}
}
@@ -705,7 +895,7 @@
if (deleteReal == true && LocalDevice.Current.GetDevicesCountByMac(device.DeviceAddr) == 1)
{
//鍒犻櫎鎺夊畠鐨勭湡瀹炵墿鐞嗚澶囩殑鎵�鍦ㄤ綅缃�
- LocalDevice.Current.DeleteRealDeviceFromRoom(device);
+ HdlRoomLogic.Current.DeleteRealDeviceFromRoom(device);
}
//鏍规嵁璁惧锛岃幏鍙栨墍鍦ㄧ殑鎴块棿
@@ -745,6 +935,8 @@
loveRoom.Save();
//鏇存敼鑷姩澶囦唤
HdlAutoBackupLogic.AddOrEditorFile(loveRoom.FileName);
+ //娣诲姞鏀惰棌璁惧鏃�,闇�瑕佸埛鏂颁富椤�
+ UserView.UserPage.Instance.RefreshAllForm = true;
}
}
@@ -933,85 +1125,87 @@
{
i_floorKeys = string.Empty;
}
- Dictionary<string, List<string>> dicAllSort = new Dictionary<string, List<string>>();
- //璇诲彇鎴块棿椤哄簭
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.RoomSortFile);
- var strData = UserCenterLogic.LoadFileContent(fullName);
- if (strData != null)
- {
- dicAllSort = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, List<string>>>(strData);
- }
-
- var listRoomSort = new List<string>();
- if (dicAllSort.ContainsKey(i_floorKeys) == true)
- {
- listRoomSort = dicAllSort[i_floorKeys];
- }
- else
- {
- dicAllSort[i_floorKeys] = listRoomSort;
- }
-
- var dicRoom = new Dictionary<string, Common.Room>();
+ var listRoom = new List<Room>();
foreach (var room in this.dicRooms.Values)
{
- if (room.FloorId != i_floorKeys && i_floorKeys != string.Empty)
+ if (room.FloorId != i_floorKeys && i_floorKeys != string.Empty
+ || room.IsLove == true)
{
- //涓嶆槸鍚屼竴涓ゼ灞�
+ //涓嶆槸鍚屼竴涓ゼ灞�,涓嶈鎴戠殑鍠滅埍
continue;
- }
- if (room.IsLove == true)
- {
- //涓嶈鎴戠殑鍠滅埍
- continue;
- }
- if (listRoomSort.Contains(room.Id) == false)
- {
- //鏂版坊鍔犵殑鎴块棿
- listRoomSort.Add(room.Id);
}
if (getShard == false && room.IsSharedRoom == true)
{
//涓嶈鍒嗕韩鐨勬埧闂�
continue;
}
- dicRoom[room.Id] = room;
+ listRoom.Add(room);
}
-
- var listSortRoom = new List<Room>();
- for (int i = 0; i < listRoomSort.Count; i++)
- {
- if (dicRoom.ContainsKey(listRoomSort[i]) == true)
- {
- listSortRoom.Add(dicRoom[listRoomSort[i]]);
- }
- }
-
- //淇濆瓨椤哄簭
- UserCenterLogic.SaveFileContent(fullName, dicAllSort);
- return listSortRoom;
+ return this.SortRoom(listRoom);
}
/// <summary>
- /// 淇濆瓨鎴块棿鐨勯『搴�
+ /// 鎺掑簭鎴块棿瀵硅薄
/// </summary>
- /// <param name="i_floorKeys">妤煎眰涓婚敭</param>
- /// <param name="listSort">鎴块棿椤哄簭(鎴块棿鐨勪富閿�)</param>
- public void SaveRoomSort(string i_floorKeys, List<string> listSort)
+ /// <param name="listRoom"></param>
+ /// <returns></returns>
+ public List<Room> SortRoom(List<Room> listRoom)
{
- Dictionary<string, List<string>> dicAllSort = new Dictionary<string, List<string>>();
- //璇诲彇鎴块棿椤哄簭
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.RoomSortFile);
- var strData = UserCenterLogic.LoadFileContent(fullName);
- if (strData != null)
+ //浠庝竴鍫嗘枃瀛椾腑,鑾峰彇杩欎竴鍫嗘枃瀛楅噷闈㈡暟瀛楀瓧绗︿覆鐨勬渶闀块暱搴�
+ var listName = new List<string>();
+ foreach (var room in listRoom)
{
- dicAllSort = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, List<string>>>(strData);
+ listName.Add(room.Name);
}
+ int numberLength = this.GetNumberMaxLength(listName);
- //淇濆瓨椤哄簭
- dicAllSort[i_floorKeys] = listSort;
- UserCenterLogic.SaveFileContent(fullName, dicAllSort);
- dicAllSort.Clear();
+ var listSort = new List<string[]>();
+ foreach (var room in listRoom)
+ {
+ var strArry = new string[2];
+ strArry[0] = room.Id;
+ strArry[1] = string.Empty;
+
+ string value = string.Empty;
+ foreach (var c in room.Name)
+ {
+ if (char.IsNumber(c) == true)
+ {
+ //鏁板瓧
+ value += c.ToString();
+ continue;
+ }
+ else if (value != string.Empty)
+ {
+ //濡傛灉鎴块棿鍚嶅瓧甯︽湁鏁板瓧鐨勮瘽,鍒欏乏杈瑰姞闆�,鍥犱负杩欓噷鏈変釜鎺掑簭鐨勯棶棰�
+ strArry[1] += value.PadLeft(numberLength, '0');
+ value = string.Empty;
+ }
+ strArry[1] += c.ToString();
+ }
+ if (value != string.Empty)
+ {
+ //浠ユ暟瀛楃粨灏剧殑璇�
+ strArry[1] += value.PadLeft(numberLength, '0');
+ }
+ listSort.Add(strArry);
+ }
+ //鎺掑簭
+ listSort.Sort((obj1, obj2) =>
+ {
+ if (obj1[1].CompareTo(obj2[1]) > 0)
+ {
+ return 1;
+ }
+ return -1;
+ });
+ var listSortRoom = new List<Room>();
+ foreach (var strArry in listSort)
+ {
+ var room = this.GetRoomById(strArry[0]);
+ listSortRoom.Add(room);
+ }
+ return listSortRoom;
}
/// <summary>
@@ -1020,46 +1214,328 @@
/// <returns></returns>
public Dictionary<string, string> GetFloorSortList()
{
- //璇诲彇妤煎眰椤哄簭
- var listFloorSort = new List<string>();
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.FloorSortFile);
- var strData = UserCenterLogic.LoadFileContent(fullName);
- if (strData != null)
+ //娌℃湁妤煎眰
+ if (Config.Instance.Home.FloorDics.Count == 0)
{
- listFloorSort = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(strData);
+ return new Dictionary<string, string>();
}
- foreach (string keys in Common.Config.Instance.Home.FloorDics.Keys)
+ //浠庝竴鍫嗘枃瀛椾腑,鑾峰彇杩欎竴鍫嗘枃瀛楅噷闈㈡暟瀛楀瓧绗︿覆鐨勬渶闀块暱搴�
+ var listName = new List<string>();
+ foreach (var floorName in Config.Instance.Home.FloorDics.Values)
{
- if (listFloorSort.Contains(keys) == false)
- {
- //鏂版坊鍔犵殑妤煎眰
- listFloorSort.Add(keys);
- }
+ listName.Add(floorName);
}
+ int numberLength = this.GetNumberMaxLength(listName);
+ var listSort = new List<string[]>();
+ foreach (var floorId in Config.Instance.Home.FloorDics.Keys)
+ {
+ var strArry = new string[2];
+ strArry[0] = floorId;
+ strArry[1] = string.Empty;
+
+ string value = string.Empty;
+ string floorName = Config.Instance.Home.FloorDics[floorId];
+ foreach (var c in floorName)
+ {
+ if (char.IsNumber(c) == true)
+ {
+ //鏁板瓧
+ value += c.ToString();
+ continue;
+ }
+ else if (value != string.Empty)
+ {
+ //濡傛灉鎴块棿鍚嶅瓧甯︽湁鏁板瓧鐨勮瘽,鍒欏乏杈瑰姞闆�,鍥犱负杩欓噷鏈変釜鎺掑簭鐨勯棶棰�
+ strArry[1] += value.PadLeft(numberLength, '0');
+ value = string.Empty;
+ }
+ strArry[1] += c.ToString();
+ }
+ if (value != string.Empty)
+ {
+ //浠ユ暟瀛楃粨灏剧殑璇�
+ strArry[1] += value.PadLeft(numberLength, '0');
+ }
+ listSort.Add(strArry);
+ }
+ //妤煎眰鎺掑簭
+ listSort.Sort((obj1, obj2) =>
+ {
+ if (obj1[1].CompareTo(obj2[1]) > 0)
+ {
+ return 1;
+ }
+ return -1;
+ });
var dic = new Dictionary<string, string>();
- for (int i = 0; i < listFloorSort.Count; i++)
+ foreach (var strArry in listSort)
{
- if (Config.Instance.Home.FloorDics.ContainsKey(listFloorSort[i]) == true)
- {
- dic[listFloorSort[i]] = Config.Instance.Home.FloorDics[listFloorSort[i]];
- }
+ dic[strArry[0]] = Config.Instance.Home.FloorDics[strArry[0]];
}
-
- //淇濆瓨椤哄簭
- UserCenterLogic.SaveFileContent(fullName, listFloorSort);
return dic;
}
+ #endregion
+
+ #region 鈻� 鍙戦�佹埧闂翠俊鎭粰缃戝叧_________________
+
/// <summary>
- /// 淇濆瓨妤煎眰鐨勯『搴�
+ /// 鍙戦�佹埧闂翠俊鎭粰缃戝叧
/// </summary>
- /// <param name="listSort">妤煎眰鐨勪富閿�</param>
- public void SaveFloorSort(List<string> listSort)
+ public void SetRoomInfoToGateway()
{
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.FloorSortFile);
- //淇濆瓨椤哄簭
- UserCenterLogic.SaveFileContent(fullName, listSort);
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1 && UserCenterResourse.UserInfo.AuthorityNo != 2)
+ {
+ //涓嶆槸涓讳汉鍜岀鐞嗗憳,鍒欎笉澶勭悊
+ return;
+ }
+ var realMain = ZbGateway.MainGateWay;
+ if (realMain == null || Common.Config.Instance.Home.IsVirtually == true)
+ {
+ //娌℃湁涓荤綉鍏�,鍒欎笉鐞�
+ return;
+ }
+ //鑾峰彇鎴块棿鍏ㄩ儴鐨勮澶囧璞�
+ string strSendDeviceRoomInfo = string.Empty;
+ foreach (var room in this.dicRooms.Values)
+ {
+ if (room.IsSharedRoom || room.IsLove)
+ {
+ continue;
+ }
+ var listDevice = this.GetRoomListDevice(room);
+ //鍙戦�佺粰缃戝叧鐨勮澶囨埧闂磈son
+ foreach (var device in listDevice)
+ {
+ if (strSendDeviceRoomInfo != string.Empty)
+ {
+ strSendDeviceRoomInfo += "\r\n";
+ }
+ strSendDeviceRoomInfo += " " + this.SetDoublMark(device.DeviceAddr) + " ";
+ strSendDeviceRoomInfo += this.SetDoublMark("0x" + Convert.ToString(device.DeviceEpoint, 16).PadLeft(2, '0')) + " ";
+ strSendDeviceRoomInfo += this.SetDoublMark(LocalDevice.Current.GetDeviceEpointName(device).Replace(UserCenterResourse.douMarks, string.Empty)) + " ";
+ strSendDeviceRoomInfo += this.SetDoublMark(room.Id);
+ }
+ }
+
+ var listAreaSpaceInfo = new List<AreaSpaceInfo>();
+ //棣栧厛娣诲姞浣忓畢
+ var houseInfo = new AreaSpaceInfo();
+ houseInfo.name = Common.Config.Instance.Home.Name;
+ houseInfo.uid = Common.Config.Instance.Home.Id;
+ houseInfo.parentId = null;
+ listAreaSpaceInfo.Add(houseInfo);
+ //鐒跺悗娣诲姞妤煎眰
+ foreach (var floorId in Common.Config.Instance.Home.FloorDics.Keys)
+ {
+ var floorInfo = new AreaSpaceInfo();
+ floorInfo.name = Common.Config.Instance.Home.FloorDics[floorId];
+ floorInfo.uid = floorId;
+ floorInfo.parentId = Common.Config.Instance.Home.Id;
+ listAreaSpaceInfo.Add(floorInfo);
+ }
+ //鐒跺悗娣诲姞鎴块棿
+ var listRoom = this.GetAllListRooms();
+ foreach (var room in listRoom)
+ {
+ if (room.IsLove == true) { continue; }
+
+ var roomInfo = new AreaSpaceInfo();
+ roomInfo.name = room.Name;
+ roomInfo.uid = room.Id;
+ if (Common.Config.Instance.Home.FloorDics.ContainsKey(room.FloorId) == true)
+ {
+ roomInfo.parentId = room.FloorId;
+ }
+ else
+ {
+ roomInfo.parentId = Common.Config.Instance.Home.Id;
+ }
+ listAreaSpaceInfo.Add(roomInfo);
+ }
+ //鐒跺悗娣诲姞缃戝叧鎴块棿淇℃伅
+ var gatewayInfo = new GatewayAreaSpaceInfo();
+
+ var loaclGateway = HdlGatewayLogic.Current.GetLocalGateway(realMain.GwId);
+ if (loaclGateway == null || loaclGateway.GwMac == string.Empty)
+ {
+ //娌℃湁mac,鎴栬�呮壘涓嶅埌瀵硅薄,鍒欎笉涓婁紶
+ return;
+ }
+ string gwMac = loaclGateway.GwMac.Replace(":", string.Empty);
+ gatewayInfo.uid = "000101" + gwMac.Substring(2) + "07";
+ gatewayInfo.name = HdlGatewayLogic.Current.GetGatewayName(loaclGateway);
+
+ var roomGateway = HdlRoomLogic.Current.GetRoomByGateway(loaclGateway);
+ if (roomGateway != null)
+ {
+ gatewayInfo.parentId = roomGateway.Id;
+ }
+ gatewayInfo.hwInfo = new GatewayHwInfo();
+ gatewayInfo.pkgInfo = new GatewayPkgInfo { version = loaclGateway.LinuxFirmwareVersion.ToString() };
+ gatewayInfo.swInfo = new List<GatewaySwInfo> { new GatewaySwInfo { ver = loaclGateway.LinuxFirmwareVersion.ToString() } };
+ gatewayInfo.ip = loaclGateway.GwIP;
+ gatewayInfo.mac = loaclGateway.GwMac;
+
+ var data = new { spaces = listAreaSpaceInfo, gateway = gatewayInfo };
+ string strSendRoomInfo = Newtonsoft.Json.JsonConvert.SerializeObject(data);
+
+ HdlThreadLogic.Current.RunThread(async () =>
+ {
+ //鍙戦�佽澶囧尯鍩熶俊鎭�
+ if (strSendDeviceRoomInfo != string.Empty)
+ {
+ //鍒涘缓鏂囦欢瀵硅薄
+ var result0 = await realMain.CreateFileAsync("DeviceRoomInfo.json");
+ if (result0 == null)
+ {
+ return;
+ }
+ if (result0.Result != 0 && result0.Result != 2)
+ {
+ //濡傛灉鏄�2,鍏佽涓婁紶
+ return;
+ }
+ //鍙戦�佹暟鎹祦
+ var byteData = ASCIIEncoding.UTF8.GetBytes(strSendDeviceRoomInfo);
+ var result1 = await realMain.SendFileAsync(byteData);
+ if (result1 == null || result1.Result != 0)
+ {
+ return;
+ }
+
+ }
+
+ //鍒涘缓鏂囦欢瀵硅薄
+ var result3 = await realMain.CreateFileAsync("space.json");
+ if (result3 == null)
+ {
+ return;
+ }
+ if (result3.Result != 0 && result3.Result != 2)
+ {
+ //濡傛灉鏄�2,鍏佽涓婁紶
+ return;
+ }
+
+ //鍙戦�佸尯鍩熶俊鎭�
+ var byteData2 = ASCIIEncoding.UTF8.GetBytes(strSendRoomInfo);
+ var result4 = await realMain.SendFileAsync(byteData2);
+ });
+ }
+
+ /// <summary>
+ /// 璁剧疆鍙屽紩鍙�
+ /// </summary>
+ /// <param name="i_text"></param>
+ /// <returns></returns>
+ private string SetDoublMark(string i_text)
+ {
+ return UserCenterResourse.douMarks + i_text + UserCenterResourse.douMarks;
+ }
+
+ /// <summary>
+ /// 绌洪棿鍖哄煙淇℃伅
+ /// </summary>
+ private class AreaSpaceInfo
+ {
+ /// <summary>
+ /// 浣忓畢ID 鎴栬�� 妤煎眰ID 鎴栬�� 鎴块棿ID
+ /// </summary>
+ public string uid = string.Empty;
+ /// <summary>
+ /// 浣忓畢鍚嶇О 鎴栬�� 妤煎眰鍚嶇О 鎴栬�� 鎴块棿鍚嶇О
+ /// </summary>
+ public string name = string.Empty;
+ /// <summary>
+ /// 褰撳墠ID鐨勭埗ID,濡傛灉娌℃湁,鍒欎负甯﹀弻寮曞彿鐨�"null" 姣斿 妤煎眰ID灏卞～浣忓畢ID 鎴块棿ID灏卞～妤煎眰ID
+ /// </summary>
+ public string parentId = string.Empty;
+ }
+
+ /// <summary>
+ /// 缃戝叧绌洪棿鍖哄煙淇℃伅
+ /// </summary>
+ private class GatewayAreaSpaceInfo
+ {
+ /// <summary>
+ /// 銆�000101銆�+缁戝畾缃戝叧鐨勬椂闂存埑杞�16杩涘埗+銆�07銆�
+ /// </summary>
+ public string uid = string.Empty;
+ /// <summary>
+ /// 杩欎釜鍥哄畾
+ /// </summary>
+ public string name = "hdl_bus_gatway";
+ /// <summary>
+ /// 缃戝叧鎵�鍦ㄧ殑鎴块棿ID
+ /// </summary>
+ public string parentId = string.Empty;
+ /// <summary>
+ /// 杩欎釜鍥哄畾
+ /// </summary>
+ public int deviceType = 61184;
+ /// <summary>
+ /// 缃戝叧纭欢淇℃伅
+ /// </summary>
+ public GatewayHwInfo hwInfo = null;
+ /// <summary>
+ /// 缃戝叧鏍囧噯淇℃伅
+ /// </summary>
+ public GatewayPkgInfo pkgInfo = null;
+ /// <summary>
+ /// 缃戝叧鍥轰欢鐗堟湰
+ /// </summary>
+ public List<GatewaySwInfo> swInfo = null;
+ /// <summary>
+ /// 缃戝叧IP
+ /// </summary>
+ public string ip = string.Empty;
+ /// <summary>
+ /// 缃戝叧鐨凪ac
+ /// </summary>
+ public string mac = string.Empty;
+ }
+
+ /// <summary>
+ /// 缃戝叧纭欢淇℃伅
+ /// </summary>
+ private class GatewayHwInfo
+ {
+ /// <summary>
+ /// 杩欎釜鍥哄畾
+ /// </summary>
+ public string brand = "MIPS";
+ /// <summary>
+ /// 杩欎釜鍥哄畾
+ /// </summary>
+ public string model = "MT7688";
+ }
+
+ /// <summary>
+ /// 缃戝叧鏍囧噯淇℃伅
+ /// </summary>
+ private class GatewayPkgInfo
+ {
+ /// <summary>
+ /// 杩欎釜鏄疞inux鐨勫浐浠剁増鏈�
+ /// </summary>
+ public string version = string.Empty;
+ }
+
+ /// <summary>
+ /// 缃戝叧鍥轰欢鐗堟湰
+ /// </summary>
+ private class GatewaySwInfo
+ {
+ /// <summary>
+ /// 杩欎釜鍥哄畾
+ /// </summary>
+ public string name = "HDL";
+ /// <summary>
+ /// 杩欎釜鏄疞inux鐨勫浐浠剁増鏈�
+ /// </summary>
+ public string ver = string.Empty;
}
#endregion
@@ -1077,9 +1553,7 @@
newRoom.Id = i_room.Id;
newRoom.FloorId = i_room.FloorId;
newRoom.TemperatrueDevice = i_room.TemperatrueDevice;
- newRoom.Temperatrue = i_room.Temperatrue;
newRoom.HumidityDevice = i_room.HumidityDevice;
- newRoom.Humidity = i_room.Humidity;
newRoom.Name = i_room.Name;
newRoom.BackgroundImage = i_room.BackgroundImage;
newRoom.BackgroundImageType = i_room.BackgroundImageType;
@@ -1092,24 +1566,78 @@
#region 鈻� 涓�鑸柟娉昣__________________________
/// <summary>
+ /// 鑾峰彇鎴块棿鎬绘暟
+ /// </summary>
+ /// <returns></returns>
+ public int GetRoomCount()
+ {
+ return this.dicRooms.Count;
+ }
+
+ /// <summary>
/// 妫�娴嬫垜鐨勫枩鐖辫繖涓埧闂村璞�
/// </summary>
private void CheckLoveRoom()
{
- if (Config.Instance.Home.ListRooms.Contains("Favorite") == false)
+ if (this.dicRooms.ContainsKey("Favorite") == true)
+ {
+ return;
+ }
+ //璇诲彇鏈湴鎴戠殑鍠滅埍鏂囦欢
+ string favoriteFile = System.IO.Path.Combine(Common.Config.Instance.FullPath, "Room_Favorite.json");
+ var fileContent = HdlFileLogic.Current.ReadFileTextContent(favoriteFile);
+ if (fileContent != null)
+ {
+ var love = Newtonsoft.Json.JsonConvert.DeserializeObject<Room>(fileContent);
+ this.dicRooms["Favorite"] = love;
+ }
+ else
{
//榛樿娣诲姞鍠滅埍鐨勬埧闂�--绂佹淇敼鎴块棿鍚�
var love = new Room { Name = Language.StringByID(R.MyInternationalizationString.Favorite), BackgroundImage = "RoomIcon/0.jpg", Id = "Favorite" };
love.Save(false);
- //娣诲姞鍒癶ouse 鎴块棿璺緞鍒楄〃
- var currentHome = Config.Instance.Home;
- currentHome.ListRooms.Insert(0, love.Id);
- currentHome.Save(false);
-
this.dicRooms["Favorite"] = love;
}
}
+ /// <summary>
+ /// 浠庝竴鍫嗘枃瀛椾腑,鑾峰彇杩欎竴鍫嗘枃瀛楅噷闈㈡暟瀛楀瓧绗︿覆鐨勬渶闀块暱搴�
+ /// </summary>
+ /// <param name="listText"></param>
+ /// <returns></returns>
+ private int GetNumberMaxLength(List<string> listText)
+ {
+ int maxLength = 0;
+ foreach (var text in listText)
+ {
+ string value = string.Empty;
+ foreach (var c in text)
+ {
+ if (char.IsNumber(c) == true)
+ {
+ //鏁板瓧
+ value += c.ToString();
+ continue;
+ }
+ else if (value != string.Empty)
+ {
+ //鍒ゆ柇鏁板瓧闀垮害
+ if (maxLength <= value.Length)
+ {
+ maxLength = value.Length;
+ }
+ value = string.Empty;
+ }
+ }
+ //鍒ゆ柇鏁板瓧闀垮害
+ if (maxLength <= value.Length)
+ {
+ maxLength = value.Length;
+ }
+ }
+ return maxLength;
+ }
+
#endregion
}
}
--
Gitblit v1.8.0