From 4a5e9d0447aae9b264a98ea1f4c95417d0f4aa91 Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期二, 01 十二月 2020 17:20:01 +0800 Subject: [PATCH] Merge branch 'master' into WJC --- HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 265 ----------------------------------------------------- 1 files changed, 0 insertions(+), 265 deletions(-) diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs index 1047d32..70c7f7b 100644 --- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs +++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs @@ -586,271 +586,6 @@ OnAppConfig.Instance.RefreshUserConfig(); DB_ResidenceData.InitRoomFunction(); } - if (UserInfo.Current.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<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", - bus_Data = new BusData - { - SubnetID = 42, - DeviceID = 8, - LoopID = 1, - }, - }.SaveFunctionData(); - new Light() - { - sid = "030101123456780202020002ABCD", - name = "璋冨厜鐏�", - 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%", - bus_Data = new BusData - { - SubnetID = 42, - DeviceID = 9, - LoopID = 1, - }, - - }.SaveFunctionData(); - new Curtain() - { - sid = "030101123456780303010003ABCD", - name = "绐楀笜妯″潡", - roomIdList = new List<string>() { "0001" }, - 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 - { - SubnetID = 42, - DeviceID = 7, - LoopID = 1, - }, - }.SaveFunctionData(); - new Curtain() - { - sid = "030101123456780303030011ABCD", - name = "寮�鍚堝笜", - roomIdList = new List<string>() { "0001" }, - 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 - { - SubnetID = 42, - DeviceID = 7, - LoopID = 11, - }, - }.SaveFunctionData(); - new Curtain() - { - sid = "030101123456780503040012ABCD", - name = "鍗峰笜", - roomIdList = new List<string>() { "0001" }, - 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%", - bus_Data = new BusData - { - SubnetID = 42, - DeviceID = 17, - LoopID = 1, - }, - }.SaveFunctionData(); - new FloorHeating() - { - sid = "030101123456780404020004ABCD", - name = "鍦扮儹", - roomIdList = new List<string>() { "0001" }, - 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 - { - SubnetID = 111, - DeviceID = 12, - LoopID = 1 - } - }.SaveFunctionData(); - new Light() - { - sid = "030101123456780202010005ABCD", - name = "鍚婄伅", - 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 - { - SubnetID = 42, - DeviceID = 6, - LoopID = 1, - }, - }.SaveFunctionData(); - new Light() - { - sid = "030101123456780202040006ABCD", - name = "RGB鐏�", - 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 - { - SubnetID = 42, - DeviceID = 4, - LoopID = 1, - }, - }.SaveFunctionData(); - new Fan() - { - sid = "030101123456781010020006ABCD", - name = "椋庢墖", - 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 - { - SubnetID = 142, - DeviceID = 4, - LoopID = 11, - }, - }.SaveFunctionData(); - new TV() - { - sid = "030101123456781010020006ABCD", - name = "鐢佃", - 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 - { - SubnetID = 142, - DeviceID = 4, - LoopID = 111, - }, - }.SaveFunctionData(); - new SwitchSocket() - { - sid = "030101123456780101020006ABCD", - name = "鎻掑骇", - 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 - { - SubnetID = 42, - DeviceID = 6, - LoopID = 1, - }, - }.SaveFunctionData(); - new Sensor() - { - sid = "030101123456781005060006ABCD", - name = "PM2.5", - roomIdList = new List<string>() { "0001" }, - function = new List<FunctionAttributes>() { - new FunctionAttributes { key="values", max=1,min = 0, value= 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<FunctionAttributes>() { - new FunctionAttributes { key="values", max=1,min = 0, value= 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<FunctionAttributes>() { - new FunctionAttributes { key="values", max=1,min = 0, value= 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<FunctionAttributes>() { - new FunctionAttributes { key="values", max=1,min = 0, value= 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<FunctionAttributes>() { - new FunctionAttributes { key="values", max=1,min = 0, value= new List<string> { "15"} }, - }, - bus_Data = new BusData - { - SubnetID = 111, - DeviceID = 15, - LoopID = 1, - }, - }.SaveFunctionData(); - DB_ResidenceData.residenceData.SaveResidenceData(); - } Application.RunOnMainThread(() => { //璺宠浆椤甸潰---- -- Gitblit v1.8.0