From e7a71b8318fa26b8a85eac86e4c0a129f453d44f Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 08 一月 2020 17:54:16 +0800
Subject: [PATCH] 2019.1.8
---
ZigbeeApp/Shared/Common/Room.cs | 103 +++++++++++++++++++++++++++++++++------------------
1 files changed, 66 insertions(+), 37 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Room.cs b/ZigbeeApp/Shared/Common/Room.cs
old mode 100755
new mode 100644
index 5d8d500..df0c48c
--- a/ZigbeeApp/Shared/Common/Room.cs
+++ b/ZigbeeApp/Shared/Common/Room.cs
@@ -69,7 +69,7 @@
/// <summary>
/// 娓╁害浼犳劅鍣�(璁惧涓婚敭)
- /// </summary>
+ /// </summary>
public string TemperatrueDevice = string.Empty;
/// <summary>
/// 婀垮害浼犳劅鍣�(璁惧涓婚敭)
@@ -78,11 +78,11 @@
/// <summary>
/// 娓╁害
/// </summary>
- public double Temperatrue;
+ public decimal Temperatrue;
/// <summary>
/// 婀垮害
/// </summary>
- public double Humidity;
+ public decimal Humidity;
/// <summary>
/// 褰撳墠閫夋嫨鐨勬埧闂�
@@ -332,18 +332,18 @@
room.Name = $"{room.Name}";
}
Lists.Add(room);
-
+
}
}
Config.Instance.Home.InitFloor();
- RefreshRoomListView();
+ CurrentRoom.RefreshRoomListView();
}
/// <summary>
/// 鍒锋柊鎴块棿瑙嗗浘鍒楄〃
/// </summary>
- public static void RefreshRoomListView()
+ public void RefreshRoomListView()
{
Application.RunOnMainThread(() =>
{
@@ -494,6 +494,9 @@
Global.DeleteFilebyHomeId(roomFilePath);
Lists.Remove(room);
HdlAutoBackupLogic.DeleteFile(roomFilePath);
+
+ CurrentRoom.RefreshRoomListView();
+
return true;
}
@@ -538,8 +541,21 @@
//璁惧锛坉eviceUI锛�
beforeRoom.DeviceUIList.Clear();
foreach (var deviceFilePath in beforeRoom.DeviceUIFilePathList)
- {
- beforeRoom.DeviceUIList.Add(Common.LocalDevice.Current.GetDeviceUI(deviceFilePath));
+ {
+ var jsonInfo = Encoding.UTF8.GetString(Global.ReadFileByHomeId(deviceFilePath));
+ var tempDeviceUI = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceUI>(jsonInfo);
+ if (tempDeviceUI != null)
+ {
+ var delCommon = tempDeviceUIList.Find((obj) => obj.CommonDevice != null && tempDeviceUI.CommonDevice != null && obj.CommonDevice.Type == tempDeviceUI.CommonDevice.Type && obj.CommonDevice.CommonDeviceAddrEpoint == tempDeviceUI.CommonDevice.CommonDeviceAddrEpoint);
+ if (delCommon != null)
+ {
+ beforeRoom.DeviceUIList.Add(delCommon);
+ }
+ else
+ {
+ beforeRoom.AddDevice(deviceFilePath);
+ }
+ }
}
//鍦烘櫙(SceneUI)
beforeRoom.SceneUIList.Clear();
@@ -790,6 +806,25 @@
return true;
}
return false;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鎴块棿鎵�鍦ㄥ尯鍩�
+ /// 妤煎眰,鎴块棿鍚�
+ /// </summary>
+ /// <returns></returns>
+ public string GetZoneName()
+ {
+ if (string.IsNullOrEmpty(FloorId))
+ {
+ return Name;
+ }
+ var floorName = Config.Instance.Home.GetFloorNameById(FloorId);
+ if (floorName == null)
+ {
+ return Name;
+ }
+ return $"{floorName},{Name}";
}
#endregion
@@ -1091,16 +1126,16 @@
/// <param name="sceneIconPath">鑳屾櫙鍥剧墖锛屼笉鍖呭惈浣忓畢璺緞 濡傛灉iconPathType=1鎴栬��2 闇�瑕佹嫾鎺ヤ綇瀹� 鍙樻垚 浣忓畢/sceneIconPath</param>
/// <param name="commons">Commons.</param>
/// <param name="iconPathType">I鍦烘櫙鑳屾櫙鍥剧墖鏉ユ簮绫诲瀷 鍥剧墖鏉ユ簮 0--鏈湴鍥惧簱 1--鎷嶇収 2--绯荤粺鍥惧簱 榛樿0</param>
- public async System.Threading.Tasks.Task<int> AddScene(string sceneName, string sceneIconPath, List<ZigBee.Device.Scene.AddSceneMemberData> commons, int iconPathType = 0)
+ public async System.Threading.Tasks.Task<int> AddScene(string sceneName, string sceneIconPath, List<ZigBee.Device.Scene.AddSceneMemberData> commons, int iconPathType)
{
- var scenes = GetSceneUIsByFloorId(FloorId);
- if(scenes!=null && scenes.Count>0)
- {
- if (scenes.Find(s => s.Name == sceneName) != null)
- {
- return -1;
- }
- }
+ //var scenes = GetSceneUIsByFloorId(FloorId);
+ //if(scenes!=null && scenes.Count>0)
+ //{
+ // if (scenes.Find(s => s.Name == sceneName) != null)
+ // {
+ // return -1;
+ // }
+ //}
var getSceneIdAllData = await ZigBee.Device.Scene.GetSceneNewIdAsync(sceneName);
if (getSceneIdAllData == null || getSceneIdAllData.getSceneIdData == null)
@@ -1140,26 +1175,18 @@
//鍔犲叆鎴愬姛
if (result)
{
- //iconPathType=0 鐩存帴浼犲�硷紝 iconPathType=1鍜宨conPathType=2闇�瑕佹嫾鎺ヤ綇瀹呰矾寰�
- var fullPath = sceneIconPath;
- if (iconPathType == 1 || iconPathType == 2)
- {
- Common.Room.CurrentRoom.MoveBackGroundIamageFileToDirectory(sceneIconPath, $"{Config.Instance.FullPath}/{sceneIconPath}");
- fullPath = $"{Config.Instance.FullPath}/{sceneIconPath}";
- }
var sceneUI = new SceneUI
{
Name = sceneName,
Id = getSceneIdData.NewScenesId,
- IconPath = fullPath,
+ IconPath = sceneIconPath,
IconPathType = iconPathType,
AddSceneMemberDataList= commons
};
+ sceneUI.Save();
SceneUIList.Add(sceneUI);
SceneUIFilePathList.Add(sceneUI.FileName);
- sceneUI.Save();
Save();
- HdlAutoBackupLogic.AddOrEditorFile(sceneUI.FileName);
return 1;
}
return 0;
@@ -1205,15 +1232,10 @@
/// <summary>
/// 鏄惁鏄敹钘忚澶�
/// </summary>
- /// <param name="room"></param>
/// <param name="filePath"></param>
/// <returns></returns>
- public bool IsCollectInRoom(Room room,string filePath)
+ public bool IsCollectInRoom(string filePath)
{
- if(room.IsLove)
- {
- return true;
- }
if (GetLoveRoom().DeviceUIFilePathList.Find((obj) => obj == filePath) == null)
{
return false;
@@ -1233,10 +1255,10 @@
/// <param name="addCommons">Add commons.</param>
public async System.Threading.Tasks.Task<int> ModifyScene(SceneUI sceneUI, Scene.SceneRemoveMemberData sceneRemoveMemberData, List<Scene.AddSceneMemberData> addCommons)
{
- if (AllRoomSceneUIList.Find(s => s.Name == sceneUI.Name) == null)
- {
- return 0;
- }
+ //if (AllRoomSceneUIList.Find(s => s.Name == sceneUI.Name) == null)
+ //{
+ // return 0;
+ //}
bool result = true;
//绉婚櫎鎴愬憳 杩斿洖缁撴灉
@@ -1310,6 +1332,13 @@
SceneUIList.Remove(sceneUI);
SceneUIFilePathList.Remove(sceneUI.FileName);
Save();
+ if (IsLove == false)
+ {
+ if (CurrentRoom.GetLoveRoom().SceneUIList.Find((obj) => obj.Id == sceneUI.Id) != null)
+ {
+ CurrentRoom.GetLoveRoom().DeleteScene(sceneUI);
+ }
+ }
Global.DeleteFilebyHomeId(sceneUI.FileName);
HdlAutoBackupLogic.DeleteFile(sceneUI.FileName);
}
--
Gitblit v1.8.0