合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

 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);

                });