请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

 ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs

@@ -125,7 +125,7 @@
            btnRoom.Y = btnDeviceName.Bottom + Application.GetRealHeight(12);

            btnRoom.TextSize = 12;

            btnRoom.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnRoom.Text = Common.Room.CurrentRoom.GetRoomNameByDevice(device);

            btnRoom.Text = HdlRoomLogic.Current.GetRoomNameByDevice(device);

            frameTable.AddChidren(btnRoom, ChidrenBindMode.BindEventOnly);

            rowInfo.btnRoom = btnRoom;

            //摄氏度

@@ -211,21 +211,13 @@
            {

                for (int i = 0; i < listDevice.Count; i++)

                {

                    if (i != 0 && i % 3 == 0)

                    if (this.Parent == null)

                    {

                        //读取5个后，间隔一段时间

                        System.Threading.Thread.Sleep(200);

                        if (this.Parent == null)

                        {

                            return;

                        }

                        return;

                    }

                    //获取当前室温

                    ((AC)listDevice[i]).ReadLocalTemperature();

                    //获取开关状态(处于某种工作状态,即为打开状态)

                    ((AC)listDevice[i]).ReadSystemMode();

                    //清洗滤网

                    listDevice[i].ReadAttri(Cluster_ID.Thermostat, AttriButeId.FilterCleaningStatus);

                    //读取状态

                    Phone.Device.DeviceLogic.ReadDeviceAttributeLogic.Instance.SendThermostatStatuComand(listDevice[i]);

                    System.Threading.Thread.Sleep(200);

                }

            });

        }

@@ -340,7 +332,7 @@
                {

                    var contr = dicControl[this.actionDeviceKeys];

                    contr.btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(device);

                    contr.btnRoom.Text = Common.Room.CurrentRoom.GetRoomNameByDevice(device);

                    contr.btnRoom.Text = HdlRoomLogic.Current.GetRoomNameByDevice(device);

                }

            }

            this.actionDeviceKeys = null;