2020-12-7-02

陈嘉乐

2020-12-07 56b417e5bcdf4f34ddcda8c7e56fbac6584e615e

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -53,7 +53,7 @@
        public string Get_TimeStamp()
        {
            long t = DateTime.Now.Ticks / 10000;
            return t.ToString(); 
            return t.ToString();
        }

        bool _gatewayOnline = false;
@@ -76,10 +76,28 @@
        /// 网关通讯ID
        /// </summary>
        public string GatewayId;

        bool _isRemote = false;
        /// <summary>
        /// 是否为远程连接
        /// </summary>
        public bool IsRemote = false;
        public bool IsRemote {
            get
            {
                return _isRemote;
            }
            set
            {
                _isRemote = value;
                if(value)
                {
                    DAL.Mqtt.MqttClient.InitState();
                }else
                {
                    DAL.Mqtt.MqttClient.DisConnectRemote();
                }
            }
        }
        /// <summary>
        /// 通讯地址IP
        /// </summary>
@@ -128,7 +146,7 @@
        /// </summary>
        public void CloseUdp()
        {
            if(myUdp!= null)
            if (myUdp != null)
            {
                myUdp = null;
            }
@@ -161,15 +179,24 @@
        public void SearchLoaclGateway()
        {
            OpenUdp(DB_ResidenceData.residenceData.GatewayType == 0 ? 6000 : 8585);

            if (DB_ResidenceData.residenceData.GatewayType == 0)
            new System.Threading.Thread(() =>
            {
                myUdp.ControlBytesSend(Command.ReadGateway, 255, 255, new byte[] { (byte)new Random().Next(255), (byte)new Random().Next(255) });
            }
            else if (DB_ResidenceData.residenceData.GatewayType == 1)
            {
                myUdp.SearchLocalGateway();
            }
                for (int i = 0; i < 5; i++)
                {
                    if (GatewayOnline)
                        break;
                    if (DB_ResidenceData.residenceData.GatewayType == 0)
                    {
                        myUdp.ControlBytesSend(Command.ReadGateway, 255, 255, new byte[] { (byte)new Random().Next(255), (byte)new Random().Next(255) });
                    }
                    else if (DB_ResidenceData.residenceData.GatewayType == 1)
                    {
                        myUdp.SearchLocalGateway();
                    }
                    System.Threading.Thread.Sleep(500);
                }
            })
            { IsBackground = true }.Start();
        }

        /// <summary>
@@ -199,19 +226,16 @@
        {
            function.usageCount++;
            function.refreshTime = DateTime.Now;
            DAL.Server.HttpServerRequest httpServer = new DAL.Server.HttpServerRequest();
            //远程通讯
            if (Ins.IsRemote)
            if (!Ins.IsRemote)
            {
                //ALink控制
                if (DB_ResidenceData.residenceData.GatewayType == 0)
                {

                }
                //Bus控制
                else
                {

                }
                //ALink控制、Bus控制使用同一个接口控制，由云端负责解析
                var apiControlData = function.GetApiControlData(commandDictionary);
                var actionObjs = new List<ApiAlinkControlActionObj>();
                actionObjs.Add(apiControlData);
                var pack = httpServer.ControlDevice(actionObjs);
                MainPage.Log($"{pack.Code}:{pack.Data}");
            }
            //本地通讯
            else
@@ -236,7 +260,7 @@
                {
                    if (myUdp != null)
                    {
                        var functionControlDataObj = function.GetControlSendData(commandDictionary);
                        var functionControlDataObj = function.GetGatewayAlinkControlData(commandDictionary);
                        var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(functionControlDataObj);
                        var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlFunctionTopic, functionControlDataJson);
                        myUdp.SendLocalHdlLinkData(sendBytes);
@@ -357,6 +381,7 @@
                            Ins.GatewayOnline = true;
                            Ins.GatewayId = device.gatewayId;
                            reportIp = "239.0.168.188";// device.ip_address;
                            Ins.IsRemote = false;
                        }
                        break;
                }