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/Entity/Function/FloorHeating.cs | 97 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 76 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/Entity/Function/FloorHeating.cs b/HDL_ON/Entity/Function/FloorHeating.cs
index 02aaffd..30ef6c0 100644
--- a/HDL_ON/Entity/Function/FloorHeating.cs
+++ b/HDL_ON/Entity/Function/FloorHeating.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using Shared;
namespace HDL_ON.Entity
{
@@ -151,33 +152,87 @@
/// <summary>
/// 鑾峰彇妯″紡鐨刬con璺緞
+ /// <param name="lightingIcon">鑾峰彇鐨勫浘鏍囩被鍨嬶紝榛樿鏄偣浜�</param>
/// </summary>
- public string GetModeImage(Function function)
+ public string GetModeIconPath(string modeValue, bool lighting = true)
{
var imagePath = "FunctionIcon/AC/HeatingIcon.png";
- var key = function.GetAttrState(FunctionAttributeKey.Mode);
- switch (key)
+ //var key = function.GetAttrState(FunctionAttributeKey.Mode);
+ if (lighting)
{
- case "day":
- imagePath = "FunctionIcon/AC/HeatingIcon.png";
- break;
- case "night":
- imagePath = "FunctionIcon/FloorHeating/NightIcon.png";
- break;
- case "away":
- imagePath = "FunctionIcon/FloorHeating/AwayIcon.png";
- break;
- case "timer":
- imagePath = "FunctionIcon/AC/AutoIcon.png";
- break;
- case "normal":
- imagePath = "FunctionIcon/FloorHeating/OrdinaryIcon.png";
- break;
- default:
- imagePath = "FunctionIcon/AC/HeatingIcon.png";
- break;
+ switch (modeValue)
+ {
+ case "day":
+ imagePath = "FunctionIcon/AC/HeatingIcon.png";
+ break;
+ case "night":
+ imagePath = "FunctionIcon/FloorHeating/NightIcon.png";
+ break;
+ case "away":
+ imagePath = "FunctionIcon/FloorHeating/AwayIcon.png";
+ break;
+ case "timer":
+ imagePath = "FunctionIcon/AC/AutoIcon.png";
+ break;
+ case "normal":
+ imagePath = "FunctionIcon/FloorHeating/OrdinaryIcon.png";
+ break;
+ default:
+ imagePath = "FunctionIcon/AC/HeatingIcon.png";
+ break;
+ }
+ }
+ else
+ {
+ switch (modeValue)
+ {
+ case "day":
+ imagePath = "FunctionIcon/AC/HeatingIconGray.png";
+ break;
+ case "night":
+ imagePath = "FunctionIcon/FloorHeating/NightIconGray.png";
+ break;
+ case "away":
+ imagePath = "FunctionIcon/FloorHeating/AwayIconGray.png";
+ break;
+ case "timer":
+ imagePath = "FunctionIcon/AC/AutoIconGray.png";
+ break;
+ case "normal":
+ imagePath = "FunctionIcon/FloorHeating/OrdinaryIconGray.png";
+ break;
+ }
}
return imagePath;
}
+
+
+ /// <summary>
+ /// 鑾峰彇妯″紡灞炴�ф枃鏈�
+ /// </summary>
+ /// <returns></returns>
+ public string GetModeAttrText(string value)
+ {
+ string text = "";
+ switch (value)
+ {
+ case "day":
+ text = Language.StringByID(StringId.Day);
+ break;
+ case "night":
+ text = Language.StringByID(StringId.Night);
+ break;
+ case "away":
+ text = Language.StringByID(StringId.Away);
+ break;
+ case "timer":
+ text = Language.StringByID(StringId.Auto);
+ break;
+ case "normal":
+ text = Language.StringByID(StringId.Normal);
+ break;
+ }
+ return text;
+ }
}
}
--
Gitblit v1.8.0