2020.2.28

gxc

2020-02-28 66a9965c44ecc32a6696abca876ab9d1cd091584

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

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

                {

                    //菜单控件

                    var frameMenu = new TopRightMenuControl(2);

                    var frameMenu = new TopRightMenuControl(2, 2);

                    //防区列表

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

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

@@ -490,7 +490,7 @@
                var control = this.dicSensorStatuView[mainkey];

                //获取传感器报警信息的翻译文本

                var msgInfo = HdlAlarmsLogic.Current.GetSensorAlarmInfo(device);

                Application.RunOnMainThread(() =>

                HdlThreadLogic.Current.RunMain(() =>

                {

                    control?.SetSensoReportInfo(msgInfo);

                });

@@ -549,7 +549,16 @@
                        //界面关闭

                        return;

                    }

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

                    int statu = 0;

                    var list = Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, ref statu, false, ShowErrorMode.NO);

                    if (statu != -1)

                    {

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

                        {

                            //设置设备在线状态

                            this.ReceiveDeviceStatuPush(list[i]);

                        }

                    }

                }

            });

        }