1127最新合并代码，合并嘉乐更新

wei

2020-11-27 e53a1951d6aa07ad22aad9816da4703496fcbccd

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Text;
using HDL_ON.Entity;

namespace HDL_ON.DriverLayer
@@ -34,6 +35,18 @@
                return _control;
            }
        }
        int _msg_id = 1;
        /// <summary>
        /// 通讯ID
        /// </summary>
        public int msg_id
        {
            get
            {
                return _msg_id++;
            }
        }

        bool _gatewayOnline = false;
        /// <summary>
        /// 网关是否在线
@@ -88,14 +101,14 @@
        /// <summary>
        /// 打开Udp
        /// </summary>
        public void OpenUdp()
        public void OpenUdp(int port)
        {
            if (myUdp == null)
            {
                myUdp = new Control_Udp();
            }

            UdpSocket._BusSocket.Start();
            UdpSocket._BusSocket.Start(port);
        }
        /// <summary>
        /// 打开tcp客服端
@@ -122,7 +135,8 @@
        /// </summary>
        public void SearchLoaclGateway()
        {
            OpenUdp();
            OpenUdp(DB_ResidenceData.residenceData.GatewayType == 0 ? 6000 : 8585);

            if (DB_ResidenceData.residenceData.GatewayType == 0)
            {
                myUdp.ControlBytesSend(Command.ReadGateway, 255, 255, new byte[] { (byte)new Random().Next(255), (byte)new Random().Next(255) });
@@ -224,6 +238,91 @@
            sendSidObj.type = "device_sid";
            sendSidObj.command = "get_list_response";
        }
        /// <summary>
        /// 转换通讯数据
        /// </summary>
        public byte[] ConvertSendBodyData(string topic, string bodyDataString)
        {
            string topicString = "Topic:" + topic + "\r\n";
            byte[] bodyBytes = Encoding.ASCII.GetBytes(bodyDataString);
            string lengthString = "Length:" + bodyBytes.Length.ToString() + "\r\n" + "\r\n";

            string sendDataString = topicString + lengthString + bodyDataString;
            byte[] sendDataBytes = Encoding.ASCII.GetBytes(sendDataString);

            return sendDataBytes;
        }
        /// <summary>
        /// 转换接收到的数据
        /// </summary>
        /// <returns></returns>
        public void ConvertReceiveData(byte[] receiveBytes)
        {
            var reString = Encoding.UTF8.GetString(receiveBytes);
            AnalysisReceiveData(reString);
        }
        /// <summary>
        /// 转换接收到的数据
        /// </summary>
        /// <returns></returns>
        public LocalCommunicationData AnalysisReceiveData(string receiveString)
        {
            LocalCommunicationData receiveObj = new LocalCommunicationData();

            var res = receiveString.Split("\r\n\r\n");

            if (res.Length == 2)
            {
                var topics = res[0].Split("\r\n");
                MainPage.Log(res[1]);
                foreach (var ts in topics)
                {
                    var key = ts.Split(":");
                    switch (key[0])
                    {
                        case "Topic":
                            receiveObj.Topic = key[1];
                            break;
                        case "Length":
                            receiveObj.Length = Convert.ToInt32(key[1]);
                            break;
                    }
                }

                //验证有效数据长度
                if (res[1].Length != receiveObj.Length)
                {
                    MainPage.Log($"收到数据包长度不够");
                    return receiveObj;
                }
                receiveObj.BodyDataString = res[1];

                var bodyJObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(res[1]);
                if (bodyJObj == null)
                {
                    return receiveObj;
                }
                switch (receiveObj.Topic)
                {
                    case CommunicationTopic.SearchLoaclGateway:
                        var device = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceModule>(bodyJObj.objects.ToString());
#if DEBUG
                        if (UserInfo.Current.AccountString == "464027401@qq.com")
                        {
                            DB_ResidenceData.residenceData.residenceGatewayMAC = "0000000000000000";
                        }
#endif
                        if (device.device_mac == DB_ResidenceData.residenceData.residenceGatewayMAC)
                        {
                            Control.Ins.GatewayOnline = true;
                        }
                        break;
                }
            }
            return receiveObj;

        }


    }
}