From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
index 8ec74ce..2da6efc 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);
+
//缃戝叧鏂囦欢闈炲悎娉曟�ф槸鍒锋柊璁惧鍒楄〃鐨勫嚱鏁伴噷闈㈠疄鐜�
//淇濆瓨鍏ㄩ儴鍒嗕韩鏂囦欢鐨勬洿鏂版棩鏈�
@@ -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)
@@ -1412,7 +1417,11 @@
int floorCount = 0;
foreach (var myRoom in memberShardInfo.dicShardRoom.Values)
{
- if (myRoom.FloorId == roomTemp.FloorId) { floorCount++; }
+ //2020.03.24杩藉姞:涓嶈兘鏄嚜韬埧闂�
+ if (myRoom.FloorId == roomTemp.FloorId && myRoom.Id != roomTemp.Id)
+ {
+ floorCount++;
+ }
}
if (floorCount == 0)
{
@@ -1421,7 +1430,6 @@
//鎵ц涓婁紶瀵硅薄
result = await this.DoUploadFloorObject(memberShardInfo);
}
-
}
if (result == false)
@@ -1695,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)
@@ -1726,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