Merge remote-tracking branch 'origin/wjc' into Dev-Branch

wxr

2022-04-21 df93e50c747a585aa3acad599ba9be7d9617872d

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

@@ -626,6 +626,19 @@
            //        new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
            //    },
            //});
            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()
            //{
@@ -645,6 +658,25 @@
            //    {
            //        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.HvacCac,
            //    name = "测试金茂温控",
            //    attributes = new List<FunctionAttributes>()
            //    {
            //        new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
            //        new FunctionAttributes(){ key = "mode",curValue= "cool",state = "cool" ,value = new List<string>(){ "cool", "heat" } },
            //        new FunctionAttributes(){ key = "set_temp",curValue= "22",state = "22" ,value = new List<string>(){},min = 0,max = 30 },
            //        //new FunctionAttributes(){ key = "set_temp_step",curValue= "low",state = "low" ,value = new List<string>(){ "high", "medium", "low", "auto", "stop" } },
            //        new FunctionAttributes(){ key = "humidity",curValue= "0",state = "0" ,value = new List<string>(){  },min = 0,max = 100 },
            //        new FunctionAttributes(){ key = "room_temp",curValue= "26",state = "26" ,value = new List<string>(){  },min = 0,max = 100 },
            //        new FunctionAttributes(){ key = "dew_point_temp",curValue= "20",state = "20" ,value = new List<string>(){  },min = 0,max = 100 },
            //        new FunctionAttributes(){ key = "room_humidity",curValue= "20",state = "20" ,value = new List<string>(){  },min = 0,max = 1000 },
            //        //new FunctionAttributes(){ key = "tvoc",curValue= "20",state = "20" ,value = new List<string>(){  },min = 0,max = 100 },
            //    },
            //});

@@ -853,6 +885,7 @@

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

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

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

                }

                else
                {