111

wxr

2021-12-01 01b8b5bde8a58060bdd03b78a32747c5aa551976

 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,11 +207,14 @@
                var output = alarm.output.Find((obj) => obj.sid == function.sid);
                if (output == null)
                {
                    output = new SecurityOutput() { status = new List<SecurityOutputStatus> { new SecurityOutputStatus {
                    output = new SecurityOutput()
                    {
                        status = new List<SecurityOutputStatus> { new SecurityOutputStatus {
                         key = FunctionAttributeKey.OnOff,
                         value = "on"
                    } } };
                  
                    } }
                    };

                    output.sid = function.sid;
                }
                //else
@@ -259,7 +262,7 @@
                    TextColor = CSS_Color.PromptingColor1,
                };
                functionRow.AddChidren(btnState);
              


                Button btnChooseIcon = new Button()
                {
@@ -299,7 +302,7 @@

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

                if (localOutput!=null)
                if (localOutput != null)
                {
                    btnChooseIcon.IsSelected = true;
                    btnState.Text = output.StateText();
@@ -376,7 +379,7 @@
            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;
            }