~wxr/HDL_APP_Project.git

			@@ -597,11 +597,11 @@
			{
			sid = "030101123456780604010001ABCD",
			name = "空调",
			function = new List<Trait>() {
			new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
			new Trait { name="mode", max = 2,min =0,value_key = new List<string>{ "auto", "heat", "cool","dry" } },
			new Trait { name = "fan",max = 3,min =0,value_key = new List<string>{ "low", "medium", "high" ,"auto"} },
			new Trait { name = "set_temperature", max = 32,min=16,value_key = new List<string>{"up","down" } },
			function = new List<FunctionAttributes>() {
			new FunctionAttributes { key="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
			new FunctionAttributes { key="mode", max = 2,min =0,value = new List<string>{ "auto", "heat", "cool","dry" } },
			new FunctionAttributes { key = "fan",max = 3,min =0,value = new List<string>{ "low", "medium", "high" ,"auto"} },
			new FunctionAttributes { key = "set_temperature", max = 32,min=16,value = new List<string>{"up","down" } },
			},
			roomIdList = new List<string>() { "0001" },
			lastState = "制冷中风 18°C",
			@@ -616,8 +616,8 @@
			{
			sid = "030101123456780202020002ABCD",
			name = "调光灯",
			function = new List<Trait>() {
			new Trait { name="brightness", max=100,min = 0, value_key= new List<string> { "up","down"} },
			function = new List<FunctionAttributes>() {
			new FunctionAttributes { key="brightness", max=100,min = 0, value= new List<string> { "up","down"} },
			},//"brightness",
			roomIdList = new List<string>() { "0001" },
			lastState = "20%",
			@@ -634,8 +634,8 @@
			sid = "030101123456780303010003ABCD",
			name = "窗帘模块",
			roomIdList = new List<string>() { "0001" },
			function = new List<Trait>() {
			new Trait { name="on_off", max=2,min = 0, value_key= new List<string> { "on","off","stop"} },
			function = new List<FunctionAttributes>() {
			new FunctionAttributes { key="on_off", max=2,min = 0, value= new List<string> { "on","off","stop"} },
			},// "curtain",
			lastState = "开",
			bus_Data = new BusData
			@@ -650,8 +650,8 @@
			sid = "030101123456780303030011ABCD",
			name = "开合帘",
			roomIdList = new List<string>() { "0001" },
			function = new List<Trait>() {
			new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off","stop"} },
			function = new List<FunctionAttributes>() {
			new FunctionAttributes { key="on_off", max=100,min = 0, value= new List<string> { "on","off","stop"} },
			},//"curtaintype",
			lastState = "20%",
			bus_Data = new BusData
			@@ -666,9 +666,9 @@
			sid = "030101123456780503040012ABCD",
			name = "卷帘",
			roomIdList = new List<string>() { "0001" },
			function = new List<Trait>() {
			new Trait { name="on_off", max=2,min = 0, value_key= new List<string> { "on","off","stop"} },
			new Trait { name="percent", max=100,min = 0, value_key= new List<string> { "percent" } },
			function = new List<FunctionAttributes>() {
			new FunctionAttributes { key="on_off", max=2,min = 0, value= new List<string> { "on","off","stop"} },
			new FunctionAttributes { key="percent", max=100,min = 0, value= new List<string> { "percent" } },

			},// "rollingshutter",
			lastState = "20%",
			@@ -684,10 +684,10 @@
			sid = "030101123456780404020004ABCD",
			name = "地热",
			roomIdList = new List<string>() { "0001" },
			function = new List<Trait>() {
			new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
			new Trait { name="mode", max = 2,min =0,value_key = new List<string>{ "normal", "day", "night","timer","away" } },
			new Trait { name = "set_temperature", max = 32,min=5,value_key = new List<string>{"up","down" } },
			function = new List<FunctionAttributes>() {
			new FunctionAttributes { key="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
			new FunctionAttributes { key="mode", max = 2,min =0,value = new List<string>{ "normal", "day", "night","timer","away" } },
			new FunctionAttributes { key = "set_temperature", max = 32,min=5,value = new List<string>{"up","down" } },
			},//
			lastState = "自动 25°C",
			bus_Data = new BusData
			@@ -701,8 +701,8 @@
			{
			sid = "030101123456780202010005ABCD",
			name = "吊灯",
			function = new List<Trait>() {
			new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off"} },
			function = new List<FunctionAttributes>() {
			new FunctionAttributes { key="on_off", max=100,min = 0, value= new List<string> { "on","off"} },
			},//"on_off",
			roomIdList = new List<string>() { "0001" },
			bus_Data = new BusData
			@@ -716,9 +716,9 @@
			{
			sid = "030101123456780202040006ABCD",
			name = "RGB灯",
			function = new List<Trait>() {
			new Trait { name="brightness", max=100,min = 0, value_key= new List<string> { "on","off"} },
			new Trait { name="color", max=100,min = 0, value_key= new List<string> { "255", "255", "255" } },
			function = new List<FunctionAttributes>() {
			new FunctionAttributes { key="brightness", max=100,min = 0, value= new List<string> { "on","off"} },
			new FunctionAttributes { key="color", max=100,min = 0, value= new List<string> { "255", "255", "255" } },
			},
			roomIdList = new List<string>() { "0001" },
			bus_Data = new BusData
			@@ -732,9 +732,9 @@
			{
			sid = "030101123456781010020006ABCD",
			name = "风扇",
			function = new List<Trait>() {
			new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
			new Trait { name="percent", max=7,min = 0, value_key= new List<string> { "percent" } },
			function = new List<FunctionAttributes>() {
			new FunctionAttributes { key="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
			new FunctionAttributes { key="percent", max=7,min = 0, value= new List<string> { "percent" } },
			},
			roomIdList = new List<string>() { "0001" },
			bus_Data = new BusData
			@@ -748,8 +748,8 @@
			{
			sid = "030101123456781010020006ABCD",
			name = "电视",
			function = new List<Trait>() {
			new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
			function = new List<FunctionAttributes>() {
			new FunctionAttributes { key="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
			},
			roomIdList = new List<string>() { "0001" },
			bus_Data = new BusData
			@@ -763,8 +763,8 @@
			{
			sid = "030101123456780101020006ABCD",
			name = "插座",
			function = new List<Trait>() {
			new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
			function = new List<FunctionAttributes>() {
			new FunctionAttributes { key="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
			},
			roomIdList = new List<string>() { "0001" },
			bus_Data = new BusData
			@@ -779,8 +779,8 @@
			sid = "030101123456781005060006ABCD",
			name = "PM2.5",
			roomIdList = new List<string>() { "0001" },
			function = new List<Trait>() {
			new Trait { name="values", max=1,min = 0, value_key= new List<string> { "22"} },
			function = new List<FunctionAttributes>() {
			new FunctionAttributes { key="values", max=1,min = 0, value= new List<string> { "22"} },
			},
			bus_Data = new BusData
			{
			@@ -794,8 +794,8 @@
			sid = "030101123456781005070006ABCD",
			name = "CO2",
			roomIdList = new List<string>() { "0001" },
			function = new List<Trait>() {
			new Trait { name="values", max=1,min = 0, value_key= new List<string> { "1352"} },
			function = new List<FunctionAttributes>() {
			new FunctionAttributes { key="values", max=1,min = 0, value= new List<string> { "1352"} },
			},
			bus_Data = new BusData
			{
			@@ -809,8 +809,8 @@
			sid = "030101123456781005020006ABCD",
			name = "温度",
			roomIdList = new List<string>() { "0001" },
			function = new List<Trait>() {
			new Trait { name="values", max=1,min = 0, value_key= new List<string> { "28"} },
			function = new List<FunctionAttributes>() {
			new FunctionAttributes { key="values", max=1,min = 0, value= new List<string> { "28"} },
			},
			bus_Data = new BusData
			{
			@@ -824,8 +824,8 @@
			sid = "030101123456781005050006ABCD",
			name = "TVOC",
			roomIdList = new List<string>() { "0001" },
			function = new List<Trait>() {
			new Trait { name="values", max=1,min = 0, value_key= new List<string> { "0.3"} },
			function = new List<FunctionAttributes>() {
			new FunctionAttributes { key="values", max=1,min = 0, value= new List<string> { "0.3"} },
			},
			bus_Data = new BusData
			{
			@@ -839,8 +839,8 @@
			sid = "030101123456781005030006ABCD",
			name = "湿度",
			roomIdList = new List<string>() { "0001" },
			function = new List<Trait>() {
			new Trait { name="values", max=1,min = 0, value_key= new List<string> { "15"} },
			function = new List<FunctionAttributes>() {
			new FunctionAttributes { key="values", max=1,min = 0, value= new List<string> { "15"} },
			},
			bus_Data = new BusData
			{
			@@ -861,8 +861,8 @@
			{
			//2020-11-13 待确认
			//获取住宅失败，重新标记为未登录状态
			UserInfo.Current.lastTime = DateTime.MinValue;
			UserInfo.Current.SaveUserInfo();
			UserInfo.Current.LastTime = DateTime.MinValue;
			UserInfo.Current.SaveUserInfo();
			//登录失败，请先添加住宅！
			Utlis.ShowAlertOnMainThread(Language.StringByID(StringId.FailedGetHomeList));
			}
			@@ -920,12 +920,12 @@
			// userName = revertData.name
			//};
			UserInfo.Current.userType = revertData.userType;
			UserInfo.Current.accountString = account;
			UserInfo.Current.AccountString = account;
			//UserInfo.Current.password = password;
			UserInfo.Current.lastTime = DateTime.Now;
			UserInfo.Current.LastTime = DateTime.Now;
			UserInfo.Current.ID = revertData.userId;
			UserInfo.Current.loginTokenString = revertData.headerPrefix + revertData.accessToken;
			UserInfo.Current.refreshToken = revertData.refreshToken;
			UserInfo.Current.LoginTokenString = revertData.headerPrefix + revertData.accessToken;
			UserInfo.Current.RefreshToken = revertData.refreshToken;
			UserInfo.Current.userName = revertData.name;
			UserInfo.Current.SaveUserInfo();
			MainPage.Log("登录成功。");