合并了晾衣架(非新云端)

黄学彪

2020-12-14 e90209beae6a4e822cecb18e6889f8bda23f630e

 ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedListRoomForm.cs

@@ -76,7 +76,7 @@
            bodyFrameLayout.AddChidren(frameBack);

            //房间列表

            var btnTitle = new NormalViewControl(800, 60, true);

            btnTitle.X = HdlControlResourse.XXLeft;

            btnTitle.X = ControlCommonResourse.XXLeft;

            btnTitle.Y = Application.GetRealHeight(52);

            btnTitle.TextID = R.MyInternationalizationString.RoomList;

            btnTitle.TextColor = UserCenterColor.Current.TextColor2;

@@ -333,7 +333,7 @@
                //获取房间全部设备

                foreach (var deviceKeys in listRoom[i].ListDevice)

                {

                    var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);

                    var device = Common.LocalDevice.Current.GetDevice(deviceKeys);

                    if (device == null || memberShardInfo.dicAllShardKeys.ContainsKey(device.FilePath) == true)

                    {

                        //异常

@@ -440,7 +440,7 @@
            }

            foreach (var deviceKeys in room.ListDevice)

            {

                var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);

                var device = Common.LocalDevice.Current.GetDevice(deviceKeys);

                if (device == null)

                {

                    continue;