Merge remote-tracking branch 'origin/newBranch1' into WJC

JLChen

2021-08-28 299f4b1218c0d3721aa92bf091950d6708942583

 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs

@@ -40,12 +40,23 @@
            if (btnResidenceArmIcon != null)
            {
                btnResidenceArmIcon.IsSelected = false;
                lock (FunctionList.List.securities)
                {
                foreach (var temp in FunctionList.List.securities)
                {
                    if (temp.status == "enable")
                    {
                            if (temp.alarm)
                            {
                                btnResidenceArmIcon.SelectedImagePath = "PersonalCenter/ResidenceInAlarmIcon.png";
                            }
                            else
                            {
                                btnResidenceArmIcon.SelectedImagePath = "PersonalCenter/ResidenceDefenseIcon.png";
                            }
                        btnResidenceArmIcon.IsSelected = true;
                        break;
                        }
                    }
                }
                btnResidenceArmIcon.MouseUpEventHandler = (sender, e) =>
@@ -308,6 +319,10 @@
        #region 添加设备
        void LoadEvent_SkipbtnAddFunctionPage()
        {
            if (DB_ResidenceData.Instance.GatewayType == 1)
            {
                try
                {
            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
            {
                var page = new BrandListPage();
@@ -318,6 +333,9 @@
            btnResidenceAddFunctionIcon.MouseUpEventHandler = eventHandler;
            btnResidenceAddFunctionText.MouseUpEventHandler = eventHandler;
        }
                catch { }
            }
        }
        #endregion

        #region 关于On、获取支持