From e6a26ee148587327478d9a82624a820c907b6e16 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 04 十一月 2020 14:58:15 +0800
Subject: [PATCH] 20201104
---
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 310 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 297 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index 15b85eb..eac7338 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -41,7 +41,7 @@
var tip = new Tip()
{
Text = Language.StringByID(StringId.PlsEntryPhoneNumber),
- CloseTime = 3,
+ CloseTime = 1,
Direction = AMPopTipDirection.None
};
tip.Show(bodyView);
@@ -55,7 +55,7 @@
var tip = new Tip()
{
Text = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber),
- CloseTime = 3,
+ CloseTime = 1,
Direction = AMPopTipDirection.None
};
tip.Show(bodyView);
@@ -132,7 +132,7 @@
var tip = new Tip()
{
Text = tipStr,
- CloseTime = 3,
+ CloseTime = 1,
Direction = AMPopTipDirection.None
};
tip.Show(bodyView);
@@ -344,7 +344,7 @@
var tip = new Tip()
{
Text = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber),
- CloseTime = 3,
+ CloseTime = 1,
Direction = AMPopTipDirection.None
};
tip.Show(bodyView);
@@ -367,7 +367,7 @@
var tip = new Tip()
{
Text = Language.StringByID(StringId.PlsEntryCorrectEmailAddress),
- CloseTime = 3,
+ CloseTime = 1,
Direction = AMPopTipDirection.None
};
tip.Show(bodyView);
@@ -378,7 +378,7 @@
}
};
//褰撶劍鐐瑰湪瀵嗙爜鏂囨湰妗嗘椂锛屾枃鏈搴曠嚎鐐逛寒
- etPassword.FoucsChanged += (sender, e) =>
+ etPassword.FoucsChanged = (sender, e) =>
{
if (etPassword.Foucs)
{
@@ -400,8 +400,13 @@
//褰撶劍鐐瑰湪瀵嗙爜鏂囨湰妗嗘椂锛岀偣鍑婚敭鐩樺洖鎾ゆ寜閿紝瑙﹀彂鐨勪簨浠�
etPassword.EditorEnterAction += (obj) =>
{
- etPassword.Foucs = false;
+ Application.HideSoftInput();
};
+ etPassword.MouseUpEventHandler = (sender, e) =>
+ {
+ etPassword.Foucs = true;
+ };
+
}
/// <summary>
@@ -442,7 +447,7 @@
var tip = new Tip()
{
Text = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber),
- CloseTime = 3,
+ CloseTime = 1,
Direction = AMPopTipDirection.None
};
tip.Show(bodyView);
@@ -456,7 +461,7 @@
var tip = new Tip()
{
Text = Language.StringByID(StringId.PlsEntryCorrectEmailAddress),
- CloseTime = 3,
+ CloseTime = 1,
Direction = AMPopTipDirection.None
};
tip.Show(bodyView);
@@ -540,6 +545,285 @@
* Wait : 鎺ㄩ�佹敞鍐�
*/
+ /*
+ 鏌ョ湅鏈湴鏄惁瀛樺湪鏁版嵁
+ 瀛樺湪鍒欏鍑�
+ */
+ var isExis = FileUtils.IsExisFolder(DB_ResidenceData.residenceData.CurReginID);
+ if (isExis)
+ {
+ FileUtils.DeleteAllFile();
+ string regionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID);
+ FileUtils.RestoreRegionFiles(regionRootPath);
+ DB_ResidenceData.residenceData.EixtAccount();
+ OnAppConfig.Instance.RefreshUserConfig();
+ DB_ResidenceData.InitRoomFunction();
+ }
+ if (MainPage.LoginUser.userEmailInfo == "464027401@qq.com")
+ {
+ DB_ResidenceData.residenceData.floors.Add(new Floor() { name = "1F", sid = "09888" });
+ var r111 = new Room() { sid = "0001", name = "Room-1", floorId = "09888", backgroundImage = "Classification/Room/Roombg.png" };
+ DB_ResidenceData.rooms.Add(r111);
+ DB_ResidenceData.residenceData.floors.Add(new Floor() { sid = "000022222", name = "1F" });
+ r111.SaveRoomData();
+ new AC()
+ {
+ 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" } },
+ },
+ roomIdList = new List<string>() { "0001" },
+ lastState = "鍒跺喎 涓 18掳C",
+ bus_Data = new BusData
+ {
+ SubnetID = 42,
+ DeviceID = 8,
+ LoopID = 1,
+ },
+ }.SaveFunctionData();
+ new Light()
+ {
+ sid = "030101123456780202020002ABCD",
+ name = "璋冨厜鐏�",
+ function = new List<Trait>() {
+ new Trait { name="brightness", max=100,min = 0, value_key= new List<string> { "up","down"} },
+ },//"brightness",
+ roomIdList = new List<string>() { "0001" },
+ lastState = "20%",
+ bus_Data = new BusData
+ {
+ SubnetID = 42,
+ DeviceID = 9,
+ LoopID = 1,
+ },
+
+ }.SaveFunctionData();
+ new Curtain()
+ {
+ 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"} },
+ },// "curtain",
+ lastState = "寮�",
+ bus_Data = new BusData
+ {
+ SubnetID = 42,
+ DeviceID = 7,
+ LoopID = 1,
+ },
+ }.SaveFunctionData();
+ new Curtain()
+ {
+ 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"} },
+ },//"curtaintype",
+ lastState = "20%",
+ bus_Data = new BusData
+ {
+ SubnetID = 42,
+ DeviceID = 7,
+ LoopID = 11,
+ },
+ }.SaveFunctionData();
+ new Curtain()
+ {
+ 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" } },
+
+ },// "rollingshutter",
+ lastState = "20%",
+ bus_Data = new BusData
+ {
+ SubnetID = 42,
+ DeviceID = 17,
+ LoopID = 1,
+ },
+ }.SaveFunctionData();
+ new FloorHeating()
+ {
+ 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" } },
+ },//
+ lastState = "鑷姩 25掳C",
+ bus_Data = new BusData
+ {
+ SubnetID = 111,
+ DeviceID = 12,
+ LoopID = 1
+ }
+ }.SaveFunctionData();
+ new Light()
+ {
+ sid = "030101123456780202010005ABCD",
+ name = "鍚婄伅",
+ function = new List<Trait>() {
+ new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off"} },
+ },//"on_off",
+ roomIdList = new List<string>() { "0001" },
+ bus_Data = new BusData
+ {
+ SubnetID = 42,
+ DeviceID = 6,
+ LoopID = 1,
+ },
+ }.SaveFunctionData();
+ new Light()
+ {
+ 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" } },
+ },
+ roomIdList = new List<string>() { "0001" },
+ bus_Data = new BusData
+ {
+ SubnetID = 42,
+ DeviceID = 4,
+ LoopID = 1,
+ },
+ }.SaveFunctionData();
+ new Fan()
+ {
+ 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" } },
+ },
+ roomIdList = new List<string>() { "0001" },
+ bus_Data = new BusData
+ {
+ SubnetID = 142,
+ DeviceID = 4,
+ LoopID = 11,
+ },
+ }.SaveFunctionData();
+ new TV()
+ {
+ sid = "030101123456781010020006ABCD",
+ name = "鐢佃",
+ function = new List<Trait>() {
+ new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
+ },
+ roomIdList = new List<string>() { "0001" },
+ bus_Data = new BusData
+ {
+ SubnetID = 142,
+ DeviceID = 4,
+ LoopID = 111,
+ },
+ }.SaveFunctionData();
+ new SwitchSocket()
+ {
+ sid = "030101123456780101020006ABCD",
+ name = "鎻掑骇",
+ function = new List<Trait>() {
+ new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
+ },
+ roomIdList = new List<string>() { "0001" },
+ bus_Data = new BusData
+ {
+ SubnetID = 42,
+ DeviceID = 6,
+ LoopID = 1,
+ },
+ }.SaveFunctionData();
+ new Sensor()
+ {
+ 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"} },
+ },
+ bus_Data = new BusData
+ {
+ SubnetID = 111,
+ DeviceID = 15,
+ LoopID = 1,
+ },
+ }.SaveFunctionData();
+ new Sensor()
+ {
+ 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"} },
+ },
+ bus_Data = new BusData
+ {
+ SubnetID = 111,
+ DeviceID = 15,
+ LoopID = 1,
+ },
+ }.SaveFunctionData();
+ new Sensor()
+ {
+ 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"} },
+ },
+ bus_Data = new BusData
+ {
+ SubnetID = 111,
+ DeviceID = 15,
+ LoopID = 1,
+ },
+ }.SaveFunctionData();
+ new Sensor()
+ {
+ 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"} },
+ },
+ bus_Data = new BusData
+ {
+ SubnetID = 111,
+ DeviceID = 15,
+ LoopID = 1,
+ },
+ }.SaveFunctionData();
+ new Sensor()
+ {
+ 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"} },
+ },
+ bus_Data = new BusData
+ {
+ SubnetID = 111,
+ DeviceID = 15,
+ LoopID = 1,
+ },
+ }.SaveFunctionData();
+ DB_ResidenceData.residenceData.SaveResidenceData();
+ }
Application.RunOnMainThread(() =>
{
//璺宠浆椤甸潰----
@@ -582,7 +866,7 @@
}
else
{
- //璋冪敤鐧诲綍鎺ュ彛
+ //璋冪敤楠岃瘉鐮佺櫥褰曟帴鍙�
loginResult = pm.LoginValidCode(account, password);
}
if (loginResult.StateCode.ToUpper() == "SUCCESS")
@@ -595,10 +879,10 @@
ID = (int)loginDataStr.GetValue("UserID"),
masterID = (int)loginDataStr.GetValue("MainUserID"),
accountType = (int)loginDataStr.GetValue("UserType"),
+ loginTokenString = loginDataStr.GetValue("Token").ToString(),
accountString = account,
password = password,
lastTime = DateTime.Now,
- SIP_Account = loginDataStr.GetValue("AllVisionRegisterDevUserNameGuid").ToString(),
userName = loginDataStr.GetValue("Remark").ToString(),
};
MainPage.LoginUser.SaveUserInfo();
@@ -656,7 +940,7 @@
var tip = new Tip()
{
Text = tipStr,
- CloseTime = 3,
+ CloseTime = 1,
Direction = AMPopTipDirection.None
};
tip.Show(bodyView);
@@ -692,7 +976,7 @@
var tip = new Tip()
{
Text = tipStr,
- CloseTime = 3,
+ CloseTime = 1,
Direction = AMPopTipDirection.None
};
tip.Show(bodyView);
--
Gitblit v1.8.0