Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-10 c0021397eeb8335d6d1f20990c71533c3d94e7af

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

@@ -113,7 +113,7 @@
            rowInfo.btnIcon = btnIcon;



            //设备名称

            var btnDeviceName = new NormalViewControl(400, 60, true);

            var btnDeviceName = new NormalViewControl(700, 60, true);

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

            btnDeviceName.X = Application.GetRealWidth(193);

            btnDeviceName.Y = Application.GetRealHeight(45);

@@ -211,7 +211,7 @@
            {

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

                {

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

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

                    {

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

                        System.Threading.Thread.Sleep(200);