隐藏安防

wxr

2021-12-08 b4f5f74d74a0a0996358d8348956601b30f17266

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

@@ -37,7 +37,7 @@

        SecurityAlarm alarm;

        public AddOutputPage(SecurityAlarm inOutput ,Action<SecurityAlarm> action)
        public AddOutputPage(SecurityAlarm inOutput, Action<SecurityAlarm> action)
        {
            bodyView = this;
            refreshAction = action;
@@ -92,7 +92,7 @@
            functionListView = new VerticalScrolViewLayout()
            {
                Y = showdFunctionTypeRow.Bottom,
                Height = Application.GetRealHeight(530 -100),
                Height = Application.GetRealHeight(530 - 100),
                BackgroundColor = CSS_Color.BackgroundColor,
            };
            bodyView.AddChidren(functionListView);
@@ -136,7 +136,7 @@
        /// <summary>
        /// 配置数据
        /// </summary>
        void SetData(string roomId="")
        void SetData(string roomId = "")
        {
            allocatedList.Clear();
            foreach (var function in FunctionList.List.GetLightList())
@@ -207,17 +207,17 @@
                var output = alarm.output.Find((obj) => obj.sid == function.sid);
                if (output == null)
                {
                    output = new SecurityOutput() { status = new List<SecurityOutputStatus> { new SecurityOutputStatus {
                         key = FunctionAttributeKey.OnOff,
                         value = "on"
                    } } };
                  
                    output = new SecurityOutput();
                    //{
                    //    status = new List<SecurityOutputStatus> { new SecurityOutputStatus {
                    //             key = FunctionAttributeKey.OnOff,
                    //             value = "on"
                    //        }
                    //    }
                    //};

                    output.sid = function.sid;
                }
                //else
                //{
                //    output.addCondition = true;
                //}

                FrameLayout functionRow = new FrameLayout()
                {
@@ -257,9 +257,9 @@
                    TextAlignment = TextAlignment.CenterRight,
                    TextSize = CSS_FontSize.TextFontSize,
                    TextColor = CSS_Color.PromptingColor1,
                    Text = output.StateText()
                };
                functionRow.AddChidren(btnState);
              

                Button btnChooseIcon = new Button()
                {
@@ -274,18 +274,20 @@

                btnChooseIcon.MouseUpEventHandler = (sender, e) => {
                    btnChooseIcon.IsSelected = !btnChooseIcon.IsSelected;
                    var tempLocal = alarm.input.Find((obj) =>
                    var tempLocal = alarm.output.Find((obj) =>
                        obj.sid == output.sid
                    );
                    if (tempLocal == null && !string.IsNullOrEmpty(output.spk))
                    {
                        ShowStateDialog(output, btnState, btnChooseIcon);
                    }
                    if (btnChooseIcon.IsSelected)
                    {
                        //input.addCondition = true;
                        if (tempLocal == null)
                            alarm.output.Add(output);
                    }
                    else
                    {
                        //input.addCondition = false;
                        if (tempLocal != null)
                        {
                            alarm.output.Remove(output);
@@ -299,7 +301,7 @@

                var localOutput = alarm.output.Find((obj) => obj.sid == output.sid);

                if (localOutput!=null)
                if (localOutput != null)
                {
                    btnChooseIcon.IsSelected = true;
                    btnState.Text = output.StateText();
@@ -355,7 +357,7 @@
                SelectedTextColor = CSS_Color.MainColor,
                TextColor = CSS_Color.PromptingColor1,
                TextSize = CSS_FontSize.SubheadingFontSize,
                TextID = StringId.On,
                TextID = StringId.Open,
            };
            optinView.AddChidren(btnOpen);
            optinView.AddChidren(new Button()
@@ -370,13 +372,13 @@
                TextAlignment = TextAlignment.Center,
                SelectedTextColor = CSS_Color.MainColor,
                TextColor = CSS_Color.PromptingColor1,
                TextID = StringId.OFF,
                TextID = StringId.Close,
                TextSize = CSS_FontSize.SubheadingFontSize,
            };
            optinView.AddChidren(btnClose);
            if (output.status.Count > 0)
            {
                btnOpen.IsSelected =  output.status[0].value.ToLower() == "on";
                btnOpen.IsSelected = output.status[0].value.ToLower() == "on";
                btnClose.IsSelected = !btnOpen.IsSelected;
            }

@@ -452,8 +454,6 @@
            };

        }




        /// <summary>