Merge branch 'WJC'

wxr

2020-12-07 64dbbfe1d6488635e160189a704afccffc7d34d0

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -70,6 +70,7 @@
                _gatewayOnline = value;
                //修改主页连接状态
                UI.HomePage.LoadEvent_CheckLinkStatus();
                FunctionList.List.ReadAllFunctionStatus();
            }
        }
        /// <summary>
@@ -228,7 +229,7 @@
            function.refreshTime = DateTime.Now;
            DAL.Server.HttpServerRequest httpServer = new DAL.Server.HttpServerRequest();
            //远程通讯
            if (!Ins.IsRemote)
            if (Ins.IsRemote || true) 
            {
                //ALink控制、Bus控制使用同一个接口控制，由云端负责解析
                var apiControlData = function.GetApiControlData(commandDictionary);
@@ -240,7 +241,7 @@
            //本地通讯
            else
            {
                //ALink控制
                //Bus控制
                if (DB_ResidenceData.residenceData.GatewayType == 0)
                {
                    try
@@ -255,7 +256,7 @@
                        MainPage.Log($"发送数据异常: {ex.Message}");
                    }
                }
                //Bus控制
                //ALink控制
                else
                {
                    if (myUdp != null)
@@ -264,7 +265,6 @@
                        var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(functionControlDataObj);
                        var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlFunctionTopic, functionControlDataJson);
                        myUdp.SendLocalHdlLinkData(sendBytes);
                        //MainPage.Log($"发送本地HDL-Link数据{functionControlDataJson}\r\n");
                    }
                }
            }
@@ -277,25 +277,58 @@
        public void SendReadCommand(Function function)
        {
            function.refreshTime = DateTime.Now;
            if (function.bus_Data != null)
            if (Ins.IsRemote)
            {
                try
                {
                    //ReadBusData(function);
                }
                catch (Exception ex)
                {
                    MainPage.Log($"发送数据异常: {ex.Message}");
                }

            }
            else
            {
                //var commandObj = function.GetSendJObject(CommandType_A.read);
                //var commandString = Newtonsoft.Json.JsonConvert.SerializeObject(commandObj);
                //var commandBytes = System.Text.Encoding.UTF8.GetBytes(commandString);
                //MqttCommon.MqttRemoteSend(commandBytes);
                if (function.bus_Data != null)
                {
                    try
                    {
                        Ins.myUdp.ReadBusData(function);
                    }
                    catch (Exception ex)
                    {
                        MainPage.Log($"发送数据异常: {ex.Message}");
                    }
                }
                else
                {
                    var readKey = new Dictionary<string, string>();
                    readKey.Add("sid", function.sid);

                    var readDataObj = new GatewayAlinkReadObj()
                    {
                        id = Ins.msg_id.ToString(),
                        objects = new List<Dictionary<string, string>>()
                        {
                            readKey
                        },
                         //time_stamp = 
                    };
                    var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(readDataObj);
                    var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ReadStatus, functionControlDataJson);
                    Ins.myUdp.SendLocalHdlLinkData(sendBytes);
                }
            }
        }
        /// <summary>
        /// 发送A协议读取命令
        /// </summary>
        public void SendReadCommand(List<Dictionary<string, string>> keyValuePairs)
        {
            var readDataObj = new GatewayAlinkReadObj()
            {
                id = Ins.msg_id.ToString(),
                objects = keyValuePairs,
                //time_stamp = 
            };
            var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(readDataObj);
            var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ReadStatus, functionControlDataJson);
            Ins.myUdp.SendLocalHdlLinkData(sendBytes);
        }

        /// <summary>
        /// 控制a协议场景