~cjl/HDL_APP_Project.git

			@@ -45,6 +45,35 @@
			#endif
			}

			/// <summary>
			/// 获取传感器历史数据
			/// </summary>
			/// <param name="subnetId"></param>
			/// <param name="deviceId"></param>
			/// <param name="bigClass"></param>
			/// <param name="minClass"></param>
			/// <param name="queryType"></param>
			/// <param name="loopId"></param>
			/// <param name="nowMonth"></param>
			/// <param name="mac"></param>
			/// <returns></returns>
			public ResponsePack GetSensorHistory(int subnetId,int deviceId,int bigClass,int minClass,int queryType,int loopId,int nowMonth,string mac)
			{
			Dictionary<string, object> d = new Dictionary<string, object>();
			d.Add("SubnetID", subnetId);
			d.Add("DeviceID", deviceId);
			d.Add("LargeType", bigClass);
			d.Add("SmallType", minClass);
			d.Add("QueryType", queryType);
			d.Add("loopId", loopId);
			d.Add("NowMonth", nowMonth);
			d.Add("MAC", DB_ResidenceData.residenceData.residenceGatewayMAC);
			d.Add("LocalTimeZone", 8);
			var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
			return RequestHttps("https://developer.hdlcontrol.com/api/GetSensorPushHistory", jsonString,true);

			}

			public string GetRequestResultMsg(string resultCode)
			{
			string result = "";
			@@ -245,21 +274,17 @@
			try
			{
			var headImageString = dataStr.GetValue("HeadImage").ToString();
			var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(headImageString);
			var headImageBytes = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(jsonString);
			MainPage.LoginUser.headImagePageBytes = headImageBytes;
			var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/", "headImage.png");

			#if DEBUG
			Application.RunOnMainThread(() =>
			if (!string.IsNullOrEmpty(headImageString))
			{
			new Tip() { CloseTime = 5, Text = filePath }.Show(MainPage.BasePageView);
			});
			#endif
			fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
			fs.Write(headImageBytes, 0, headImageBytes.Length);
			fs.Flush();
			MainPage.LoginUser.headImagePagePath = filePath;
			var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(headImageString);
			var headImageBytes = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(jsonString);
			MainPage.LoginUser.headImagePageBytes = headImageBytes;
			var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/", "headImage.png");
			fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
			fs.Write(headImageBytes, 0, headImageBytes.Length);
			fs.Flush();
			MainPage.LoginUser.headImagePagePath = filePath;
			}
			} catch (Exception ex)
			{
			MainPage.Log($"download headImage error : {ex.Message}");
			@@ -894,23 +919,8 @@

			/// <summary>
			/// 功能ID
			/// 厂商代码 2bytes; 01 HDL
			/// 通讯方式 1byte ; 01 HDL Bus; 02 Zigbee;03 KNX;04 Z-Wave
			/// 产品GUID 8bytes
			/// 产品类别 1byte ; 01 调光器;02继电器;03干接点模块;04传感器;05面板
			/// 物模型类型2bytes 01 开关类 --01开关;02插座
			/// 02 照明 --01开关类;02调光类;03色温;04LED
			/// 03 遮阳 --01窗帘电机;02百叶窗;03开合帘;04卷帘
			/// 04 恒温器 --01空调;02地暖;03毛细空调
			/// 05 新风
			/// 06 影音
			/// 07 音乐
			/// 08 能源
			/// 09 安防
			/// 通道号 2bytes
			/// Key_id 2bytes
			/// </summary>
			/// "00010112345678901234560101230123AABB";
			/// "03010112345678901234560101230123AABB";
			var buffer = Guid.NewGuid().ToByteArray();
			string guid = "";
			if (buffer != null)
			@@ -948,7 +958,7 @@
			}
			DB_ResidenceData.residenceData.functionList.lights.Add(new Light()
			{
			sid = "000101" + guid + "0102010001AABB",
			sid = "030101" + guid + "0102010001AABB",
			name = ss.GetValue("Name").ToString(),
			function = new List<Trait>() {
			new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off"} },
			@@ -974,7 +984,7 @@
			}
			DB_ResidenceData.residenceData.functionList.lights.Add(new Light()
			{
			sid = "000101" + guid + "0202020001AABB",
			sid = "030101" + guid + "0202020001AABB",
			name = ss.GetValue("Name").ToString(),
			function = new List<Trait>() {
			new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "up","down"} },
			@@ -1001,7 +1011,7 @@
			}
			DB_ResidenceData.residenceData.functionList.lights.Add(new Light()
			{
			sid = "000101" + guid + "0202040001AABB",
			sid = "030101" + guid + "0202040001AABB",
			name = ss.GetValue("Name").ToString(),
			function = new List<Trait>() {
			new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "on","off"} },
			@@ -1030,7 +1040,7 @@
			}
			DB_ResidenceData.residenceData.functionList.aCs.Add(new AC()
			{
			sid = "000101" + guid + "0204010001AABB",
			sid = "030101" + guid + "0204010001AABB",
			name = ss.GetValue("Name").ToString(),
			function = new List<Trait>() {
			new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
			@@ -1060,7 +1070,7 @@
			}
			DB_ResidenceData.residenceData.functionList.curtains.Add(new Curtain()
			{
			sid = "000101" + guid + "0203010001AABB",
			sid = "030101" + guid + "0203010001AABB",
			name = ss.GetValue("Name").ToString(),
			roomIdList = roomIds,
			//roomIdList = new List<string>() { roomSid },
			@@ -1086,7 +1096,7 @@
			}
			DB_ResidenceData.residenceData.functionList.curtains.Add(new Curtain()
			{
			sid = "000101" + guid + "0203040001AABB",
			sid = "030101" + guid + "0203040001AABB",
			name = ss.GetValue("Name").ToString(),
			roomIdList = roomIds,
			//roomIdList = new List<string>() { roomSid },
			@@ -1112,7 +1122,7 @@
			}
			DB_ResidenceData.residenceData.functionList.curtains.Add(new Curtain()
			{
			sid = "000101" + guid + "0203030001AABB",
			sid = "030101" + guid + "0203030001AABB",
			name = ss.GetValue("Name").ToString(),
			roomIdList = roomIds,
			//roomIdList = new List<string>() { roomSid },