Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

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

@@ -175,7 +175,7 @@
            btnIcon.ButtonClickEvent += (sender, e) =>

            {

                //菜单控件

                var frameMenu = new TopRightMenuControl(this, 2);

                var frameMenu = new TopRightMenuControl(2);

                //防区列表

                string menu1 = Language.StringByID(R.MyInternationalizationString.uGarrisonAreaList);

                frameMenu.AddRowMenu(menu1, "Item/GarrisonList.png", "Item/GarrisonListSelected.png", () =>

@@ -444,16 +444,19 @@
            {

                return;

            }

            var timeValue = (DateTime.Now - oldGetOnlineTime).Milliseconds;

            if (timeValue <= 10000)

            if (oldGetOnlineTime.Year != 1900)

            {

                //最少要间隔十秒,才去重新获取

                return;

                var timeValue = (DateTime.Now - oldGetOnlineTime).TotalSeconds;

                if (timeValue < 10)

                {

                    //最少要间隔十秒,才去重新获取

                    return;

                }

            }

            oldGetOnlineTime = DateTime.Now;



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

            HdlThreadLogic.Current.RunThread(async () =>

            HdlThreadLogic.Current.RunThread(() =>

            {

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

                var listWay = new List<ZbGateway>();

@@ -474,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);

                }

            });

        }