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

wei

2020-12-23 35c4bc03ee8da50317cd3f33e9f52f0a4259affd

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -225,8 +225,6 @@
                        //本地搜索不到网关
                        if (!Ins.IsRemote)
                        {
                            //连接mqtt前，先断开--2020-12-21
                            DAL.Mqtt.MqttClient.DisConnectRemote();
                            Ins.IsRemote = true;
                            DAL.Mqtt.MqttClient.InitState();
                        }
@@ -243,7 +241,11 @@
        {
            if (Ins.IsRemote || DB_ResidenceData.Instance.GatewayType == 1)
            {
                ControlAProtocolScene(scene);
                new System.Threading.Thread(() =>
                {
                    ControlAProtocolScene(scene);
                })
                { IsBackground = true }.Start();
            }
            else
            {
@@ -264,7 +266,7 @@
        /// <returns></returns>
        public void SendWriteCommand(Function function, Dictionary<string, string> commandDictionary)
        {
            function.usageCount++;
            function.controlCounter++;
            function.refreshTime = DateTime.Now;

            //如果是控制调光的开时，亮度值不能为0