From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 96 ++++++++++++++++++++++++------------------------
1 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index 270b93d..1047d32 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -100,7 +100,7 @@
{
//妫�娴嬪綋鍓嶉厤缃煙鍚嶆槸鍚︿竴鑷达紝涓嶄竴鑷村垯鏇挎崲
CheckAndSetUserRequestHost(result);
-
+
//2.1璇锋眰鑾峰彇楠岃瘉鐮�
var resultObj = pm.VerificationCodeSend(VerifyType.VERIFY_LOGIN, account, true, phoneZoneCode);
if (resultObj.Code != StateCode.SUCCESS)
@@ -145,7 +145,7 @@
})
{ IsBackground = true }.Start();
-
+
}
};
}
@@ -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("鐧诲綍鎴愬姛銆�");
--
Gitblit v1.8.0