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

wjc

2022-05-24 7cfcdb7a90f59bf9001c948e166fd9af09752fe1

 HDL_ON/UI/UI2/1-HomePage/HomePage.cs

@@ -569,7 +569,7 @@

            //FunctionList.List.Functions.Add(new Function
            //{
            //    name = "门锁",
            //    name = "测试门锁",
            //    spk = SPK.DoorLock,
            //    sid = "12345",
            //    attributes = new List<FunctionAttributes> {
@@ -626,18 +626,43 @@
            //        new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
            //    },
            //});

            FunctionList.List.Functions.Add(new Function()
            {
                spk = SPK.SensorHelp,
                name = "测试紧急求助按钮",
                spk = SPK.SensorPm25,
                name = "测试Pm2.5",
                attributes = new List<FunctionAttributes>()
                {
                    new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
                    new FunctionAttributes(){ key = "battery_value",curValue= "2000",state = "2000" },
                    new FunctionAttributes(){ key = "battery_percentage",curValue= "80",state = "80" },
                    new FunctionAttributes(){ key = "battery_state",curValue= "high",state = "high" },
                    new FunctionAttributes(){ key = "pm25",curValue= "70",state = "70" },
                },
                attrKeyConfigs = new List<AttrKeyConfig>()
                {
                    new AttrKeyConfig (){
                        key = "pm2.5",
                        type = "interval" ,
                        unit = "ug/m²",
                        configs = new List<AttrKeyInfo>(){
                           new AttrKeyInfo(){ start = "0",end = "75",color = "0xFFADE764", desc = "良好"},
                           new AttrKeyInfo(){ start = "76",end = "150",color = "0xFFFFD154",desc = "轻/中度污染"},
                           new AttrKeyInfo(){ start = "151",end = "500",color = "0xFFFF9D54",desc = "重度/严重污染"},
                        }
                    }
                },
            });

            //FunctionList.List.Functions.Add(new Function()
            //{
            //    spk = SPK.SensorHelp,
            //    name = "测试紧急求助按钮",
            //    attributes = new List<FunctionAttributes>()
            //    {
            //        new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
            //        new FunctionAttributes(){ key = "alarm_status",curValue= "alarm",state = "alarm" },
            //        new FunctionAttributes(){ key = "battery_value",curValue= "200",state = "200" },
            //        new FunctionAttributes(){ key = "battery_percentage",curValue= "10",state = "10" },
            //        new FunctionAttributes(){ key = "battery_state",curValue= "low",state = "low" },
            //    },
            //});

            //FunctionList.List.Functions.Add(new Function()
            //{
@@ -653,11 +678,23 @@
            //{
            //    spk = SPK.AirFreshStandard,
            //    name = "测试新风",
            //    sid = "098765433242342342",
            //    attributes = new List<FunctionAttributes>()
            //    {
            //        new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
            //        new FunctionAttributes(){ key = "fan",curValue= "low",state = "low" ,value = new List<string>(){ "high", "medium", "low" } },
            //    },
            //});

            //FunctionList.List.Functions.Add(new Function()
            //{
            //    spk = SPK.PanelEnvironment,
            //    name = "测试环境面板",
            //    targetSids = new List<string> {
            //        "098765433242342342",
            //        "ac1",
            //        "floorheat1"
            //    }
            //});


@@ -884,6 +921,7 @@

        /// <summary>
        /// 加载设备功能显示区域
        /// Tag 收藏卡片
        /// </summary>
        void LoadDeviceFunctionControlZone()
        {
@@ -1097,6 +1135,7 @@

        /// <summary>
        /// 加载功能控制卡片
        /// Tag 卡片自定义
        /// </summary>
        void LoadDeviceFunctionDiv(FrameLayout view, Function function)
        {
@@ -1311,6 +1350,11 @@
                    LoadEvent_ControlClothesHanger(function, btnUp, btnDown);

                }
                //紧急求助
                else if (function.spk == SPK.SensorHelp)
                {

                }

                else
                {