From 18b93d511dc764b469d7c4a7e755f7274f89cdb4 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 27 四月 2020 17:55:14 +0800
Subject: [PATCH] 2020-4-27-1
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 102 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
index 1ec286d..d1d8ec5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
@@ -1154,10 +1154,10 @@
}
else if (data.Type == "1")
{
- var scene = Common.SceneRoomUI.AllSceneRoomUIList.Find((obj) => obj.sceneUI.Id == data.ScenesId);
+ var scene = HdlSceneLogic.Current.GetSceneUIBySceneId(data.ScenesId);
if (scene != null)
{
- string msg = scene.sceneUI.Name + "\r\n";
+ string msg = scene.Name + "\r\n";
//鐩爣鍦烘櫙涓嶅瓨鍦�
msg += Language.StringByID(R.MyInternationalizationString.uTargetSceneIsNotExsit);
this.ShowTipMsg(msg);
@@ -1963,14 +1963,14 @@
#endregion
- #region 鈻� 鎶ヨ鐩爣鐘舵�佺殑缈昏瘧鏂囨湰_____________
+ #region 鈻� 鎵ц鐩爣鐘舵�佺殑缈昏瘧鏂囨湰_____________
/// <summary>
- /// 鑾峰彇鐏厜绫诲瀷鐨勬姤璀︾洰鏍囩殑鐘舵�佹枃鏈�
+ /// 鑾峰彇鎵ц鐩爣鐨勭姸鎬佹枃鏈�
/// </summary>
/// <param name="listTaskInfo">鍔ㄤ綔瀵硅薄,鍙互涓虹┖</param>
/// <returns></returns>
- public string GetLightAlarmStatuText(List<Safeguard.TaskListInfo> listTaskInfo)
+ public string GetAdjustTargetStatuText(List<Safeguard.TaskListInfo> listTaskInfo)
{
if (listTaskInfo == null || listTaskInfo.Count == 0)
{
@@ -1979,13 +1979,22 @@
}
//瑕佽�冭檻瀹冪殑鎺掑垪椤哄簭(鍙互鎸夐渶姹傚彉鏇寸紪鍙�)
Dictionary<int, string> dicSort = new Dictionary<int, string>();
+ //鏈�澶х紪鍙�
+ int MaxNo = 4;
//寮�鍏崇殑浣嶇疆缂栧彿
int ControlNo = 0;
//鐧惧垎姣旂殑浣嶇疆缂栧彿
int persentNo = 1;
+ //绌鸿皟娓╁害鐨勪綅缃紪鍙�
+ int temparetureNo = 2;
+ //绌鸿皟妯″紡鐨勪綅缃紪鍙�
+ int modelNo = 3;
+ //绌鸿皟椋庨�熺殑浣嶇疆缂栧彿
+ int windNo = 4;
foreach (var info in listTaskInfo)
{
+ #region 鈻� 寮�鍏虫帶鍒禵___
//寮�鍏虫帶鍒�
if (info.TaskType == 1)
{
@@ -2000,11 +2009,25 @@
dicSort[ControlNo] = Language.StringByID(R.MyInternationalizationString.uSimpleClose);
}
}
+ #endregion
+
+ #region 鈻� 浜害璋冭妭____
//浜害璋冭妭
else if (info.TaskType == 3)
{
- dicSort[persentNo] = info.Data1 + "%";
+ if (info.Data1 == 0)
+ {
+ //鍏�
+ dicSort[persentNo] = Language.StringByID(R.MyInternationalizationString.uSimpleClose);
+ }
+ else
+ {
+ dicSort[persentNo] = $"{(int)(info.Data1 * 1.0 / 254 * 100)}%";
+ }
}
+ #endregion
+
+ #region 鈻� 绐楀笜璁惧____
//绐楀笜璁惧(瀹冪殑寮�鍏冲拰寮�鍏虫帶鍒舵槸鍙嶈繃鏉ョ殑)
else if (info.TaskType == 6)
{
@@ -2024,13 +2047,84 @@
dicSort[persentNo] = info.Data2 + "%";
}
}
+ #endregion
+
+ #region 鈻� 绌鸿皟璁惧____
+ //绌鸿皟璁惧
+ else if (info.TaskType == 5)
+ {
+ if (info.Data1 == 3)
+ {
+ if (info.Data2 == 0)
+ {
+ return Language.StringByID(R.MyInternationalizationString.uSimpleClose);
+ }
+ else if (info.Data2 == 1)
+ {
+ //鑷姩
+ dicSort[modelNo] = Language.StringByID(R.MyInternationalizationString.Mode_Auto);
+ }
+ else if (info.Data2 == 3)
+ {
+ //鍒跺喎
+ dicSort[modelNo] = Language.StringByID(R.MyInternationalizationString.Mode_Cool);
+ }
+ else if (info.Data2 == 4)
+ {
+ //鍒剁儹
+ dicSort[modelNo] = Language.StringByID(R.MyInternationalizationString.Mode_Heat);
+ }
+ else if (info.Data2 == 7)
+ {
+ //閫侀
+ dicSort[modelNo] = Language.StringByID(R.MyInternationalizationString.Mode_FanOnly);
+ }
+ else if (info.Data2 == 8)
+ {
+ //闄ゆ箍
+ dicSort[modelNo] = Language.StringByID(R.MyInternationalizationString.Mode_Dry);
+ }
+ }
+ else if (info.Data1 == 4 || info.Data1 == 5|| info.Data1 == 7)
+ {
+ //娓╁害
+ dicSort[temparetureNo] = $"{ info.Data2 / 100}鈩�";
+ }
+ else if (info.Data1 == 6)
+ {
+ if (info.Data2 == 1)
+ {
+ //浣庨
+ dicSort[windNo] = Language.StringByID(R.MyInternationalizationString.Fan_Low);
+ }
+ else if (info.Data2 == 2)
+ {
+ //涓
+ dicSort[windNo] = Language.StringByID(R.MyInternationalizationString.Fan_Middle);
+ }
+ else if (info.Data2 == 3)
+ {
+ //楂橀
+ dicSort[windNo] = Language.StringByID(R.MyInternationalizationString.Fan_Height);
+ }
+ }
+ }
+ #endregion
+ }
+ //濡傛灉寮�鍏冲拰鐧惧垎姣斾竴璧峰瓨鍦ㄧ殑璇�,鍒欎笉鏄剧ず寮�鍏虫枃瀛�
+ if (dicSort.ContainsKey(ControlNo) == true && dicSort.ContainsKey(persentNo) == true)
+ {
+ dicSort.Remove(ControlNo);
}
//鎷兼帴鏂囨湰
string txtvalue = string.Empty;
- for (int i = 0; i < dicSort.Count; i++)
+ for (int i = 0; i <= MaxNo; i++)
{
- txtvalue += dicSort[i] + " ";
+ if (dicSort.ContainsKey(i) == true)
+ {
+ txtvalue += dicSort[i] + " ";
+ }
}
return txtvalue.Trim();
--
Gitblit v1.8.0