~wjc/HomeApp.git

			@@ -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)
			{
			//温度
			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();