From 3793a9a38ac6c4c4111c2bba3a35a71c30601e82 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 13 四月 2020 19:38:24 +0800
Subject: [PATCH] 上传个东西
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
index 8ec74ce..095152f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
@@ -655,7 +655,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 +952,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 +1412,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 +1425,6 @@
//鎵ц涓婁紶瀵硅薄
result = await this.DoUploadFloorObject(memberShardInfo);
}
-
}
if (result == false)
@@ -1695,7 +1698,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 +1729,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