上传个东西

黄学彪

2020-04-13 3793a9a38ac6c4c4111c2bba3a35a71c30601e82

 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)