2020-12-11 1.取消屏幕常亮。2.优化iOS接收推送处理。

JLChen

2020-12-11 d616b67bd6ea95562af73a00bf0aab38eec935df

 HDL_ON/Entity/FunctionList.cs

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using HDL_ON.DAL;
using HDL_ON.DAL.Server;

@@ -111,6 +112,11 @@
                var functionDataBytes = FileUtils.ReadFile(filePath);
                var functionDataString = System.Text.Encoding.UTF8.GetString(functionDataBytes);
                var tempFunction = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(functionDataString);
                if (tempFunction == null)
                {
                    FileUtils.DeleteFile(filePath);
                    return;
                }
                if (tempFunction.DeleteSign)
                {
                    //todo 删除云端数据 20201203--App不能删除功能数据
@@ -124,20 +130,20 @@
                        case SPK.LightRGB:
                        case SPK.LightRGBW:
                        case SPK.LightCCT:
                            List.lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(functionDataString));
                            _FunctionList.lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(functionDataString));
                            break;
                        case SPK.CurtainRoller:
                        case SPK.CurtainShades:
                        case SPK.CurtainSwitch:
                        case SPK.CurtainTrietex:
                            List.curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(functionDataString));
                            _FunctionList.curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(functionDataString));
                            break;
                        case SPK.AcStandard:
                            List.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(functionDataString));
                            _FunctionList.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(functionDataString));
                            break;
                        case SPK.FloorHeatStandard:
                            //恢复地热数据
                            List.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(functionDataString));
                            _FunctionList.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(functionDataString));
                            break;
                        case SPK.SensorPm25:
                        case SPK.SensorCO2:
@@ -145,19 +151,19 @@
                        case SPK.SensorTemperature:
                        case SPK.SensorHumidity:
                            //恢复环境数据
                            List.sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(functionDataString));
                            _FunctionList.sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(functionDataString));
                            break;
                        case SPK.ElectricSocket:
                            //恢复插座数据
                            List.switchSockets.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(functionDataString));
                            _FunctionList.switchSockets.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(functionDataString));
                            break;
                        case SPK.ElectricTV:
                            //恢复电视数据
                            List.tVs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(functionDataString));
                            _FunctionList.tVs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(functionDataString));
                            break;
                        case SPK.ElectricFan:
                            //恢复风扇数据
                            List.fans.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString));
                            _FunctionList.fans.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString));
                            break;
                    }
                }
@@ -167,15 +173,7 @@
                var sceneDataBytes = FileUtils.ReadFile(filePath);
                var sceneDataString = System.Text.Encoding.UTF8.GetString(sceneDataBytes);
                var tempScene = Newtonsoft.Json.JsonConvert.DeserializeObject<Scene>(sceneDataString);
                if (tempScene.DeleteSign)
                {
                    var pm = new HttpServerRequest();
                    pm.DeleteScene(tempScene.userSceneId);
                }
                else
                {
                    List.scenes.Add(tempScene);
                }
                List.scenes.Add(tempScene);
            }
        }

@@ -195,14 +193,17 @@
        /// </summary>
        public List<Function> GetAllDeviceFunctionList()
        {
            deviceFunctionList = new List<Function>();
            deviceFunctionList.AddRange(aCs);
            deviceFunctionList.AddRange(lights);
            deviceFunctionList.AddRange(curtains);
            deviceFunctionList.AddRange(floorHeatings);
            deviceFunctionList.AddRange(electricals);
            deviceFunctionList.AddRange(sensorsEnvironmentalScience);
            deviceFunctionList.AddRange(UI.Music.A31MusicModel.A31MusicModelList);
            //if (deviceFunctionList == null)
            {
                deviceFunctionList = new List<Function>();
                deviceFunctionList.AddRange(aCs);
                deviceFunctionList.AddRange(lights);
                deviceFunctionList.AddRange(curtains);
                deviceFunctionList.AddRange(floorHeatings);
                deviceFunctionList.AddRange(electricals);
                deviceFunctionList.AddRange(sensorsEnvironmentalScience);
                deviceFunctionList.AddRange(UI.Music.A31MusicModel.A31MusicModelList);
            }
            try
            {
                deviceFunctionList.OrderByDescending(o => o.usageCount).ToList();
@@ -242,41 +243,41 @@
                case FunctionType.AC:
                    var sidObj =  Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
                    DB_ResidenceData.functionList.aCs.Add(sidObj);
                    sidObj.SaveFunctionData();
                    sidObj.SaveFunctionData(false);
                    break;
                case FunctionType.FloorHeating:
                    var sidObj1 =  Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
                    DB_ResidenceData.functionList.floorHeatings.Add(sidObj1);
                    sidObj1.SaveFunctionData();
                    sidObj1.SaveFunctionData(false);
                    break;
                case FunctionType.Dimmer:
                case FunctionType.RGB:
                case FunctionType.Relay:
                    var sidObj2 =  Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
                    DB_ResidenceData.functionList.lights.Add(sidObj2);
                    sidObj2.SaveFunctionData();
                    sidObj2.SaveFunctionData(false);
                    break;
                case FunctionType.Curtain:
                case FunctionType.RollingShutter:
                case FunctionType.MotorCurtain:
                    var sidObj3 =  Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
                    DB_ResidenceData.functionList.curtains.Add(sidObj3 );
                    sidObj3.SaveFunctionData();
                    sidObj3.SaveFunctionData(false);
                    break;
                case FunctionType.TV:
                    var sidObj4 =  Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
                    DB_ResidenceData.functionList.tVs.Add(sidObj4);
                    sidObj4.SaveFunctionData();
                    sidObj4.SaveFunctionData(false);
                    break;
                case FunctionType.Socket:
                    var sidObj5 =  Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
                    DB_ResidenceData.functionList.switchSockets.Add(sidObj5);
                    sidObj5.SaveFunctionData();
                    sidObj5.SaveFunctionData(false);
                    break;
                case FunctionType.Fan:
                    var sidObj6 =  Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
                    DB_ResidenceData.functionList.fans.Add(sidObj6);
                    sidObj6.SaveFunctionData();
                    sidObj6.SaveFunctionData(false);
                    break;
                case FunctionType.CO2:
                case FunctionType.TVOC:
@@ -285,7 +286,7 @@
                case FunctionType.Humidity:
                    var sidObj7 =  Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
                    DB_ResidenceData.functionList.sensorsEnvironmentalScience.Add(sidObj7);
                    sidObj7.SaveFunctionData();
                    sidObj7.SaveFunctionData(false);
                    break;
            }
        }
@@ -305,30 +306,30 @@
                    switch (f.functionType)
                    {
                        case FunctionType.AC:
                            aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(obj.ToString()));
                            _FunctionList.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(obj.ToString()));
                            break;
                        case FunctionType.FloorHeating:
                            floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(obj.ToString()));
                            _FunctionList.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(obj.ToString()));
                            break;
                    }
                    break;
                case FunctionCategory.Light:
                    lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(obj.ToString()));
                    _FunctionList.lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(obj.ToString()));
                    break;
                case FunctionCategory.Curtain:
                    curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(obj.ToString()));
                    _FunctionList.curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(obj.ToString()));
                    break;
                case FunctionCategory.Electrical:
                    switch(f.functionType)
                    {
                        case FunctionType.TV:
                            electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(obj.ToString()));
                            _FunctionList.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(obj.ToString()));
                            break;
                        case FunctionType.Socket:
                            electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(obj.ToString()));
                            _FunctionList.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(obj.ToString()));
                            break;
                        case FunctionType.Fan:
                            electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(obj.ToString()));
                            _FunctionList.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(obj.ToString()));
                            break;
                    }
                    break;
@@ -339,8 +340,8 @@
                        case FunctionType.CO2:
                        case FunctionType.PM25:
                        case FunctionType.Humidity:
                        //case FunctionType.Noise:
                            sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(obj.ToString()));
                        case FunctionType.Temp:
                            _FunctionList.sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(obj.ToString()));
                            break;
                    }
                    break;
@@ -352,7 +353,7 @@
        /// </summary>
        public void DownloadFunctionList()
        {
            new System.Threading.Thread(() =>
            new Thread(() =>
            {
                var pm = new HttpServerRequest();
                var pack = pm.GetDeviceList();
@@ -361,42 +362,50 @@
                    var deviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(pack.Data.ToString());
                    if (deviceList != null)
                    {
                        foreach (var function in deviceList.list)
                        ////将下载到到数据全部保存
                        //new Thread(() => {
                        //    foreach (var temp in deviceList.list)
                        //    {
                        //        temp.SaveFunctionData();
                        //    }
                        //})
                        //{ IsBackground = true }.Start();
                        for (int i =0;i < List.GetAllDeviceFunctionList().Count;)
                        {
                            var localFunction = DB_ResidenceData.functionList.GetAllDeviceFunctionList().Find((obj) => obj.deviceId == function.deviceId);
                            if (localFunction != null)
                            var localFunction = List.GetAllDeviceFunctionList()[0];
                            var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId);
                            if (newFunction == null)//如果云端最新数据没有该条数据，则本地需要删掉该数据记录
                            {
                                if (localFunction.modifyTime != function.modifyTime)
                                {
                                    localFunction.name = function.name;
                                    localFunction.collect = function.collect;
                                    localFunction.modifyTime = function.modifyTime;
                                    localFunction.createTime = function.createTime;
                                    localFunction.roomIds = function.roomIds;
                                    localFunction.bus_Data = function.bus_Data;
                                }
                                localFunction.SaveFunctionData();
                                List.DeleteFunction(localFunction);
                            }
                            else
                            {
                                function.SaveFunctionData();
                                List.IniFunctionList(function.savePath);
                                i++;
                                if (localFunction.modifyTime != newFunction.modifyTime)
                                {
                                    localFunction.name = newFunction.name;
                                    localFunction.collect = newFunction.collect;
                                    localFunction.modifyTime = newFunction.modifyTime;
                                    localFunction.roomIds = newFunction.roomIds;
                                    localFunction.bus_Data = newFunction.bus_Data;
                                    localFunction.SaveFunctionData(false);
                                }
                                deviceList.list.Remove(newFunction);//操作完的数据清理掉，剩下的就是新增的功能
                            }

                            var funcitonInfoPack = pm.GetDeviceInfoList(new List<string>() { function.deviceId });
                            var funcitonInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(funcitonInfoPack.Data.ToString());
                            if (funcitonInfo != null)
                            {

                            }
                        }
                        //处理剩下的新增功能
                        foreach (var newFunction in deviceList.list)
                        {
                            newFunction.SaveFunctionData(false);
                            List.IniFunctionList(newFunction.savePath);
                        }
                    }
                    MainPage.Log($"读取云端设备数据:\r\n{ pack.Data.ToString()}");
                }else
                }
                else
                {
                    MainPage.Log($"读取云端设备数据失败:\r\nCode:{pack.Code};  Msg:{pack.message}");
                }

            })
            { IsBackground = true }.Start();
        }
@@ -406,18 +415,56 @@
        /// </summary>
        public void DownloadSceneList()
        {
            new System.Threading.Thread(() =>
            new Thread(() =>
            {
                var pm = new HttpServerRequest();
                var pack = pm.GetSceneList();
                if(pack.Code == StateCode.SUCCESS)
                {

                    MainPage.Log($"读取云端场景数据:\r\n{pack.Data.ToString()}");
                    var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
                    if (sceneList != null)
                    {
                        ////将下载到到数据全部保存
                        //new Thread(() => {
                        //    foreach (var temp in sceneList)
                        //    {
                        //        temp.SaveSceneData();
                        //    }
                        //})
                        //{ IsBackground = true }.Start();
                        for(int i=0;i<List.scenes.Count;)
                        {
                            var localScene = List.scenes[i];
                            var newScene = sceneList.Find((obj) => obj.userSceneId == localScene.userSceneId);
                            if (newScene == null)//如果云端最新数据没有该条数据，则本地需要删掉该数据记录
                            {
                                List.DeleteScene(localScene,false);
                            }
                            else
                            {
                                i++;
                                if (localScene.modifyTime != newScene.modifyTime)
                                {
                                    localScene.name = newScene.name;
                                    localScene.collect = newScene.collect;
                                    localScene.modifyTime = newScene.modifyTime;
                                    localScene.roomIds = newScene.roomIds;
                                    localScene.SaveSceneData(false);
                                }
                                sceneList.Remove(newScene);//操作完的数据清理掉，剩下的就是新增的功能
                            }
                        }
                        //处理剩下的新增功能
                        foreach (var newScene in sceneList)
                        {
                            newScene.SaveSceneData(false);
                            List.scenes.Add(newScene);
                        }
                    }
                }
                else
                {

                    MainPage.Log($"读取云端场景数据失败:\r\nCode:{pack.Code};  Msg:{pack.message}");
                }
            })
@@ -443,10 +490,121 @@
        /// <summary>
        /// 删除场景
        /// </summary>
        public void DeleteScene(Scene scene)
        public void DeleteScene(Scene scene,bool upSevser)
        {
            scene.DeleteSign = true;
            List.scenes.Remove(scene);
            if (upSevser)
            {
                var pm = new HttpServerRequest();
                var packCode = pm.DeleteScene(scene.userSceneId);
                if (packCode == StateCode.SUCCESS)
                {
                    FileUtils.DeleteFile(scene.savePath);
                    List.scenes.Remove(scene);
                }
                else
                {
                    Utlis.ShowTip(Shared.Language.StringByID(StringId.DeleteSceneFail) + "Code:" + packCode);
                }
            }
            else
            {
                FileUtils.DeleteFile(scene.savePath);
                List.scenes.Remove(scene);
            }
        }
        /// <summary>
        /// 删除本地功能文件
        /// </summary>
        public void DeleteFunction(Function delTemp)
        {
            switch (delTemp.spk)
            {
                case SPK.LightSwitch:
                case SPK.LightDimming:
                case SPK.LightRGB:
                case SPK.LightRGBW:
                case SPK.LightCCT:
                    _FunctionList.lights.Remove(_FunctionList.lights.Find((obj) => obj.deviceId == delTemp.deviceId));
                    break;
                case SPK.CurtainRoller:
                case SPK.CurtainShades:
                case SPK.CurtainSwitch:
                case SPK.CurtainTrietex:
                    _FunctionList.curtains.Remove(_FunctionList.curtains.Find((obj) => obj.deviceId == delTemp.deviceId));
                    break;
                case SPK.AcStandard:
                    _FunctionList.aCs.Remove(_FunctionList.aCs.Find((obj) => obj.deviceId == delTemp.deviceId));
                    break;
                case SPK.FloorHeatStandard:
                    _FunctionList.floorHeatings.Remove(_FunctionList.floorHeatings.Find((obj) => obj.deviceId == delTemp.deviceId));
                    break;
                case SPK.SensorPm25:
                case SPK.SensorCO2:
                case SPK.SensorTVOC:
                case SPK.SensorTemperature:
                case SPK.SensorHumidity:
                    _FunctionList.sensorsEnvironmentalScience.Remove(_FunctionList.sensorsEnvironmentalScience.Find((obj) => obj.deviceId == delTemp.deviceId));
                    break;
                case SPK.ElectricSocket:
                    _FunctionList.switchSockets.Remove(_FunctionList.switchSockets.Find((obj) => obj.deviceId == delTemp.deviceId));
                    break;
                case SPK.ElectricTV:
                    _FunctionList.tVs.Remove(_FunctionList.tVs.Find((obj) => obj.deviceId == delTemp.deviceId));
                    break;
                case SPK.ElectricFan:
                    _FunctionList.fans.Remove(_FunctionList.fans.Find((obj) => obj.deviceId == delTemp.deviceId));
                    break;
            }
            FileUtils.DeleteFile(delTemp.savePath);
        }

        bool lockReadFunctionStatus = false;
        /// <summary>
        /// 读取全部功能的状态
        /// </summary>
        public void ReadAllFunctionStatus()
        {
            if (lockReadFunctionStatus)
            {
                MainPage.Log($"多次进入--返回");
                return;
            }
            new Thread(() =>
            {
                if (lockReadFunctionStatus)
                {
                    MainPage.Log($"多次进入--返回");
                    return;
                }
                MainPage.Log($"进入--读取");
                lockReadFunctionStatus = true;
                try
                {
                    foreach (var function in GetAllDeviceFunctionList())
                    {
                        switch (function.functionCategory)
                        {
                            case FunctionCategory.Light:
                            case FunctionCategory.Electrical:
                            case FunctionCategory.SwitchDevice:
                            case FunctionCategory.Curtain:
                            case FunctionCategory.Thermostat:
                                DriverLayer.Control.Ins.SendReadCommand(function);
                                break;
                        }
                    }
                }
                catch (Exception ex)
                {
                    MainPage.Log($"Refresh Residence Function Status Error : {ex.Message}");
                }
                finally
                {
                    lockReadFunctionStatus = false;
                    MainPage.Log($"结束--读取");
                }
            })
            { IsBackground = true }.Start();
        }

    }