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

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

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

@@ -206,7 +206,7 @@
                    if (i != 0 && i % 5 == 0)

                    {

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

                        System.Threading.Thread.Sleep(500);

                        System.Threading.Thread.Sleep(200);

                        if (this.Parent == null)

                        {

                            return;