Merge branch 'wxr-2.2' into Dev-Branch

wxr

2023-10-20 4e4f9c3ee4ff6d05d5a431626901fbf43eb368a9

 HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs

@@ -512,7 +512,11 @@
                        }
                        else
                        {
                            try
                            {
                            //撤防
                                if (bodyView.InDefenseMode != null)
                                {
                            if (bodyView.InDefenseMode.sid == updataTemp.sid)
                            {
                                bodyView.InDefenseMode.status = updataTemp.status;
@@ -520,6 +524,11 @@
                                {
                                    tempView.LightingView(false);
                                }
                                    }
                                }
                            }catch(Exception ex)
                            {
                                MainPage.Log($"撤防异常:{ex.Message}");
                            }
                        }

@@ -546,9 +555,12 @@
                            bodyView.btnArmTipIcon.IsSelected = true; 
                            bodyView.btnDefenseName.Text = bodyView.InDefenseMode.name; 
                        }
                        if (bodyView.InDefenseMode != null)
                        {
                        bodyView.InitAlarmStatus(bodyView.InDefenseMode.alarm);
                    }
                }
                }
                catch (Exception ex)
                {
                    MainPage.Log($"安防界面更新异常：{ex.Message}");