2024年07月25日17:24:45

mac

2024-07-25 3f6685c77beeb12baf840733fb890860f4c26e7c

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

@@ -29,12 +29,14 @@
        public void LoadPage()
        {
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(StringId.AddDefenseFunction)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.AddDefenseFunction));
            topView.maginY = 10;
            topView.LoadTopView();

            #region 显示的功能类型切换区域
            var showdFunctionTypeRow = new FrameLayout()
            {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(53),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
@@ -66,7 +68,7 @@
            btnFloor.MouseUpEventHandler = (sender, e) =>
            {
                string nowSelectId = null;
                var list = FunctionList.List.GetArmSensorList();
                var list = FunctionList.List.GetArmCenterList();

#if DEBUG
                list.AddRange(FunctionList.List.GetLightList());
@@ -81,19 +83,25 @@
                }, nowSelectId);
            };

            showdFunctionTypeRow.AddChidren(new Button() {
                Height = 1,
                Y = Application.GetRealHeight(52),
                BackgroundColor = CSS_Color.DividingLineColor
            });


            #endregion

            functionListView = new VerticalScrolViewLayout()
            {
                Y = showdFunctionTypeRow.Bottom,
                Height = Application.GetRealHeight(530-60),
                Height = Application.GetRealHeight(530-60-10),
                BackgroundColor = CSS_Color.BackgroundColor,
            };
            bodyView.AddChidren(functionListView);


            var listAllFun = FunctionList.List.GetArmSensorList();
            var listAllFun = FunctionList.List.GetArmCenterList();
#if DEBUG
            listAllFun.AddRange(FunctionList.List.GetLightList());
#endif
@@ -145,7 +153,7 @@
            if (functions == null)
            {
                //初始值
                functions = FunctionList.List.GetArmSensorList();
                functions = FunctionList.List.GetArmCenterList();
            }


@@ -166,6 +174,7 @@
                            inValue = "alarm";
                            break;
                        case SPK.SensorPir:
                        case SPK.SensorPirHold:
                            inKey = "people_status";
                            break;
                        case SPK.SensorSmoke:
@@ -177,6 +186,8 @@
                            inValue = "alarm";
                            break;
                        case SPK.SensorDoorWindow:
                        case SPK.SensorDryContact:
                        case SPK.SensorDryContact2:
                            inKey = "contact_status";
                            inValue = "open";
                            break;