blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
wxr
2020-11-12 a715181089be0d31cd737a5367ffd02690b9d77f 
 HDL_ON/Entity/DB_ResidenceData.cs


@@ -16,7 +16,7 @@


        /// 0:bus网关


        /// 1:A协议网关


        /// </summary>


        public int GatewayType = 0;


        public int GatewayType = 1;


        /// <summary>


        /// 住宅基础信息


        /// </summary>


@@ -63,7 +63,7 @@


                    try


                    {


                        var residenceDataBytes = FileUtils.ReadFile("DB_ResidenceData");


                        var userConfigString = CommonPage.MyEncodingUTF8.GetString(residenceDataBytes);


                        var userConfigString = System.Text.Encoding.UTF8.GetString(residenceDataBytes);


                        DB_ResidenceData temp = null;




                        if (!string.IsNullOrEmpty(userConfigString))


@@ -95,7 +95,7 @@


                        new Light()


                        {


                            sid = "030101123456780202010005ABCD",


                            name = "吊灯",


                            name = "灯光1",


                            function = new List<Trait>() {


                                        new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off"} },


                                        },


@@ -110,12 +110,12 @@








                        //#if DEBUG


                        if (rooms.Count == 0 && residenceData.CurReginID == "1108024000000000000000")




#if DEBUG11


                        if (rooms.Count == 0 )


                        {


                            //--------------------


                            instance.floors.Add(new Floor() { name = "1F", sid = "09888" });


                            var r111 = new Room() { sid = "0001", name = "Room-1", floorId = "09888", backgroundImage = "Classification/Room/Roombg.png" };


                            var r111 = new Room() { sid = "0001", name = "客厅", floorId = "", backgroundImage = "Classification/Room/Roombg.png" };


                            rooms.Add(r111);


                            instance.floors.Add(new Floor() { sid = "000022222", name = "1F" });


                            r111.SaveRoomData();


@@ -127,7 +127,7 @@


                                                                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" } },


                                                                new Trait { name = "temperature", max = 32,min=16,value_key = new List<string>{"up","down" } },


                                                            },


                                roomIdList = new List<string>() { "0001" },


                                lastState = "制冷 中风 18°C",


@@ -158,7 +158,7 @@


                            new Curtain()


                            {


                                sid = "030101123456780303010003ABCD",


                                name = "窗帘模块",


                                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"} },


@@ -213,7 +213,7 @@


                                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" } },


                                                                new Trait { name = "temperature", max = 32,min=5,value_key = new List<string>{"up","down" } },


                                                            },//


                                lastState = "自动 25°C",


                                bus_Data = new BusData


@@ -245,7 +245,7 @@


                                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" } },


                                                            },


                                                            },//"brightness,color",


                                roomIdList = new List<string>() { "0001" },


                                bus_Data = new BusData


                                {


@@ -261,7 +261,7 @@


                                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" } },


                                                        },


                                                        },//"brightness,color",


                                roomIdList = new List<string>() { "0001" },


                                bus_Data = new BusData


                                {


@@ -377,7 +377,11 @@


                            }.SaveFunctionData();


                            instance.SaveResidenceData();


                        }


                        //#endif


#endif










                    }


                    catch (Exception ex)


                    {


@@ -413,7 +417,7 @@


        /// <summary>


        /// 当前住宅的网关MAC


        /// </summary>


        public string residenceGatewayMAC = "00964E19C4467B1E";


        public string residenceGatewayMAC = "0281B9078C000000";// "00964E19C4467B1E";


        /// <summary>


        /// 保存住宅数据


        /// </summary>


@@ -421,7 +425,7 @@


        {


            if (this == null || this.residecenInfo == null)


                return;


            var ssd = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));


            var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));


            FileUtils.WriteFileByBytes("DB_ResidenceData", ssd);


            MainPage.Log("Save DB_ResidenceData");


        }


@@ -472,7 +476,7 @@


                            if (filePath.StartsWith("RoomData_"))


                            {


                                var roomDataBytes = FileUtils.ReadFile(filePath);


                                var roomDataString = CommonPage.MyEncodingUTF8.GetString(roomDataBytes);


                                var roomDataString = System.Text.Encoding.UTF8.GetString(roomDataBytes);


                                var room = Newtonsoft.Json.JsonConvert.DeserializeObject<Room>(roomDataString);


                                if (room != null)


                                {


@@ -533,7 +537,7 @@


                                    case FunctionType.AC:


                                        //恢复空调数据


                                        var acDataBytes = FileUtils.ReadFile(filePath);


                                        var acString = CommonPage.MyEncodingUTF8.GetString(acDataBytes);


                                        var acString = System.Text.Encoding.UTF8.GetString(acDataBytes);


                                        ins_Function.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(acString));


                                        break;


                                    case FunctionType.Relay:


@@ -541,7 +545,7 @@


                                    case FunctionType.RGB:


                                        //恢复灯光数据


                                        var lightsDataBytes = FileUtils.ReadFile(filePath);


                                        var lightsString = CommonPage.MyEncodingUTF8.GetString(lightsDataBytes);


                                        var lightsString = System.Text.Encoding.UTF8.GetString(lightsDataBytes);


                                        ins_Function.lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(lightsString));


                                        break;


                                    case FunctionType.Curtain:


@@ -549,13 +553,13 @@


                                    case FunctionType.RollingShutter:


                                        //恢复窗帘数据


                                        var curtainsDataBytes = FileUtils.ReadFile(filePath);


                                        var curtainsString = CommonPage.MyEncodingUTF8.GetString(curtainsDataBytes);


                                        var curtainsString = System.Text.Encoding.UTF8.GetString(curtainsDataBytes);


                                        ins_Function.curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(curtainsString));


                                        break;


                                    case FunctionType.FloorHeating:


                                        //恢复地热数据


                                        var fhDataBytes = FileUtils.ReadFile(filePath);


                                        var fhString = CommonPage.MyEncodingUTF8.GetString(fhDataBytes);


                                        var fhString = System.Text.Encoding.UTF8.GetString(fhDataBytes);


                                        ins_Function.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(fhString));


                                        break;


                                    case FunctionType.PM25:


@@ -565,31 +569,31 @@


                                    case FunctionType.Humidity:


                                        //恢复环境数据


                                        var sesDataBytes = FileUtils.ReadFile(filePath);


                                        var sesString = CommonPage.MyEncodingUTF8.GetString(sesDataBytes);


                                        var sesString = System.Text.Encoding.UTF8.GetString(sesDataBytes);


                                        ins_Function.sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(sesString));


                                        break;


                                    case FunctionType.Socket:


                                        //恢复插座数据


                                        var eleDataBytes = FileUtils.ReadFile(filePath);


                                        var eleString = CommonPage.MyEncodingUTF8.GetString(eleDataBytes);


                                        var eleString = System.Text.Encoding.UTF8.GetString(eleDataBytes);


                                        ins_Function.switchSockets.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(eleString));


                                        break;


                                    case FunctionType.TV:


                                        //恢复电视数据


                                        var eleDataBytes1 = FileUtils.ReadFile(filePath);


                                        var eleString1 = CommonPage.MyEncodingUTF8.GetString(eleDataBytes1);


                                        var eleString1 = System.Text.Encoding.UTF8.GetString(eleDataBytes1);


                                        ins_Function.tVs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(eleString1));


                                        break;


                                    case FunctionType.Fan:


                                        //恢复风扇数据


                                        var eleDataBytes2 = FileUtils.ReadFile(filePath);


                                        var eleString2 = CommonPage.MyEncodingUTF8.GetString(eleDataBytes2);


                                        var eleString2 = System.Text.Encoding.UTF8.GetString(eleDataBytes2);


                                        ins_Function.fans.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(eleString2));


                                        break;


                                    case FunctionType.Scene:


                                        //恢复场景数据


                                        var scenesDataBytes = FileUtils.ReadFile(filePath);


                                        var scenesString = CommonPage.MyEncodingUTF8.GetString(scenesDataBytes);


                                        var scenesString = System.Text.Encoding.UTF8.GetString(scenesDataBytes);


                                        ins_Function.scenes.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Scene>(scenesString));


                                        break;




@@ -656,18 +660,18 @@


                    foreach (var function in functionList.GetAllDeviceFunctionList())


                    {


                        System.Threading.Thread.Sleep(100);


                        //if (function.bus_Data != null)


                        switch (function.functionCategory)


                        {


                            switch (function.functionCategory)


                            {


                                case FunctionCategory.Light:


                                case FunctionCategory.Electrical:


                                case FunctionCategory.SwitchDevice:


                                case FunctionCategory.Curtain:


                                case FunctionCategory.Thermostat:


                                    Control.SendReadCommand(function);


                                    break;


                            }


                            case FunctionCategory.Light:


                            case FunctionCategory.Electrical:


                            case FunctionCategory.SwitchDevice:


                            case FunctionCategory.Curtain:


                            case FunctionCategory.Thermostat:


                                if (DB_ResidenceData.residenceData.GatewayType == 0)


                                {


                                    DriverLayer.Control.ins.SendReadCommand(function);


                                }


                                break;


                        }


                    }


                }