~wjc/HDL_APP_Project.git

			@@ -3,6 +3,7 @@
			using System.Linq;
			using Newtonsoft.Json.Linq;
			using HDL_ON;
			using Shared;

			namespace HDL_ON.Entity
			{
			@@ -13,17 +14,24 @@
			public class Trait
			{
			/// <summary>
			/// 属性内容
			/// </summary>
			public string attri;
			/// <summary>
			/// 属性名称
			/// </summary>
			public string name;
			public List<string> _value_key;
			/// <summary>
			/// 属性的值
			/// 属性的值列表
			/// </summary>
			public List<string> value;
			[Newtonsoft.Json.JsonIgnore]
			public List<string> value_key {
			get
			{
			return _value_key;
			}
			set
			{
			_value_key = value;
			}
			}
			/// <summary>
			/// 最大值
			/// </summary>
			@@ -40,10 +48,268 @@

			/// <summary>
			/// 当前值
			/// app软件自定义属性
			/// 用来记录当前状态
			/// </summary>
			public object curValues = new object();
			public object value = new object();


			//----app自定义
			/// <summary>
			/// 属性值单位
			/// </summary>
			public string _uintString;
			public string uintString {
			get
			{
			if(!string.IsNullOrEmpty( _uintString))
			{
			return _uintString;
			}
			var us = "";
			switch(name)
			{
			case "temperature":
			us = "°C";
			break;
			case "percent":
			case "brightness":
			us = "%";
			break;
			}
			return us;
			}
			}

			/// <summary>
			/// 属性名称显示文本
			/// 中英文显示
			/// </summary>
			public string name_text
			{
			get
			{
			string text = "";
			switch (name)
			{
			case "on_off":
			text = Language.StringByID(StringId.OnOff);
			break;
			case "brightness":
			text = Language.StringByID(StringId.Brightness);
			break;
			case "color":
			text = Language.StringByID(StringId.ColorValue);
			break;
			case "mode":
			text = Language.StringByID(StringId.Mode);
			break;
			case "fan":
			text = Language.StringByID(StringId.FanSpeed);
			break;
			case "temperature":
			text = Language.StringByID(StringId.Temp);
			break;
			case "delay":
			text = Language.StringByID(StringId.Delay);
			break;
			case "cct":
			text = "CCT";
			break;
			//case "fade_time":
			case "percent":
			text = Language.StringByID(StringId.PercentAdjustment);
			break;
			//case "lock":
			//case "ico":
			//case "swing":
			//case "set_ point":
			//case "pm25":
			//case "volume":
			//case "vol_step":
			//case "source":
			//case "treble":
			//case "bass":
			//case "playlist":
			//case "song_name":
			//case "current_status":
			//case "enable":
			//case "lux":
			//case "adjust_value":
			//case "range":
			//case "humidity":
			//case "type":
			//case "state":
			//case "sensitivity":
			//case "pm25value":
			}
			return text;
			}
			}

			/// <summary>
			/// 获取当前属性的显示文本
			/// 中英文显示
			/// </summary>
			public string GetCurValueText()
			{
			return GetValueText(value.ToString());
			}

			/// <summary>
			/// 获取指定属性的显示文本
			/// 中英文显示
			/// </summary>
			public string GetValueText(string value)
			{
			string text = "";
			value = value.Replace("{}", "");
			switch (name)
			{
			case "on_off":
			text = value == "on" ? Language.StringByID(StringId.On) : Language.StringByID(StringId.OFF);
			break;
			case "temperature":
			case "brightness":
			case "percent":
			if (text == "")
			{
			this.value = this.min;
			text = this.min.ToString();
			}
			else
			{
			text = value;
			}
			break;
			//case "color":
			case "mode":
			switch (value)
			{
			//----空调
			case "auto":
			text = Language.StringByID(StringId.Auto);
			break;
			case "cool":
			text = Language.StringByID(StringId.Cool);
			break;
			case "heat":
			text = Language.StringByID(StringId.Heat);
			break;
			case "dry":
			text = Language.StringByID(StringId.Dry);
			break;
			case "fan":
			text = Language.StringByID(StringId.AirSupply);
			break;
			//-----地热
			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 "normal":
			text = Language.StringByID(StringId.Normal);
			break;
			case "timer":
			text = Language.StringByID(StringId.Timer);
			break;
			default:
			if (this.value_key.Contains("cool"))
			{
			this.value = "cool";
			text = Language.StringByID(StringId.Cool);
			}
			else if (this.value_key.Contains("day"))
			{
			this.value = "day";
			text = Language.StringByID(StringId.Day);
			}
			else
			{
			foreach (var v in this.value_key)
			{
			this.value = v;
			text = GetCurValueText();
			}
			}
			break;
			}
			break;
			case "fan":
			switch (value)
			{
			case "high":
			text = Language.StringByID(StringId.HighWindSpeed);
			break;
			case "medium":
			text = Language.StringByID(StringId.MiddleWindSpeed);
			break;
			case "low":
			text = Language.StringByID(StringId.LowWindSpeed);
			break;
			case "auto":
			text = Language.StringByID(StringId.Auto);
			break;
			default:
			if (this.value_key.Contains("low"))
			{
			this.value = "low";
			text = Language.StringByID(StringId.LowWindSpeed);
			}
			else
			{
			foreach (var v in this.value_key)
			{
			this.value = v;
			text = GetCurValueText();
			}
			}
			break;
			}
			break;
			//case "delay":
			//case "cct":
			//case "fade_time":
			//case "lock":
			//case "ico":
			//case "swing":
			//case "set_ point":
			//case "pm25":
			//case "volume":
			//case "vol_step":
			//case "source":
			//case "treble":
			//case "bass":
			//case "playlist":
			//case "song_name":
			//case "current_status":
			//case "enable":
			//case "lux":
			//case "adjust_value":
			//case "range":
			//case "humidity":
			//case "type":
			//case "state":
			//case "sensitivity":
			//case "pm25value":
			case "high":
			text = Language.StringByID(StringId.HighWindSpeed);
			break;
			case "medium":
			text = Language.StringByID(StringId.MiddleWindSpeed);
			break;
			case "low":
			text = Language.StringByID(StringId.LowWindSpeed);
			break;
			case "auto":
			text = Language.StringByID(StringId.Auto);
			break;
			}
			return text;
			}
			}
			/// <summary>
			/// 设备功能oid
			@@ -56,6 +322,8 @@
			public string net_id;
			public string dev_id;
			public string channels;


			}


			@@ -87,7 +355,7 @@
			/// 大类别 1bytes （预留）
			/// 小类别 1byte （预留）
			/// </summary>
			public string sid = "03010112345678010123012301230101";
			public string sid = "0301011234567801012301230123";

			/// <summary>
			/// A协议功能的特性
			@@ -107,6 +375,40 @@
			/// 使用A协议控制时，改属性为空
			/// </summary>
			public BusData bus_Data;
			/// <summary>
			/// 延时
			/// </summary>
			public int delay = 0;
			/// <summary>
			/// 延时显示的文本
			/// </summary>
			[Newtonsoft.Json.JsonIgnore]
			public string delayText
			{
			get
			{
			string text = "";
			switch (delay)
			{
			case 0:
			text = Language.StringByID(StringId.NoDelay);
			break;
			case 30:
			text = "30s";
			break;
			case 60:
			text = "1min";
			break;
			case 120:
			text = "2min";
			break;
			case 300:
			text = "5min";
			break;
			}
			return text;
			}
			}
			#endregion

			/// <summary>
			@@ -165,84 +467,45 @@
			[Newtonsoft.Json.JsonIgnore]
			public string lastState = "";

			Trait _trait_on_off;
			[Newtonsoft.Json.JsonIgnore]
			public Trait trait_on_off;
			/// <summary>
			/// 开关状态
			/// 0:关
			/// 1:开
			/// </summary>
			[Newtonsoft.Json.JsonIgnore]
			public string on_off
			public Trait trait_on_off
			{
			get
			{
			try
			if (_trait_on_off == null)
			{
			if (trait_on_off == null)
			_trait_on_off = function.Find((obj) => obj.name == "on_off");
			//找不到属性需要声明一个，防止报错闪退
			if (_trait_on_off == null)
			{
			trait_on_off = function.Find((obj) => obj.attri == "on_off");
			//找不到属性需要声明一个，防止报错闪退
			if (trait_on_off == null)
			_trait_on_off = new Trait()
			{
			trait_on_off = new Trait()
			{
			attri = "on_off",
			value = new List<string> { "on", "off" },
			max = 1,
			min = 0,
			};
			}
			trait_on_off.curValues = trait_on_off.value[trait_on_off.min];
			name = "on_off",
			value_key = new List<string> { "on", "off" },
			max = 1,
			min = 0,
			};
			}
			return trait_on_off.curValues.ToString();
			_trait_on_off.value = "on";
			}
			catch
			{
			MainPage.Log("on_off 数据获取失败.");
			function.Add( new Trait()
			{
			attri = "on_off",
			value = new List<string> { "on", "off" },
			max = 1,
			min = 0,
			});
			return "off";
			}
			return _trait_on_off;
			}
			set
			//set
			//{
			// _trait_on_off = value;
			//}
			}

			/// <summary>
			/// 开关状态文本
			/// </summary>
			[Newtonsoft.Json.JsonIgnore]
			public string on_off_text
			{
			get
			{
			try
			{
			if (trait_on_off == null)
			{
			trait_on_off = function.Find((obj) => obj.attri == "on_off");
			//找不到属性需要声明一个，防止报错闪退
			if (trait_on_off == null)
			{
			trait_on_off = new Trait()
			{
			attri = "on_off",
			value = new List<string> { "on", "off" },
			max = 1,
			min = 0,
			};
			}
			trait_on_off.curValues = trait_on_off.min;
			}
			trait_on_off.curValues = value;
			}
			catch (Exception ex)
			{
			MainPage.Log($"on_off 数据刷新失败: {ex.Message}");
			function.Add(new Trait()
			{
			attri = "on_off",
			value = new List<string> { "on", "off" },
			max = 1,
			min = 0,
			});
			}
			return trait_on_off.value.ToString() == "on" ? Language.StringByID(StringId.On) : Language.StringByID(StringId.OFF);
			}
			}

			@@ -301,17 +564,30 @@
			string roomNameList = "";
			foreach(var roomId in roomIdList)
			{
			var findRoom = DB_ResidenceData.residenceData.rooms.Find(obj => obj.sid == roomId);
			var findRoom = DB_ResidenceData.rooms.Find(obj => obj.sid == roomId);
			if (findRoom == null)
			continue;
			if(roomNameList != "")
			{
			roomNameList += ",";
			}
			roomNameList += findRoom.floor + "·" + findRoom.name;
			roomNameList += findRoom.floorName + findRoom.name;
			}
			if (roomNameList == "" && functionType == FunctionType.Scene)
			{
			roomNameList = Language.StringByID(StringId.WholeHouseScene);
			}
			return roomNameList;
			}
			/// <summary>
			/// 保存功能数据
			/// </summary>
			public void SaveFunctionData()
			{
			var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
			FileUtils.WriteFileByBytes("FunctionData_" + this.sid, ssd);
			MainPage.Log($"Save FunctionData {this.functionType} : {this.sid}");
			}

			/// <summary>
			/// 更新时间