20201216-4

wei

2020-12-16 dcf60777c9346ff058f06298d03173f0c53d1902

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -77,7 +77,12 @@
                    if (value)
                    {
                        MainPage.Log($"网关在线，刷新设备状态");
                        FunctionList.List.ReadAllFunctionStatus();
                        new System.Threading.Thread(() =>
                        {
                            System.Threading.Thread.Sleep(1000);
                            FunctionList.List.ReadAllFunctionStatus();
                        })
                        { IsBackground = true, Priority = System.Threading.ThreadPriority.AboveNormal }.Start();
                    }
                }
            }
@@ -183,18 +188,18 @@
        /// </summary>
        public void SearchLoaclGateway()
        {
            OpenUdp(DB_ResidenceData.residenceData.GatewayType == 0 ? 6000 : 8585);
            OpenUdp(DB_ResidenceData.Instance.GatewayType == 0 ? 6000 : 8585);
            new System.Threading.Thread(() =>
            {
                for (int i = 0; i < 5; i++)
                {
                    if (GatewayOnline)
                        break;
                    if (DB_ResidenceData.residenceData.GatewayType == 0)
                    if (DB_ResidenceData.Instance.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)
                    else if (DB_ResidenceData.Instance.GatewayType == 1)
                    {
                        myUdp.SearchLocalGateway();
                    }
@@ -214,13 +219,16 @@
        /// </summary>
        public void ControlScene(Scene scene)
        {
            if(myUdp!=null)
            {
                myUdp.ControlBusScenes(scene);
            }
            if(myTcpClient!= null)
            if (Ins.IsRemote || DB_ResidenceData.Instance.GatewayType == 1)
            {
                ControlAProtocolScene(scene);
            }
            else
            {
                if (DB_ResidenceData.Instance.GatewayType == 0)
                {
                    myUdp.ControlBusScenes(scene);
                }
            }
        }

@@ -245,13 +253,13 @@
                var actionObjs = new List<ApiAlinkControlActionObj>();
                actionObjs.Add(apiControlData);
                var pack = httpServer.ControlDevice(actionObjs);
                MainPage.Log($"{pack.Code}:{pack.Data}");
                //MainPage.Log($"{pack.Code}:{pack.Data}");
            }
            //本地通讯
            else
            {
                //Bus控制
                if (DB_ResidenceData.residenceData.GatewayType == 0)
                if (DB_ResidenceData.Instance.GatewayType == 0)
                {
                    try
                    {
@@ -273,7 +281,7 @@
                        var functionControlDataObj = function.GetGatewayAlinkControlData(commandDictionary);
                        var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(functionControlDataObj);
                        var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlFunctionTopic, functionControlDataJson);
                        myUdp.SendLocalHdlLinkData(sendBytes);
                        Ins.myUdp.SendLocalHdlLinkData(sendBytes);
                    }
                }
            }
@@ -299,7 +307,7 @@
            }
            else
            {
                if (DB_ResidenceData.residenceData.GatewayType == 0)
                if (DB_ResidenceData.Instance.GatewayType == 0)
                {
                    try
                    {
@@ -347,15 +355,33 @@
        //}

        /// <summary>
        /// 控制a协议场景
        /// a协议控制场景
        /// </summary>
        /// <param name="scene"></param>
        static void ControlAProtocolScene(Scene scene)
        {
            var sendSidObj = new AProtocolSendingObject();
            sendSidObj.time_stamp = "";
            sendSidObj.type = "device_sid";
            sendSidObj.command = "get_list_response";
            if (Ins.IsRemote)
            {
                var pm = new HDL_ON.DAL.Server.HttpServerRequest();
                pm.ExecuteScene(scene.userSceneId);
            }
            else
            {
                Dictionary<string, string> keys = new Dictionary<string, string>();
                keys.Add("sid", scene.sid);
                var aLinkData = new AlinkReadFunctionStatusObj()
                {
                    id = Ins.msg_id.ToString(),
                    objects = new List<Dictionary<string, string>>()
                        {
                            keys
                        },
                    time_stamp = Utlis.GetTimestamp()
                };
                var aLinkJson = Newtonsoft.Json.JsonConvert.SerializeObject(aLinkData);
                var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlScene, aLinkJson);
                Ins.myUdp.SendLocalHdlLinkData(sendBytes);
            }
        }
        /// <summary>
        /// 转换通讯数据
@@ -394,7 +420,7 @@
            if (res.Length == 2)
            {
                var topics = res[0].Split("\r\n");
                MainPage.Log(res[1]);
                //MainPage.Log(res[1]);
                foreach (var ts in topics)
                {
                    var key = ts.Split(":");
@@ -424,7 +450,7 @@
                if (receiveObj.Topic == CommunicationTopic.SearchLoaclGatewayReply)
                {
                    var device = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceModule>(bodyJObj.objects.ToString());
                    if (device.device_mac == DB_ResidenceData.residenceData.residenceGatewayMAC)
                    if (device.device_mac == DB_ResidenceData.Instance.residenceGatewayMAC)
                    {
                        Ins.GatewayOnline = true;
                        if(!string.IsNullOrEmpty( device.gatewayId))
@@ -456,6 +482,11 @@
        public void UpdataFunctionStatus(string revString)
        {
            MainPage.Log($"A协议更新状态:{revString}");
            if(Control.Ins.myUdp!= null)
            {
                //重置重启udp判断调整
                Ins.myUdp.controlLostCount = 0;
            }
            var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<AlinkFunctionStatusObj>(revString);
            if (temp != null)
            {
@@ -464,7 +495,7 @@
                {
                    try
                    {
                        bool hadChange = false;//状态有变化再更新界面
                        //bool hadChange = false;//状态有变化再更新界面
                        var updataObj = allLocalFuntion.Find((obj) => obj.sid == updateTemp.sid);
                        if (updataObj != null)
                        {
@@ -479,14 +510,15 @@
                                            continue;
                                        }
                                        locatAttr.curValue = attr.value;
                                        hadChange = true;
                                        //hadChange = true;
                                    }
                                }
                            }
                            if (!hadChange)//状态有变化再更新界面
                            {
                                continue;
                            }
                            //2020-12-13 如果控制时，立即更新界面即状态，收到数据不用在处理，目前只修改设备状态，界面没有更新，还是需要接收数据更新
                            //if (!hadChange)//状态有变化再更新界面
                            //{
                            //    continue;
                            //}
                            //更新界面状态
                            switch (updataObj.spk)
                            {