Revert "Merge branch 'CJL-NEW' into NewFilePath"

wxr

2020-12-11 a4f57bf9dda3d52e04f537a2ca24db95761eb888

 HDL_ON/Entity/Function/Function.cs

@@ -114,15 +114,6 @@
        /// 该功能添加到到房间列表
        /// </summary>
        public List<string> roomIds = new List<string>();
        /// <summary>
        /// 绑定房间
        /// </summary>
        public void BindRoom(string roomId)
        {
            roomIds.Add(roomId);
            var pm = new DAL.Server.HttpServerRequest();
            pm.BindDeviceToRoom(deviceId, roomId);
        }

        /// <summary>
        /// bus协议数据格式
@@ -261,7 +252,7 @@
            string roomNameList = "";
            foreach (var roomId in roomIds)
            {
                var findRoom = DB_ResidenceData.residenceData.Rooms.Find(obj => obj.uid == roomId);
                var findRoom = DB_ResidenceData.residenceData.Rooms.Find(obj => obj.roomId == roomId);
                if (findRoom == null)
                {
                    continue;
@@ -302,20 +293,19 @@
                {
                    var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
                    FileUtils.WriteFileByBytes(savePath, ssd);
                    MainPage.Log($"Save FunctionData {this.functionType} : {this.sid}");
                }
                else
                {
                    Utlis.ShowTip(Language.StringByID(StringId.EditFunctionInfoFail) + "Code:" + pack.Code);
                    Utlis.ShowTip(Language.StringByID(StringId.EditFunctionInfoFail) + "\r\nCode:" + pack.Code);
                }
            }
            else
            {
                var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
                FileUtils.WriteFileByBytes(savePath, ssd);
                MainPage.Log($"Save FunctionData {this.functionType} : {this.sid}");
            }
        }
      

        /// <summary>
        /// 转换成场景功能对象