Merge remote-tracking branch 'origin/CJL' into NewFilePath

wei

2020-12-12 86b4742e122bb3ff19f8b61574b4bbf8e5db4b11

 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