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

WJC

2019-10-29 45e4e387f3ef259b9e225fdd543e20be285a5112

 ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs

@@ -320,7 +320,7 @@


            this.dicSensorStatuView.Clear();



            //添加列表控件 
            //添加列表控件

            frameLayoutDraw.RemoveAll();

            var listView = new VerticalFrameControl(35);

            listView.Height = frameLayoutDraw.Height;

@@ -456,7 +456,7 @@
            oldGetOnlineTime = DateTime.Now;



            //从设备列表中获取在线状态

            HdlThreadLogic.Current.RunThread(async () =>

            HdlThreadLogic.Current.RunThread(() =>

            {

                //首先获取这些传感器所在的网关

                var listWay = new List<ZbGateway>();

@@ -477,7 +477,7 @@
                        //界面关闭

                        return;

                    }

                    await Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, false, this.ReceiveDeviceStatuPush, ShowErrorMode.NO);

                    Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, false, this.ReceiveDeviceStatuPush, ShowErrorMode.NO);

                }

            });

        }