From f982455916297ab07379d902a7f15b7a7a867c94 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 20 十月 2021 09:19:20 +0800
Subject: [PATCH] 1
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 89 +++++++++++++++++++++++++-------------------
1 files changed, 51 insertions(+), 38 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 022b8bc..9f6c480 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Text.RegularExpressions;
using System.Threading;
+using HDL_ON.Common;
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
@@ -204,33 +205,46 @@
{
//etAccount.Text = "tf@smarttech.com.ua";//鍥藉璐﹀彿锛屾湁浣忓畢锛岀櫥褰曟棤娉曟樉绀�
//etAccount.Text = "13375012446";//娴嬭瘯鏈嶅姟鍣�
- etAccount.Text = "13450425803";
//etAccount.Text = "1033326940@qq.com";
//etAccount.Text = "18022428438";//wjc
//etAccount.Text = "13602944661";//kx
- //etAccount.Text = "13226233133";//璞嗚眴
- //etAccount.Text = "18316672920";//lcg "18316672920";//hzx;// "13415629083"//cf;;
+ etAccount.Text = "13226233133";//璞嗚眴
+ etAccount.Text = "18316672920";
//etAccount.Text = "18316120654";//tujie
- // "15622703419"lwn;// "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
+ //etAccount.Text = "15626203746";
+ //etAccount.Text = "13450425807";//榛勭婧� knx椤圭洰
}
else
{
- //etAccount.Text = "15626203746";
//etAccount.Text = "15018447586";//闊充箰鏁伴噺鍒锋柊闂
//etAccount.Text = "464027401@qq.com";//
//etAccount.Text = "15217626103";//
//etAccount.Text = "13682244600";//娉㈠摜
- //etAccount.Text = "13168123446";//鏄嗘槑閲戣寕椤圭洰锛屾柊椋庨棶棰�
- etAccount.Text = "551775569@.com";
- //etAccount.Text = "13168123446";
+ etAccount.Text = "13168123446";//鏄嗘槑閲戣寕椤圭洰锛屾柊椋庨棶棰�
+ //etAccount.Text = "2949126848@qq.com";//闄堢惓
+ //etAccount.Text = "13415629083";
//etAccount.Text = "13676202754";//宸存灄鏈嶅姟鍣�
//etAccount.Text = "13602944661";//kx
- //etAccount.Text = "551775569@qq.com";//wcf
+ etAccount.Text = "551775569@qq.com";//wcf
//etAccount.Text = "18666455392";//13375012446//13602944661//tzy 18778381374
- //etAccount.Text = "15971583093";// gs//tzy 274116637@qq.com//Sumant.Bhatia@havells.com 鍥藉鏈嶅姟鍣ㄦ祴璇�
+ //etAccount.Text = "15971583093";//楂樿儨
+ //etAccount.Text = "15217626103";//鏄嗘槑閲戣寕椤圭洰
+ //etAccount.Text = "18598273624";
+ //etAccount.Text = "tf@smarttech.com.ua";
+ etAccount.Text = "18814122445";//钁ｆ辰鏂� 澶╂渤鍔炲叕瀹�
+ //etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
+ //etAccount.Text = "18402017839";//wjc
+ //etAccount.Text = "13430286286";//cwc
+ etAccount.Text = "13709260805";
+ etAccount.Text = "support5@hdlchina.com.cn";
}
b = !b;
- etPassword.Text = "123456";
+ etPassword.Text = "A85521566";
+ if(etAccount.Text == "fslcjm5@163.com")
+ {
+ etPassword.Text = "a123456";
+ }
+ //etPassword.Text = "Hdl85521566";
btnLogin.IsSelected = true;
};
#endif
@@ -511,11 +525,22 @@
IsBold = true,
TextColor = CSS_Color.MainColor,
TextAlignment = TextAlignment.Center,
- Text = "Dome妯″紡"
+ Text = "娓稿浣撻獙"
};
bodyView.AddChidren(btnDomeLogin);
+
+ if(Language.CurrentLanguage!= "Chinese")
+ {
+ btnDomeLogin.Text = "Tourist experience";
+ }
+
btnDomeLogin.MouseUpEventHandler = (sender, e) => {
+
MainPage.NoLoginMode = true;
+#if DEBUG
+ FileUtlis.Files.DeleteAllFile();
+#endif
+ //DB_ResidenceData.Instance.HomeGateway.gatewayType = "AGATEWAY";
//妤煎眰鎴块棿鍒楄〃
var floor1 = new SpatialInfo("FLOOR") { roomName = "F1", parentId = DB_ResidenceData.Instance.CurrentRegion.id };
floor1.SaveRoomFile();
@@ -614,7 +639,7 @@
new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, curValue="100",state = "100" },
new FunctionAttributes() { key = "rgb",value =new List<string>(){ "0","100" }, curValue="0,0,0",state = "0,0,0" },
- new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ //new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
new FunctionAttributes() { key = "delay",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
},
};
@@ -647,7 +672,7 @@
{
new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
- new FunctionAttributes() { key = "cct",value =new List<string>(){ "0","65535" }, curValue="0",state = "0" },
+ new FunctionAttributes() { key = "cct",value =new List<string>(){ "0","65535" }, curValue="0",state = "0" ,min = 2700,max = 6500 },
new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
new FunctionAttributes() { key = "delay",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
},
@@ -657,13 +682,13 @@
{
sid = "light4",
deviceId = "light4",
- name = Language.CurrentLanguage == "Chinese" ? "澶х伅" : "light 1" ,
- spk = SPK.LightSwitch,
- roomIds = new List<string>() { "1405771024583090178"},
+ name = Language.CurrentLanguage == "Chinese" ? "澶х伅" : "light 1",
+ spk = SPK.LightDimming,
+ roomIds = new List<string>() { "1405771024583090178" },
attributes = new List<FunctionAttributes>()
{
new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
- new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, curValue="100",state = "100" },
new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
},
};
@@ -678,7 +703,6 @@
attributes = new List<FunctionAttributes>()
{
new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
- new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
},
};
@@ -722,7 +746,7 @@
{
new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
new FunctionAttributes() { key = "mode",value =new List<string>(){ "day", "night", "away", "normal", "timer" }, curValue="day",state = "day" },
- new FunctionAttributes() { key = "set_temp",value =new List<string>(){ "" }, curValue="26",state = "26" },
+ new FunctionAttributes() { key = "set_temp",value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 35,min = 5 },
new FunctionAttributes() { key = "room_temp",value =new List<string>(){ "" }, curValue="26",state = "26" },
},
};
@@ -888,12 +912,12 @@
sid = "light6",
deviceId = "light6",
name = Language.CurrentLanguage == "Chinese" ? "椁愬巺鐏�1" : "Dining room light 1",
- spk = SPK.LightSwitch,
+ spk = SPK.LightDimming,
roomIds = new List<string>() { room3.roomId },
attributes = new List<FunctionAttributes>()
{
new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
- new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, curValue="100",state = "100" },
new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
},
};
@@ -908,7 +932,6 @@
attributes = new List<FunctionAttributes>()
{
new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
- new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
},
};
@@ -1040,7 +1063,6 @@
attributes = new List<FunctionAttributes>()
{
new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
- new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
},
};
@@ -1049,20 +1071,11 @@
#endregion
var fileList = Common.FileUtlis.Files.ReadFiles();
-
- //foreach (var file in fileList)
- //{
- // FunctionList.List.IniFunctionList(file,true);
- //}
-
+ foreach(var file in fileList)
+ {
+ FunctionList.List.IniFunctionList(file,true);
+ }
Room.CurrentSpatial.InitRoomListFunctions();
-
-
-
-
-
-
-
@@ -1130,7 +1143,7 @@
frameRow.AddChidren(agreeView);
if(Language.CurrentLanguage == "Chinese")
{
- agreeView.X = Application.GetRealWidth(82);
+ agreeView.X = Application.GetRealWidth(52);
}
//鍚屾剰鍥炬爣鎸夐挳
var agreeBtn = new Button()
--
Gitblit v1.8.0