2021-08-05 1.更新

JLChen

2021-08-05 ba275a7b58e56c61820ffccc86571447b2997e52

 HDL_ON/Entity/FunctionList.cs

@@ -101,6 +101,7 @@
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }
    
      
        /// <summary>
        /// 红外宝列表
        /// </summary>
@@ -127,7 +128,7 @@
        public List<Function> GetEnvirSensorsList()
        {
            var spkList = SPK.EnvironSpkList();
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));

            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }
        /// <summary>
        /// 安防设备列表
@@ -139,9 +140,10 @@
        }

        /// <summary>
        /// 可视对讲列表
        /// 可视对讲列表,当为null或size为0则不显示可视对讲icon
        /// </summary>
        public UI.UI2.FuntionControlView.Video.VideoClouds videoIntercom;
        // public UI.UI2.FuntionControlView.Video.VideoClouds videoIntercom;
        public List<UI.UI2.FuntionControlView.Video.Video> videoIntercom = new List<UI.UI2.FuntionControlView.Video.Video>();

        List<Function> _OtherBrandFunction;
        /// <summary>
@@ -199,23 +201,23 @@
                //{
                //    UI.Music.A31MusicModel.A31MusicModelList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<UI.Music.A31MusicModel>(functionDataString));
                //}
                if (checkRepeat == true)

                {

                    //检测重复

                    for (int i = 0; i < Functions.Count; i++)

                    {

                        if (Functions[i].deviceId == tempFunction.deviceId)

                        {

                            //先移除掉再加

                            Functions.RemoveAt(i);

                            Functions.Add(tempFunction);

                            return;

                        }

                    }

                if (checkRepeat == true)
                {
                    //检测重复
                    for (int i = 0; i < Functions.Count; i++)
                    {
                        if (Functions[i].deviceId == tempFunction.deviceId)
                        {
                            //先移除掉再加
                            Functions.RemoveAt(i);
                            Functions.Add(tempFunction);
                            return;
                        }
                    }
                }
                Functions.Add(tempFunction);
            }
            else if (filePath.StartsWith("SceneData_"))
            if (filePath.StartsWith("SceneData_"))
            {
                var sceneDataBytes = FileUtlis.Files.ReadFile(filePath);
                var sceneDataString = System.Text.Encoding.UTF8.GetString(sceneDataBytes);
@@ -346,6 +348,7 @@
                List.scenes.Remove(scene);
            }
        }

        /// <summary>
        /// 删除本地功能及文件
        /// </summary>
@@ -463,6 +466,7 @@
            })
            { IsBackground = true }.Start();
        }

        #region 场景相关
        /// <summary>
        /// 添加场景
@@ -474,11 +478,20 @@
            var revPack = pm.AddScene(scene);
            if (revPack.Code == StateCode.SUCCESS)
            {
                var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(revPack.Data.ToString());
                tempScene = sceneList.Find((obj) => obj.sid == scene.sid);
                var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(tempScene));
                FileUtlis.Files.WriteFileByBytes(scene.savePath, ssd);
                result = tempScene;
                if (MainPage.NoLoginMode)
                {
                    var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(scene));
                    FileUtlis.Files.WriteFileByBytes(scene.savePath, ssd);
                    result = scene;
                }
                else
                {
                    var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(revPack.Data.ToString());
                    tempScene = sceneList.Find((obj) => obj.sid == scene.sid);
                    var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(tempScene));
                    FileUtlis.Files.WriteFileByBytes(scene.savePath, ssd);
                    result = tempScene;
                }
            }
            else
            {