From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:14:28 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android，没调用拒接接口问题。
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 61 ++++++++++++++++++++----------
1 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index a99dee1..7de95a3 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -551,25 +551,25 @@
#if DEBUG
- FunctionList.List.Functions.Add(new Function()
- {
- spk = SPK.SensorDryContact,
- name = "骞叉帴鐐�",
- attributes = new List<FunctionAttributes>()
- {
- new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
- },
- });
+ //FunctionList.List.Functions.Add(new Function()
+ //{
+ // spk = SPK.SensorDryContact,
+ // name = "骞叉帴鐐�",
+ // attributes = new List<FunctionAttributes>()
+ // {
+ // new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
+ // },
+ //});
- FunctionList.List.Functions.Add(new Function()
- {
- spk = SPK.AirSwitch,
- name = "鏅鸿兘绌哄紑",
- attributes = new List<FunctionAttributes>()
- {
- new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
- },
- });
+ //FunctionList.List.Functions.Add(new Function()
+ //{
+ // spk = SPK.AirSwitch,
+ // name = "鏅鸿兘绌哄紑",
+ // attributes = new List<FunctionAttributes>()
+ // {
+ // new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
+ // },
+ //});
//FunctionList.List.Functions.Add(new Function()
//{
@@ -581,6 +581,25 @@
// new FunctionAttributes(){ key = "fan",curValue= "low",state = "low" ,value = new List<string>(){ "high", "medium", "low" } },
// },
//});
+
+
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.HvacAirFreshJinmao,
+ name = "娴嬭瘯閲戣寕鏂伴",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
+ new FunctionAttributes(){ key = "mode",curValue= "humidification",state = "humidification" ,value = new List<string>(){ "humidification", "fan" } },
+ new FunctionAttributes(){ key = "energy",curValue= "true",state = "true" ,value = new List<string>(){ "true", "false" } },
+ new FunctionAttributes(){ key = "fan",curValue= "level_1",state = "level_1" ,value = new List<string>(){ "level_1", "level_2", "level_3","auto" } },
+ new FunctionAttributes(){ key = "humidity",curValue= "0",state = "0" ,value = new List<string>(){ },min = 0,max = 100 },
+ new FunctionAttributes(){ key = "indoor_temp",curValue= "26",state = "26" ,value = new List<string>(){ },min = 0,max = 100 },
+ new FunctionAttributes(){ key = "indoor_humidity",curValue= "0",state = "0" ,value = new List<string>(){ },min = 0,max = 100 },
+ new FunctionAttributes(){ key = "filter_remain",curValue= "0",state = "0" ,value = new List<string>(){ },min = 0,max = 100 },
+ new FunctionAttributes(){ key = "filter_timeout",curValue= "false",state = "false" ,value = new List<string>(){ "true", "false" }},
+ },
+ });
//FunctionList.List.Functions.Add(new Function()
//{
@@ -782,7 +801,7 @@
foreach (var function in list)
{
//闊充箰妯″潡鏈変富浠庡叧绯伙紝闇�瑕佺壒娈婂鐞�
- if (function.Spk_Prefix == FunctionCategory.Music)
+ if (SPK.MusicSpkList().Contains( function.spk))
{
//var music = function as Music.A31MusicModel;
var music = Music.A31MusicModel.A31MusicModelList.Find((obj) => obj.sid == function.sid);
@@ -1111,7 +1130,7 @@
LoadEvent_ControlTV(function, btnPower);
}
- else if (function.spk == SPK.MusicStandard)
+ else if (function.spk == SPK.MusicStandard || function.spk == SPK.AvMusic)
{
btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicIcon.png";
btnIcon.SelectedImagePath = "FunctionIcon/Music/MusicOnIcon.png";
@@ -1208,7 +1227,7 @@
//鍙栨秷鏀惰棌浜嬩欢
Action cannelCollect = () => {
function.collect = false;
- if (function.Spk_Prefix == FunctionCategory.Music)//澶勭悊闊充箰涓讳粠鍏崇郴
+ if (SPK.MusicSpkList().Contains(function.spk))//澶勭悊闊充箰涓讳粠鍏崇郴
{
if ((function as Music.A31MusicModel).ServerClientType == 1)
{
--
Gitblit v1.8.0