From 531f1380ec8478e109118cf96bc2c9f31e9278d1 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 六月 2021 09:27:23 +0800
Subject: [PATCH] 代码同步
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 601 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 573 insertions(+), 28 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index e02c0d0..14c1026 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -190,32 +190,8 @@
#if DEBUG
btnIcon_bg.MouseUpEventHandler += (sender, e) =>
{
- MainPage.NoLoginMode = true;
- //妤煎眰鎴块棿鍒楄〃
- var floor1 = new SpatialInfo("FLOOR") { roomName = "F1", parentId = DB_ResidenceData.Instance.CurrentRegion.id };
- floor1.SaveRoomFile();
- //澶勭悊鎴块棿鍒楄〃
- var room1 = new Room() {
- roomId = "r1",
- roomName = "瀹㈠巺",
- parentId = "f1"
- };
- room1.SaveRoomFile();
- //鍔熻兘
- var light1 = new Function()
- {
- sid = "light1",
- deviceId = "light1",
- name = "RGB1",
- 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 = "rgb",value =new List<string>(){ "0","100" }, curValue="0,0,0",state = "0,0,0" },
- },
- };
- light1.SaveFunctionFile();
- //鍦烘櫙
+ return;
+
};
bool b = false;
@@ -238,13 +214,14 @@
}
else
{
+ etAccount.Text = "464027401@qq.com";//
//etAccount.Text = "15217626103";//
//etAccount.Text = "13682244600";//娉㈠摜
//etAccount.Text = "BB01010101@evoyo.com";//鍙瀵硅
//etAccount.Text = "13168123446";
//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 鍥藉鏈嶅姟鍣ㄦ祴璇�
}
@@ -522,7 +499,575 @@
};
bodyView.AddChidren(btnLogin);
- LoadEventList();
+ Button btnDomeLogin = new Button()
+ {
+ Y = btnLogin.Bottom + Application.GetRealHeight(10),
+ Height = Application.GetRealWidth(44),
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ IsBold = true,
+ TextColor = CSS_Color.MainColor,
+ TextAlignment = TextAlignment.Center,
+ Text = "浣撻獙妯″紡"
+ };
+ bodyView.AddChidren(btnDomeLogin);
+ btnDomeLogin.MouseUpEventHandler = (sender, e) => {
+ MainPage.NoLoginMode = true;
+ //妤煎眰鎴块棿鍒楄〃
+ var floor1 = new SpatialInfo("FLOOR") { roomName = "F1", parentId = DB_ResidenceData.Instance.CurrentRegion.id };
+ floor1.SaveRoomFile();
+ #region 鎴块棿涓� -- 瀹㈠巺
+ //澶勭悊鎴块棿鍒楄〃
+
+ var room1 = new Room()
+ {
+ roomId = "1405771366041378818",
+ roomName = "娲楁墜闂�",
+ roomImage = "Classification/Room/Roombg.png",
+ uid = "47c98953-6fd4-4379-88b9-4b748963504f",
+ roomType = "ROOM",
+ parentId = "2348be0f-eec2-43c4-b74d-9b6037a5ba55",
+ homeId = "1396717478877241345",
+ createTime = "1623996986290",
+ modifyTime = "1623996986290",
+ floorRoomName = "1F-娲楁墜闂�"
+ };
+ room1.SaveRoomFile();
+ var room2 = new Room()
+ {
+ roomId = "1405771310345216001",
+ roomName = "涓诲崸",
+ roomImage = "Classification/Room/Roombg.png",
+ uid = "168d27a1-9e53-42c0-95c9-f5cbf41ea167",
+ roomType = "ROOM",
+ parentId = "2348be0f-eec2-43c4-b74d-9b6037a5ba55",
+ homeId = "1396717478877241345",
+ createTime = "1623996973011",
+ modifyTime = "1623996973011",
+ floorRoomName = "1F-涓诲崸"
+ };
+ room2.SaveRoomFile();
+ var room3 = new Room()
+ {
+ roomId = "1405771193802285057",
+ roomName = "椁愬巺",
+ roomImage = "Classification/Room/Roombg.png",
+ uid = "ed7fc784-aace-44b8-97a3-bc3e727e598b",
+ roomType = "ROOM",
+ parentId = "2348be0f-eec2-43c4-b74d-9b6037a5ba55",
+ homeId = "1396717478877241345",
+ createTime = "1623996945225",
+ modifyTime = "1623996945225",
+ floorRoomName = "1F-椁愬巺"
+ };
+ room3.SaveRoomFile();
+ var room4 = new Room()
+ {
+ roomId = "1405771024583090178",
+ roomName = "瀹㈠巺",
+ roomImage = "Classification/Room/Roombg.png",
+ uid = "9191a3a2-026f-4667-a0b1-e3af699e7295",
+ roomType = "ROOM",
+ parentId = "2348be0f-eec2-43c4-b74d-9b6037a5ba55",
+ homeId = "1396717478877241345",
+ createTime = "1623996904880",
+ modifyTime = "1623996904880",
+ floorRoomName = "1F-瀹㈠巺"
+ };
+ room4.SaveRoomFile();
+ var floor = new SpatialInfo()
+ {
+ roomId = "1405770943695937537",
+ roomName = "1F",
+ roomImage = "Classification/Room/Roombg.png",
+ uid = "2348be0f-eec2-43c4-b74d-9b6037a5ba55",
+ roomType = "FLOOR",
+ parentId = "1396717478877241345",
+ homeId = "1396717478877241345",
+ createTime = "1623996885595",
+ modifyTime = "1623996885595"
+ };
+ floor.SaveRoomFile();
+
+ SpatialInfo.CurrentSpatial.FloorList.Add(floor);
+ SpatialInfo.CurrentSpatial.RoomList.Add(room1);
+ SpatialInfo.CurrentSpatial.RoomList.Add(room2);
+ SpatialInfo.CurrentSpatial.RoomList.Add(room3);
+ SpatialInfo.CurrentSpatial.RoomList.Add(room4);
+
+
+ #region 瀹㈠巺
+ #region 鍔熻兘
+ var lightRgb1 = new Function()
+ {
+ sid = "light1",
+ deviceId = "light1",
+ name = "RGB1",
+ spk = SPK.LightRGB,
+ roomIds = new List<string>() { "1405771024583090178"},
+ collect = true,
+ 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="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 = "delay",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ },
+ };
+ lightRgb1.SaveFunctionFile();
+ var lightRgb2 = new Function()
+ {
+ sid = "light2",
+ deviceId = "light2",
+ name = "RGB2",
+ spk = SPK.LightRGB,
+ 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 = "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 = "delay",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ },
+ };
+ lightRgb2.SaveFunctionFile();
+ var lightCct = new Function()
+ {
+ sid = "light3",
+ deviceId = "light3",
+ name = "CCT1",
+ spk = SPK.LightCCT,
+ 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 = "cct",value =new List<string>(){ "0","65535" }, 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" },
+ },
+ };
+ lightCct.SaveFunctionFile();
+ var lightSwitch1 = new Function()
+ {
+ sid = "light4",
+ deviceId = "light4",
+ name = "寮�鍏崇伅1",
+ spk = SPK.LightSwitch,
+ 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 = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ },
+ };
+ lightSwitch1.SaveFunctionFile();
+ var lightSwitch2 = new Function()
+ {
+ sid = "light5",
+ deviceId = "light5",
+ name = "寮�鍏崇伅2",
+ spk = SPK.LightSwitch,
+ 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 = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ },
+ };
+ lightSwitch2.SaveFunctionFile();
+ var curtain1 = new Function()
+ {
+ sid = "curtain1",
+ deviceId = "curtain1",
+ name = "寮�鍚堝笜",
+ spk = SPK.CurtainTrietex,
+ 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 = "percent",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ },
+ };
+ curtain1.SaveFunctionFile();
+ var curtain2 = new Function()
+ {
+ sid = "curtain2",
+ deviceId = "curtain2",
+ name = "鍗峰笜",
+ spk = SPK.CurtainRoller,
+ 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 = "percent",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ },
+ };
+ curtain2.SaveFunctionFile();
+ var fh = new Function()
+ {
+ sid = "floorheat1",
+ deviceId = "floorheat1",
+ name = "鍦版殩",
+ spk = SPK.FloorHeatStandard,
+ 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 = "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 = "room_temp",value =new List<string>(){ "" }, curValue="26",state = "26" },
+ },
+ };
+ fh.SaveFunctionFile();
+ #endregion
+ #region 鍦烘櫙
+ var scene1 = new Scene()
+ {
+ sid = "scene1",
+ userSceneId = "scene1",
+ name = "鏄庝寒妯″紡",
+ roomIds = new List<string>() { "1405771024583090178" },
+ gatewayId = "1234567890123456",
+ collect = true,
+ functions = new List<SceneFunction>()
+ {
+ new SceneFunction()
+ {
+ sid = lightRgb1.sid,
+ status = new List<SceneFunctionStatus>()
+ {
+ new SceneFunctionStatus()
+ {
+ key = "on_off",
+ value = "on",
+ }
+ }
+ },
+ new SceneFunction()
+ {
+ sid = lightRgb2.sid,
+ status = new List<SceneFunctionStatus>()
+ {
+ new SceneFunctionStatus()
+ {
+ key = "on_off",
+ value = "on",
+ }
+ }
+ },
+ new SceneFunction()
+ {
+ sid = lightCct.sid,
+ status = new List<SceneFunctionStatus>()
+ {
+ new SceneFunctionStatus()
+ {
+ key = "on_off",
+ value = "on",
+ }
+ }
+ },
+ new SceneFunction()
+ {
+ sid = lightSwitch1.sid,
+ status = new List<SceneFunctionStatus>()
+ {
+ new SceneFunctionStatus()
+ {
+ key = "on_off",
+ value = "on",
+ }
+ }
+ },
+ new SceneFunction()
+ {
+ sid = lightSwitch2.sid,
+ status = new List<SceneFunctionStatus>()
+ {
+ new SceneFunctionStatus()
+ {
+ key = "on_off",
+ value = "on",
+ }
+ }
+ },
+
+
+ },
+ };
+ scene1.SaveSceneFile();
+ var scene2 = new Scene()
+ {
+ sid = "scene2",
+ userSceneId = "scene2",
+ name = "娴极妯″紡",
+ roomIds = new List<string>() { "1405771024583090178" },
+ gatewayId = "1234567890123456",
+ collect = false,
+ functions = new List<SceneFunction>()
+ {
+ new SceneFunction()
+ {
+ sid = lightRgb1.sid,
+ status = new List<SceneFunctionStatus>()
+ {
+ new SceneFunctionStatus()
+ {
+ key = "on_off",
+ value = "on",
+ }
+ }
+ },
+ new SceneFunction()
+ {
+ sid = lightRgb2.sid,
+ status = new List<SceneFunctionStatus>()
+ {
+ new SceneFunctionStatus()
+ {
+ key = "on_off",
+ value = "on",
+ }
+ }
+ },
+ new SceneFunction()
+ {
+ sid = lightCct.sid,
+ status = new List<SceneFunctionStatus>()
+ {
+ new SceneFunctionStatus()
+ {
+ key = "on_off",
+ value = "on",
+ }
+ }
+ },
+ new SceneFunction()
+ {
+ sid = lightSwitch1.sid,
+ status = new List<SceneFunctionStatus>()
+ {
+ new SceneFunctionStatus()
+ {
+ key = "on_off",
+ value = "off",
+ }
+ }
+ },
+ new SceneFunction()
+ {
+ sid = lightSwitch2.sid,
+ status = new List<SceneFunctionStatus>()
+ {
+ new SceneFunctionStatus()
+ {
+ key = "on_off",
+ value = "off",
+ }
+ }
+ },
+
+
+ },
+
+ };
+ scene2.SaveSceneFile();
+ #endregion
+ #endregion
+ #region 椁愬巺
+ var lightSwitch3 = new Function()
+ {
+ sid = "light6",
+ deviceId = "light6",
+ name = "椁愬巺鐏�1",
+ spk = SPK.LightSwitch,
+ 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 = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ },
+ };
+ lightSwitch3.SaveFunctionFile();
+ var lightSwitch4 = new Function()
+ {
+ sid = "light7",
+ deviceId = "light7",
+ name = "椁愬巺鐏�2",
+ spk = SPK.LightSwitch,
+ 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 = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ },
+ };
+ lightSwitch4.SaveFunctionFile();
+ var scene3 = new Scene()
+ {
+ sid = "scene3",
+ userSceneId = "scene3",
+ name = "娓╅Θ妯″紡",
+ roomIds = new List<string>() { room3.roomId },
+ gatewayId = "1234567890123456",
+ collect = true,
+ functions = new List<SceneFunction>()
+ {
+ new SceneFunction()
+ {
+ sid = lightSwitch4.sid,
+ status = new List<SceneFunctionStatus>()
+ {
+ new SceneFunctionStatus()
+ {
+ key = "on_off",
+ value = "off",
+ }
+ }
+ },
+ new SceneFunction()
+ {
+ sid = lightSwitch4.sid,
+ status = new List<SceneFunctionStatus>()
+ {
+ new SceneFunctionStatus()
+ {
+ key = "on_off",
+ value = "off",
+ }
+ }
+ },
+ }
+ };
+ scene3.SaveSceneFile();
+ var scene4 = new Scene()
+ {
+ sid = "scene4",
+ userSceneId = "scene4",
+ name = "瑗块妯″紡",
+ roomIds = new List<string>() { room3.roomId },
+ gatewayId = "1234567890123456",
+ collect = false,
+ functions = new List<SceneFunction>()
+ {
+ new SceneFunction()
+ {
+ sid = lightSwitch4.sid,
+ status = new List<SceneFunctionStatus>()
+ {
+ new SceneFunctionStatus()
+ {
+ key = "on_off",
+ value = "on",
+ }
+ }
+ },
+ new SceneFunction()
+ {
+ sid = lightSwitch4.sid,
+ status = new List<SceneFunctionStatus>()
+ {
+ new SceneFunctionStatus()
+ {
+ key = "on_off",
+ value = "on",
+ }
+ }
+ },
+ }
+ };
+ scene4.SaveSceneFile();
+ #endregion
+ #region 鍗у
+ var ac = new Function()
+ {
+ sid = "ac1",
+ deviceId = "ac1",
+ name = "鍗у绌鸿皟",
+ spk = SPK.AcStandard,
+ 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 = "mode", value = new List<string>() { "cool", "heat", "fan", "auto", "dry" }, curValue = "cool", state = "cool" },
+ new FunctionAttributes() { key = "fan", value = new List<string>() { "high", "medium", "low", "auto" }, curValue = "auto", state = "auto" },
+ new FunctionAttributes() { key = "set_temp", value = new List<string>() { "16", "30"}, curValue = "16", state = "16",max = 30,min = 16 },
+ new FunctionAttributes() { key = "room_temp", value = new List<string>() { }, curValue = "20", state = "20" },
+ new FunctionAttributes() { key = "swing", value = new List<string>() {"up_down", "left_right", "stop" }, curValue = "20", state = "20" },
+ }
+ };
+ ac.SaveFunctionFile();
+ var scene5 = new Scene()
+ {
+ sid = "scene5",
+ userSceneId = "scene5",
+ name = "闃呰",
+ roomIds = new List<string>() { room2.roomId },
+ gatewayId = "1234567890123456",
+ collect = true,
+ };
+ scene5.SaveSceneFile();
+ var scene6 = new Scene()
+ {
+ sid = "scene6",
+ userSceneId = "scene6",
+ name = "璧峰簥",
+ roomIds = new List<string>() { room2.roomId },
+ gatewayId = "1234567890123456",
+ collect = false,
+ };
+ scene6.SaveSceneFile();
+ #endregion
+
+
+ var lightSwitch6 = new Function()
+ {
+ sid = "lightSwitch6",
+ deviceId = "lightSwitch6",
+ name = "娲楁墜闂寸伅",
+ spk = SPK.LightSwitch,
+ roomIds = new List<string>() { room1.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 = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ },
+ };
+ lightSwitch6.SaveFunctionFile();
+
+ #endregion
+
+ var fileList = Common.FileUtlis.Files.ReadFiles();
+
+ foreach (var file in fileList)
+ {
+ FunctionList.List.IniFunctionList(file,true);
+ }
+
+ Room.CurrentSpatial.InitRoomListFunctions();
+
+
+
+
+
+
+
+
+
+
+ MainPage.GoUserPage(false);
+ };
+
+
+
+ LoadEventList();
account = etAccount.Text.Trim();
#if DEBUG1211
--
Gitblit v1.8.0