Merge branch 'Dev-Branch' into wjc

wjc

2023-08-24 ac8660d2dd439e8074c1760cbe6cc9465a452193

 HDL_ON/Entity/Function/Scene.cs

@@ -151,6 +151,7 @@
        /// 配合豆豆修改云端数据
        /// 调试宝、on pro和平台对应
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public List<SceneImageInfo> OssSceneImages = new List<SceneImageInfo>()
        {
            new SceneImageInfo
@@ -430,6 +431,7 @@
                {
                    var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
                    Common.FileUtlis.Files.WriteFileByBytes(savePath, ssd);
                    return revPack.Code;
                }
                var scenes = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(revPack.Data.ToString());
                var tempScene = scenes.Find((obj) => obj.sid == sid);
@@ -596,8 +598,8 @@
            }
            if (tempState != null)
            {
                sceneFunctionInfo += tempState.GetValueText() + " ";
                sceneFunctionInfo += tempState.GetUintString();
                sceneFunctionInfo += tempState.GetValueText();
                sceneFunctionInfo += tempState.GetUintString() + " ";
            }
            if (fanState != null)
            {