Merge remote-tracking branch 'origin/wxr0114' into wjc

wjc

2022-01-19 07b0239f824ddb5a0cadf93f20ff6247f72baca2

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

@@ -66,7 +66,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());
@@ -93,7 +93,7 @@
            bodyView.AddChidren(functionListView);


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


@@ -177,6 +177,8 @@
                            inValue = "alarm";
                            break;
                        case SPK.SensorDoorWindow:
                        case SPK.SensorDryContact:
                        case SPK.SensorDryContact2:
                            inKey = "contact_status";
                            inValue = "open";
                            break;