From 9c16d3614d9b88c637f967518a329f239fcd3aaf Mon Sep 17 00:00:00 2001
From: lss <316519258@qq.com>
Date: 星期五, 12 六月 2020 09:22:04 +0800
Subject: [PATCH] 2020.06.12
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
index 5c673dc..4244dad 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
@@ -365,6 +365,8 @@
}
}
+ //娓呯┖妤煎眰鏁版嵁
+ Common.Config.Instance.Home.FloorDics.Clear();
//鐒跺悗妫�娴嬫湰鍦扮殑鏂囦欢
var listLocalFile = Global.FileListByHomeId();
foreach (string fileName in listLocalFile)
@@ -375,8 +377,7 @@
var varData = Global.ReadFileByHomeId(fileName);
var dicFloor = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(Encoding.UTF8.GetString(varData));
Common.Config.Instance.Home.FloorDics = dicFloor;
- Common.Config.Instance.Home.Save(false);
-
+ //鏆傛椂涓嶄繚瀛�,鐣欏湪鏈�鍚庨潰鎵嶄繚瀛�
Global.DeleteFilebyHomeId(fileName);
}
@@ -425,6 +426,10 @@
dicUpdateTime.Remove(fileName);
}
}
+
+ //淇濆瓨妤煎眰鏁版嵁
+ Common.Config.Instance.Home.Save(false);
+
//缃戝叧鏂囦欢闈炲悎娉曟�ф槸鍒锋柊璁惧鍒楄〃鐨勫嚱鏁伴噷闈㈠疄鐜�
//淇濆瓨鍏ㄩ儴鍒嗕韩鏂囦欢鐨勬洿鏂版棩鏈�
@@ -446,7 +451,7 @@
private Dictionary<string, string> GetAllShardFileAgoUpdateTime()
{
var dicTime = new Dictionary<string, string>();
- var data = Global.ReadFileByDirectory(DirNameResourse.LocalMemoryDirectory, DirNameResourse.ShardFileUpdateFile);
+ var data = Global.ReadFileByDirectory(DirNameResourse.LocalMemoryDirectory, DirNameResourse.ShardFileUpdateTimeFile);
if (data == null)
{
//鐩爣鏂囦欢涓嶅瓨鍦�
@@ -464,7 +469,7 @@
{
var data = Newtonsoft.Json.JsonConvert.SerializeObject(dicTime);
var byteData = System.Text.Encoding.UTF8.GetBytes(data);
- Global.WriteFileToDirectoryByBytes(DirNameResourse.LocalMemoryDirectory, DirNameResourse.ShardFileUpdateFile, byteData);
+ Global.WriteFileToDirectoryByBytes(DirNameResourse.LocalMemoryDirectory, DirNameResourse.ShardFileUpdateTimeFile, byteData);
}
#endregion
@@ -655,7 +660,7 @@
var tempUi = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.SceneUI>(valueData);
//鑾峰彇鍦烘櫙閲岄潰鐨勫叏閮ㄧ洰鏍�(2019.11.05杩藉姞鎿嶄綔,鏈夊彲鑳介偅涓澶囨槸鐢卞満鏅祵濂楁潵鐨�,鎵�浠ュ畠鏈夊彲鑳戒笉灞炰簬浠讳綍鎴块棿)
- foreach (var data in tempUi.AddSceneMemberDataList)
+ foreach (var data in tempUi.AdjustTargetList)
{
//璁惧
if (data.Type == 0)
@@ -952,7 +957,7 @@
/// <returns></returns>
public void GetSceneDeviceList(Common.SceneUI scene, HashSet<string> listCheck, List<Common.SceneUI> listSceneUI, List<CommonDevice> listDevice)
{
- foreach (var data in scene.AddSceneMemberDataList)
+ foreach (var data in scene.AdjustTargetList)
{
//璁惧
if (data.Type == 0)
@@ -1698,7 +1703,7 @@
/// <param name="listBindScene">缁戝畾鐨勫満鏅璞�</param>
private void GetSceneBindListKeys(Common.SceneUI scene, ref Dictionary<string, string> dicDeviceKeys, ref List<SceneUI> listBindScene)
{
- foreach (var data in scene.AddSceneMemberDataList)
+ foreach (var data in scene.AdjustTargetList)
{
//璁惧
if (data.Type == 0)
@@ -1729,7 +1734,7 @@
/// <param name="listKeys">涓婚敭鍒楄〃(璁惧鍜屽満鏅�)</param>
private void GetSceneBindListKeys(Common.SceneUI scene, ref HashSet<string> listKeys)
{
- foreach (var data in scene.AddSceneMemberDataList)
+ foreach (var data in scene.AdjustTargetList)
{
//璁惧
if (data.Type == 0)
--
Gitblit v1.8.0