2024年07月25日17:24:45

mac

2024-07-25 3f6685c77beeb12baf840733fb890860f4c26e7c

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

@@ -65,12 +65,14 @@
            };
            if (addNav)
            {
                new TopViewDiv(bodyView, Language.StringByID(StringId.SecurityCenter)).LoadTopView_ArmCenter(skipAction);
                var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.SecurityCenter));
                topView.maginY = 10;
                topView.LoadTopView_ArmCenter(skipAction);
            }
            VerticalScrolViewLayout contentView = new VerticalScrolViewLayout()
            {
                Y = addNav? Application.GetRealHeight(64):0,
                Height = Application.GetRealHeight(667 - 64),
                Y = addNav? Application.GetRealHeight(64+10):0,
                Height = Application.GetRealHeight(667 - 64-10),
                BackgroundColor = CSS_Color.MainBackgroundColor,
                ScrollEnabled = false,
            };
@@ -285,7 +287,7 @@
                addDefensePage.LoadPage(Language.StringByID(StringId.BurglarAlarm));
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
            disasterAlarmView.SetClick(disasterAlarmViewClick);
            burglarAlarmView.SetClick(burglarAlarmViewClick);
            fixedDeploymentTypeView.AddChidren(burglarAlarmView);
            #endregion

@@ -329,6 +331,10 @@
            armDiyViewList.Clear();
            foreach (var mode in FunctionList.List.securities)
            {
                if(mode.type== "all_day"|| mode.type == "mute")
                {
                    continue;
                }
                var armDiyView = new ArmDiyView("FunctionIcon/ArmCenter/AtHomeDefenseIcon.png", "FunctionIcon/ArmCenter/AtHomeDefenseIconOn.png",
                mode.name,mode.sid);
                customDeploymentView.AddChidren(armDiyView);
@@ -348,7 +354,7 @@
                armDiyViewList.Add(armDiyView);
            }

            if (FunctionList.List.securities.Count < 4)
            if (FunctionList.List.GetOrdinarySecurities().Count < 4)
            {
                var view = new ArmDiyView("FunctionIcon/ArmCenter/AddDefenseIcon.png", "FunctionIcon/ArmCenter/AddDefenseIcon.png",
                  Language.StringByID(StringId.Custom),"customSid");
@@ -428,6 +434,7 @@
                TextID = StringId.Cancel,
                TextColor = CSS_Color.WarningColor,
                IsBold = true,
                TextSize = CSS_FontSize.SubheadingFontSize,
            };
            contentView.AddChidren(btnCancel);

@@ -486,6 +493,10 @@
                {
                    if (bodyView != null)
                    {
                        if(updataTemp.type == "all_day"|| updataTemp.type == "mute")
                        {
                            return;
                        }
                        bodyView.refreshAction?.Invoke();

                        //布防
@@ -503,13 +514,23 @@
                        }
                        else
                        {
                            //撤防
                            if(bodyView.InDefenseMode.sid == updataTemp.sid)
                            try
                            {
                                foreach (var tempView in bodyView.armDiyViewList)
                                //撤防
                                if (bodyView.InDefenseMode != null)
                                {
                                    tempView.LightingView(false);
                                    if (bodyView.InDefenseMode.sid == updataTemp.sid)
                                    {
                                        bodyView.InDefenseMode.status = updataTemp.status;
                                        foreach (var tempView in bodyView.armDiyViewList)
                                        {
                                            tempView.LightingView(false);
                                        }
                                    }
                                }
                            }catch(Exception ex)
                            {
                                MainPage.Log($"撤防异常:{ex.Message}");
                            }
                        }

@@ -536,7 +557,10 @@
                            bodyView.btnArmTipIcon.IsSelected = true; 
                            bodyView.btnDefenseName.Text = bodyView.InDefenseMode.name; 
                        }
                        bodyView.InitAlarmStatus(bodyView.InDefenseMode.alarm);
                        if (bodyView.InDefenseMode != null)
                        {
                            bodyView.InitAlarmStatus(bodyView.InDefenseMode.alarm);
                        }
                    }
                }
                catch (Exception ex)
@@ -651,6 +675,7 @@
                TextSize = CSS_FontSize.TextFontSize,
                Text = title,
                IsBold = true,
                IsMoreLines = true,
            };
            this.AddChidren(btnTitle);