Merge branch 'NewFilePath' into CJL

JLChen

2020-12-12 f2c1e5bf3a67478076fb5bbcf546824b3127db15

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -85,7 +85,7 @@
        /// <summary>
        /// 网关通讯ID
        /// </summary>
        public string GatewayId;
        public string GatewayId ="";

        bool _isRemote = false;
        /// <summary>
@@ -459,7 +459,7 @@
            var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<AlinkFunctionStatusObj>(revString);
            if (temp != null)
            {
                var allLocalFuntion = FunctionList.List.GetAllDeviceFunctionList();
                var allLocalFuntion = FunctionList.List.GetDeviceFunctionList();
                foreach (var updateTemp in temp.objects)
                {
                    try