合并温居城代码

wxr

2021-07-09 2ada6ff2b2db4f10ff6a44333d07a51777c5c4a8

 HDL_ON/Entity/FunctionList.cs

@@ -184,6 +184,7 @@
        /// <para>false:直接无条件添加</para></param>
        public void IniFunctionList(string filePath, bool checkRepeat = false)
        {
            MainPage.Log("初始化功能数据");
            // todo 增加设备，增加功能进功能列表
            if (filePath.StartsWith("FunctionData_"))
            {
@@ -478,11 +479,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
            {