2020-12-14 1.解锁设置问题修复，增加面容ID验证。2.错误码对接增加。

JLChen

2020-12-14 9c8baf7e7e1169ebdf7d5f7ed33ab29dd5fcbf18

 HDL_ON/Entity/FunctionList.cs

@@ -18,7 +18,7 @@
                {
                    _FunctionList = new FunctionList();
                    #region 恢复数据
                    var filePathList = FileUtils.ReadFiles();
                    var filePathList = Common.FileUtlis.Files.ReadFiles();
                    foreach (var filePath in filePathList)
                    {
                        _FunctionList.IniFunctionList(filePath);
@@ -97,7 +97,7 @@
        /// <summary>
        /// 功能列表
        /// </summary>
        List<Function> deviceFunctionList;
        List<Function> deviceFunctionList = new List<Function>();


        /// <summary>
@@ -109,12 +109,12 @@
        {
            if (filePath.StartsWith("FunctionData_"))
            {
                var functionDataBytes = FileUtils.ReadFile(filePath);
                var functionDataBytes = Common.FileUtlis.Files.ReadFile(filePath);
                var functionDataString = System.Text.Encoding.UTF8.GetString(functionDataBytes);
                var tempFunction = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(functionDataString);
                if (tempFunction == null)
                {
                    FileUtils.DeleteFile(filePath);
                    Common.FileUtlis.Files.DeleteFile(filePath);
                    return;
                }
                if (tempFunction.DeleteSign)
@@ -131,19 +131,23 @@
                        case SPK.LightRGBW:
                        case SPK.LightCCT:
                            _FunctionList.lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(functionDataString));
                            deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(functionDataString));
                            break;
                        case SPK.CurtainRoller:
                        case SPK.CurtainShades:
                        case SPK.CurtainSwitch:
                        case SPK.CurtainTrietex:
                            _FunctionList.curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(functionDataString));
                            deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(functionDataString));
                            break;
                        case SPK.AcStandard:
                            _FunctionList.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(functionDataString));
                            deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(functionDataString));
                            break;
                        case SPK.FloorHeatStandard:
                            //恢复地热数据
                            _FunctionList.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(functionDataString));
                            deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(functionDataString));
                            break;
                        case SPK.SensorPm25:
                        case SPK.SensorCO2:
@@ -152,48 +156,41 @@
                        case SPK.SensorHumidity:
                            //恢复环境数据
                            _FunctionList.sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(functionDataString));
                            deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(functionDataString));
                            break;
                        case SPK.ElectricSocket:
                            //恢复插座数据
                            _FunctionList.switchSockets.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(functionDataString));
                            deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(functionDataString));
                            break;
                        case SPK.ElectricTV:
                            //恢复电视数据
                            _FunctionList.tVs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(functionDataString));
                            deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(functionDataString));
                            break;
                        case SPK.ElectricFan:
                            //恢复风扇数据
                            _FunctionList.fans.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString));
                            deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString));
                            break;
                    }
                }
            }
            if (filePath.StartsWith("SceneData_"))
            {
                var sceneDataBytes = FileUtils.ReadFile(filePath);
                var sceneDataBytes = Common.FileUtlis.Files.ReadFile(filePath);
                var sceneDataString = System.Text.Encoding.UTF8.GetString(sceneDataBytes);
                var tempScene = Newtonsoft.Json.JsonConvert.DeserializeObject<Scene>(sceneDataString);
                List.scenes.Add(tempScene);
            }
        }


        /// <summary>
        /// 获取所有功能列表
        /// </summary>
        public List<Function> GetAllFunction()
        {
            var fs = new List<Function>();
            fs.AddRange(GetAllDeviceFunctionList());
            return fs;
        }

        /// <summary>
        /// 获取设备功能列表
        /// </summary>
        public List<Function> GetAllDeviceFunctionList()
        public List<Function> GetDeviceFunctionList()
        {
            //if (deviceFunctionList == null)
            if (deviceFunctionList == null || deviceFunctionList.Count == 0)
            {
                deviceFunctionList = new List<Function>();
                deviceFunctionList.AddRange(aCs);
@@ -217,18 +214,19 @@
        /// <summary>
        /// 清空设备功能列表
        /// </summary>
        public void ClearAllDeviceFunctionList()
        public void Clear()
        {
            aCs = new List<AC>();
            lights = new List<Light>();
            curtains = new List<Curtain>();
            floorHeatings = new List<FloorHeating>();
            tVs = new List<TV>();
            switchSockets = new List<SwitchSocket>();
            fans = new List<Fan>();
            sensorsEnvironmentalScience = new List<Sensor>();
            scenes = new List<Scene>();
            deviceFunctionList = null;
            _FunctionList.aCs = new List<AC>();
            _FunctionList.lights = new List<Light>();
            _FunctionList.curtains = new List<Curtain>();
            _FunctionList.floorHeatings = new List<FloorHeating>();
            _FunctionList.tVs = new List<TV>();
            _FunctionList.switchSockets = new List<SwitchSocket>();
            _FunctionList.fans = new List<Fan>();
            _FunctionList.sensorsEnvironmentalScience = new List<Sensor>();
            _FunctionList.scenes = new List<Scene>();
            _FunctionList.deviceFunctionList = null;
            _FunctionList = null;
        }

        /// <summary>
@@ -242,41 +240,41 @@
            {
                case FunctionType.AC:
                    var sidObj =  Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
                    DB_ResidenceData.functionList.aCs.Add(sidObj);
                    List.aCs.Add(sidObj);
                    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);
                    List.floorHeatings.Add(sidObj1);
                    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);
                    List.lights.Add(sidObj2);
                    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 );
                    List.curtains.Add(sidObj3 );
                    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);
                    List.tVs.Add(sidObj4);
                    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);
                    List.switchSockets.Add(sidObj5);
                    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);
                    List.fans.Add(sidObj6);
                    sidObj6.SaveFunctionData(false);
                    break;
                case FunctionType.CO2:
@@ -285,7 +283,7 @@
                case FunctionType.Temp:
                case FunctionType.Humidity:
                    var sidObj7 =  Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
                    DB_ResidenceData.functionList.sensorsEnvironmentalScience.Add(sidObj7);
                    List.sensorsEnvironmentalScience.Add(sidObj7);
                    sidObj7.SaveFunctionData(false);
                    break;
            }
@@ -349,6 +347,24 @@
        }

        /// <summary>
        /// 功能绑定房间
        /// </summary>
        public string FunctionsBindRooms(List<string> roomIds,List<string> deviceIds)
        {
            var pm = new HttpServerRequest();
            var pack = pm.BindDeviceToRoom(deviceIds, roomIds);
            if(pack.Code == StateCode.SUCCESS)
            {

            }
            else
            {
                Utlis.ShowTip(Shared.Language.StringByID(StringId.EditFunctionInfoFail) + "\r\nCode:" + pack.Code);
            }
            return pack.Code;
        }

        /// <summary>
        /// 下来云端设备数据
        /// </summary>
        public void DownloadFunctionList()
@@ -362,17 +378,9 @@
                    var deviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(pack.Data.ToString());
                    if (deviceList != null)
                    {
                        ////将下载到到数据全部保存
                        //new Thread(() => {
                        //    foreach (var temp in deviceList.list)
                        //    {
                        //        temp.SaveFunctionData();
                        //    }
                        //})
                        //{ IsBackground = true }.Start();
                        for (int i =0;i < List.GetAllDeviceFunctionList().Count;)
                        for (int i =0;i < List.GetDeviceFunctionList().Count;)
                        {
                            var localFunction = List.GetAllDeviceFunctionList()[i];
                            var localFunction = List.GetDeviceFunctionList()[i];
                            var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId);
                            if (newFunction == null)//如果云端最新数据没有该条数据，则本地需要删掉该数据记录
                            {
@@ -383,6 +391,7 @@
                                i++;
                                if (localFunction.modifyTime != newFunction.modifyTime)
                                {
                                    MainPage.Log($"local:{localFunction.modifyTime}\r\n server:{newFunction.modifyTime}");
                                    localFunction.name = newFunction.name;
                                    localFunction.collect = newFunction.collect;
                                    localFunction.modifyTime = newFunction.modifyTime;
@@ -400,7 +409,7 @@
                            List.IniFunctionList(newFunction.savePath);
                        }
                    }
                    MainPage.Log($"读取云端设备数据:\r\n{ pack.Data.ToString()}");
                    //MainPage.Log($"读取云端设备数据:\r\n{ pack.Data.ToString()}");
                }
                else
                {
@@ -421,7 +430,7 @@
                var pack = pm.GetSceneList();
                if(pack.Code == StateCode.SUCCESS)
                {
                    MainPage.Log($"读取云端场景数据:\r\n{pack.Data.ToString()}");
                    //MainPage.Log($"读取云端场景数据:\r\n{pack.Data.ToString()}");
                    var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
                    if (sceneList != null)
                    {
@@ -473,21 +482,6 @@


        /// <summary>
        /// 删除手机存储都所有缓存功能数据
        /// </summary>
        public void DelAllFunctionData()
        {
            var filePathList = FileUtils.ReadFiles();
            foreach (var filePath in filePathList)
            {
                if (filePath.StartsWith("FunctionData_") && filePath.Length == 13 + 28)
                {
                    FileUtils.DeleteFile(filePath);
                }
            }
            _FunctionList = new FunctionList();
        }
        /// <summary>
        /// 删除场景
        /// </summary>
        public void DeleteScene(Scene scene,bool upSevser)
@@ -498,7 +492,7 @@
                var packCode = pm.DeleteScene(scene.userSceneId);
                if (packCode == StateCode.SUCCESS)
                {
                    FileUtils.DeleteFile(scene.savePath);
                    Common.FileUtlis.Files.DeleteFile(scene.savePath);
                    List.scenes.Remove(scene);
                }
                else
@@ -508,7 +502,7 @@
            }
            else
            {
                FileUtils.DeleteFile(scene.savePath);
                Common.FileUtlis.Files.DeleteFile(scene.savePath);
                List.scenes.Remove(scene);
            }
        }
@@ -555,7 +549,12 @@
                    _FunctionList.fans.Remove(_FunctionList.fans.Find((obj) => obj.deviceId == delTemp.deviceId));
                    break;
            }
            FileUtils.DeleteFile(delTemp.savePath);
            var removeTemp = deviceFunctionList.Find((obj) => obj.deviceId == delTemp.deviceId);
            if(removeTemp!= null)
            {
                deviceFunctionList.Remove(removeTemp);
            }
            Common.FileUtlis.Files.DeleteFile(delTemp.savePath);
        }

        bool lockReadFunctionStatus = false;
@@ -580,17 +579,29 @@
                lockReadFunctionStatus = true;
                try
                {
                    foreach (var function in GetAllDeviceFunctionList())
                    if (DriverLayer.Control.Ins.IsRemote)
                    {
                        switch (function.functionCategory)
                        var functionIds = new List<string>();
                        foreach (var function in GetDeviceFunctionList())
                        {
                            case FunctionCategory.Light:
                            case FunctionCategory.Electrical:
                            case FunctionCategory.SwitchDevice:
                            case FunctionCategory.Curtain:
                            case FunctionCategory.Thermostat:
                                DriverLayer.Control.Ins.SendReadCommand(function);
                                break;
                            functionIds.Add(function.deviceId);
                        }
                        DriverLayer.Control.Ins.SendApiReadCommand(functionIds);
                    }
                    else
                    {
                        foreach (var function in GetDeviceFunctionList())
                        {
                            switch (function.functionCategory)
                            {
                                case FunctionCategory.Light:
                                case FunctionCategory.Electrical:
                                case FunctionCategory.SwitchDevice:
                                case FunctionCategory.Curtain:
                                case FunctionCategory.Thermostat:
                                    DriverLayer.Control.Ins.SendReadCommand(function);
                                    break;
                            }
                        }
                    }
                }