Revert "1"

wxr

2021-07-01 43b0d5870d528f23ecd6aeceb6cfd4325188b46f

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Text;
using HDL_ON.Entity;
@@ -25,6 +25,8 @@

    public class Control
    {
       

        static Control _control;
        public static Control Ins
        {
@@ -48,36 +50,41 @@
                return _msg_id++;
            }
        }
        /// <summary>
        /// 获取13位时间戳
        /// </summary>
        /// <returns></returns>
        public string Get_TimeStamp()
        {
            long t = DateTime.Now.Ticks / 10000;
            return t.ToString();
        }
        ///// <summary>
        ///// 获取13位时间戳
        ///// </summary>
        ///// <returns></returns>
        //public string Get_TimeStamp()
        //{
        //    long t = DateTime.Now.Ticks / 10000;
        //    return t.ToString();
        //}

        bool _gatewayOnline = false;
        /// <summary>
        /// 网关是否在线
        /// 是否搜索本地网关成功
        /// </summary>
        public bool GatewayOnline
        public bool IsSearchLocalGatewaySuccessful = false;
      
        bool _GatewayOnline_Local = false;
        /// <summary>
        /// 网关在线-局域网
        /// </summary>
        public bool GatewayOnline_Local
        {
            get
            {
                return _gatewayOnline;
                return _GatewayOnline_Local;
            }
            set
            {
                if (_gatewayOnline != value)
                if (_GatewayOnline_Local != value)
                {
                    _gatewayOnline = value;
                    //修改主页连接状态
                    UI.HomePage.LoadEvent_CheckLinkStatus();
                    _GatewayOnline_Local = value;
                    if (value)
                    {
                        MainPage.Log($"网关在线，刷新设备状态");
                        //修改主页连接状态
                        HomePage.LoadEvent_CheckLinkStatus();
                        MainPage.Log($"网关局域网在线，刷新设备状态");
                        new System.Threading.Thread(() =>
                        {
                            System.Threading.Thread.Sleep(1000);
@@ -85,31 +92,79 @@
                        })
                        { IsBackground = true, Priority = System.Threading.ThreadPriority.AboveNormal }.Start();
                    }
                    else
                    {
                        //修改主页连接状态
                        HomePage.LoadEvent_CheckLinkStatus();
                    }
                }
            }
        }
        bool _GatewayOnline_Cloud = false;
        /// <summary>
        /// 网关在线-云端
        /// </summary>
        public bool GatewayOnline_Cloud
        {
            get
            {
                return _GatewayOnline_Cloud;
            }
            set
            {
                if (_GatewayOnline_Cloud != value)
                {
                    _GatewayOnline_Cloud = value;
                    if(GatewayOnline_Local)
                    {
                        return;
                    }
                    if (value)
                    {
                        if (DB_ResidenceData.Instance.HomeGateway == null)
                        {
                            return;
                        }
                        if (!DB_ResidenceData.Instance.HomeGateway.gatewayStatus)//远程情况下，网关未链接服务器不能修改主页网关状态
                        {
                            new System.Threading.Thread(() =>
                            {
                                System.Threading.Thread.Sleep(3000);
                                var pm = new DAL.Server.HttpServerRequest();
                                pm.GetGatewayInfo();
                            })
                            { IsBackground = true }.Start();
                            return;
                        }
                        //修改主页连接状态
                        HomePage.LoadEvent_CheckLinkStatus();
                        MainPage.Log($"网关云端在线，刷新设备状态");
                        new System.Threading.Thread(() =>
                        {
                            System.Threading.Thread.Sleep(1000);
                            FunctionList.List.ReadAllFunctionStatus();
                        })
                        { IsBackground = true, Priority = System.Threading.ThreadPriority.AboveNormal }.Start();
                    }
                    else
                    {
                        //修改主页连接状态
                        HomePage.LoadEvent_CheckLinkStatus();
                    }
                }
            }
        }


        /// <summary>
        /// 网关通讯ID
        /// </summary>
        public string GatewayId = "";

        bool _isRemote = false;
        /// <summary>
        /// 是否为远程连接
        /// </summary>
        public bool IsRemote
        {
            get
            {
                return _isRemote;
            }
            set
            {
                _isRemote = value;
                //修改主页连接状态
                HomePage.LoadEvent_CheckLinkStatus();
            }
        }
        //public bool IsRemote = false;
        /// <summary>
        /// 通讯地址IP
        /// </summary>
@@ -168,42 +223,58 @@
            }
        }

        ///// <summary>
        ///// 改变通讯方式
        ///// </summary>
        //public void ChangeCommunicationMode(CommunicationMode communicationMode)
        //{
        //    this.communicationMode = communicationMode;
        //}

        /// <summary>
        /// 搜索本地网关列表
        /// </summary>
        public void SearchLoaclGateway()
        {
            OpenUdp(DB_ResidenceData.Instance.GatewayType == 0 ? 6000 : 8585);
            new System.Threading.Thread(() =>
            //2021-01-15 : 住宅没有绑定网关的时候不用搜索，并且不能链接mqtt
            if(DB_ResidenceData.Instance.HomeGateway == null || string.IsNullOrEmpty(DB_ResidenceData.Instance.HomeGateway.gatewayId))
            {
                for (int i = 0; i < 5; i++)
                {
                    if (GatewayOnline)
                        break;
                    if (DB_ResidenceData.Instance.GatewayType == 0)
                    {
                        new Control_Udp().ControlBytesSend(Command.ReadGateway, 255, 255, new byte[] { (byte)new Random().Next(255), (byte)new Random().Next(255) });
                    }
                    else if (DB_ResidenceData.Instance.GatewayType == 1)
                    {
                        new Control_Udp().SearchLocalGateway();
                    }
                    System.Threading.Thread.Sleep(500);
                }
            })
            { IsBackground = true }.Start();
            if (!GatewayOnline)//网关不在线的时候才可尝试远程连接
                return;
            }
            Ins.GatewayOnline_Local = false;
            var ggg = DB_ResidenceData.Instance.GatewayType == 0 ? "一端口" : "A网关";
            var ggg1 = MainPage.InternetStatus == 1 ? "4G" : "wifi";
            MainPage.Log($"搜索网关列表，网关类型:{ggg};网络类型:{ggg1}");
            if (MainPage.InternetStatus == 0)
            {
                Ins.IsRemote = true;
                Ins.GatewayOnline_Cloud = false;
                return;
            }
            else if (MainPage.InternetStatus == 1)
            {
                DAL.Mqtt.MqttClient.InitState();
            }
            else if (MainPage.InternetStatus == 2)
            {
                OpenUdp(DB_ResidenceData.Instance.GatewayType == 0 ? 6000 : 8585);
                //重置搜索网关标志
                IsSearchLocalGatewaySuccessful = false;

                new System.Threading.Thread(() =>
                {
                    for (int i = 0; i < 5; i++)
                    {
                        if (IsSearchLocalGatewaySuccessful)
                        {
                            Ins.GatewayOnline_Local = true;
                            break;
                        }
                        if (DB_ResidenceData.Instance.GatewayType == 0)
                        {
                            new Control_Udp().ControlBytesSend(Command.ReadGateway, 255, 255, new byte[] { (byte)new Random().Next(255), (byte)new Random().Next(255) });
                        }
                        else if (DB_ResidenceData.Instance.GatewayType == 1)
                        {
                            new Control_Udp().SearchLocalGateway();
                        }
                        System.Threading.Thread.Sleep(500);
                    }

                    DAL.Mqtt.MqttClient.InitState();
                })
                { IsBackground = true }.Start();
            }
        }

@@ -212,9 +283,37 @@
        /// </summary>
        public void ControlScene(Scene scene)
        {
            if (Ins.IsRemote || DB_ResidenceData.Instance.GatewayType == 1)
            //体验模式
            if(MainPage.NoLoginMode)
            {
                ControlAProtocolScene(scene);
                foreach(var sceneFunction in scene.functions)
                {
                    var revString = "";
                    var upDataObj = new AlinkFunctionStatusObj();
                    upDataObj.id = "999";
                    upDataObj.objects = new List<AlinkStatusData>();
                    var asd = new AlinkStatusData() { deviceId = sceneFunction.localFunction.deviceId, sid = sceneFunction.sid };
                    var status1 = new List<AttributesStatus>();
                    foreach (var dic in sceneFunction.status)
                    {
                        status1.Add(new AttributesStatus() { key = dic.key, value = dic.value });
                    }
                    asd.status = status1;
                    upDataObj.objects.Add(asd);
                    revString = Newtonsoft.Json.JsonConvert.SerializeObject(upDataObj);
                    UpdataFunctionStatus(revString, null, true);
                }
                return;
            }

            //远程或者控制link网关场景
            if (!Ins.GatewayOnline_Local || DB_ResidenceData.Instance.GatewayType == 1)
            {
                new System.Threading.Thread(() =>
                {
                    ControlAProtocolScene(scene);
                })
                { IsBackground = true }.Start();
            }
            else
            {
@@ -232,14 +331,71 @@
        /// </summary>
        /// <param name="commandString"></param>
        /// <param name="function"></param>
        /// <param name="useRemote">是否直接使用远程发送</param>
        /// <returns></returns>
        public void SendWriteCommand(Function function, Dictionary<string, string> commandDictionary)
        public void SendWriteCommand(Function function, Dictionary<string, string> commandDictionary, bool useRemote = false)
        {
            function.usageCount++;
            function.controlCounter++;
            function.refreshTime = DateTime.Now;

            //远程通讯
            if (Ins.IsRemote)
            //如果是控制调光的开时，亮度值不能为0
            if (commandDictionary.Count > 2)
            {
                if (commandDictionary.ContainsKey(FunctionAttributeKey.OnOff) && commandDictionary.ContainsKey(FunctionAttributeKey.Brightness))
                {
                    if (commandDictionary[FunctionAttributeKey.OnOff] == "on")
                    {
                        if (commandDictionary[FunctionAttributeKey.Brightness] == "0")
                        {
                            commandDictionary[FunctionAttributeKey.Brightness] = "100";
                        }
                    }
                    if (commandDictionary[FunctionAttributeKey.OnOff] == "off")
                    {
                        if (commandDictionary[FunctionAttributeKey.Brightness] != "0")
                        {
                            commandDictionary[FunctionAttributeKey.Brightness] = "0";
                        }
                    }
                }
            }

            ///dome控制
            if (MainPage.NoLoginMode)
            {
                var revString = "";
                var upDataObj = new AlinkFunctionStatusObj();
                upDataObj.id = "999";
                upDataObj.objects = new List<AlinkStatusData>();
                var asd = new AlinkStatusData() { deviceId = function.deviceId, sid = function.sid };
                var status1 = new List<AttributesStatus>();
                foreach (var dic in commandDictionary)
                {
                    status1.Add(new AttributesStatus() { key = dic.Key, value = dic.Value });
                }
                asd.status = status1;
                upDataObj.objects.Add(asd);
                revString = Newtonsoft.Json.JsonConvert.SerializeObject(upDataObj);
                UpdataFunctionStatus(revString, null, true);
                return;
            }


            //MainPage.Log($"发送数据:{Newtonsoft.Json.JsonConvert.SerializeObject(commandDictionary)}");

            ///第三方涂鸦设备统一使用远程控制
            switch (function.spk)
            {
                case SPK.ElectricTuyaAirCleaner:
                case SPK.ElectricTuyaFan:
                case SPK.ElectricTuyaWaterValve:
                case SPK.ElectricTuyaWeepRobot:
                    useRemote = true;
                    break;
            }

            //远程通讯  --涂鸦设备必须需要远程
            if (useRemote == true)
            {
                DAL.Server.HttpServerRequest httpServer = new DAL.Server.HttpServerRequest();
                //ALink控制、Bus控制使用同一个接口控制，由云端负责解析
@@ -247,32 +403,102 @@
                var actionObjs = new List<ApiAlinkControlActionObj>();
                actionObjs.Add(apiControlData);
                var pack = httpServer.ControlDevice(actionObjs);
                //MainPage.Log($"{pack.Code}:{pack.Data}");
            }
            //本地通讯
            else
            {
                //Bus控制
                if (DB_ResidenceData.Instance.GatewayType == 0)
                ////远程通讯
                //if (Ins.GatewayOnline_Local == false && Ins.GatewayOnline_Cloud == true)
                //{
                //    DAL.Server.HttpServerRequest httpServer = new DAL.Server.HttpServerRequest();
                //    //ALink控制、Bus控制使用同一个接口控制，由云端负责解析
                //    var apiControlData = function.GetApiControlData(commandDictionary);
                //    var actionObjs = new List<ApiAlinkControlActionObj>();
                //    actionObjs.Add(apiControlData);
                //    var pack = httpServer.ControlDevice(actionObjs);
                //}
                //本地通讯
                if (Ins.GatewayOnline_Local)
                {
                    try
                    //Bus控制
                    if (DB_ResidenceData.Instance.GatewayType == 0)
                    {
                        new Control_Udp().WriteBusData(function, commandDictionary);
                        try
                        {
                            new Control_Udp().WriteBusData(function, commandDictionary);
                        }
                        catch (Exception ex)
                        {
                            MainPage.Log($"发送数据异常: {ex.Message}");
                        }
                    }
                    catch (Exception ex)
                    //ALink控制
                    else
                    {
                        MainPage.Log($"发送数据异常: {ex.Message}");
                        var functionControlDataObj = function.GetGatewayAlinkControlData(commandDictionary);
                        var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(functionControlDataObj);
                        var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlFunctionTopic, functionControlDataJson);
                        new Control_Udp().SendLocalHdlLinkData(sendBytes, functionControlDataObj.id);
                        MainPage.Log($"本地通讯 发送HDL-Link数据:{functionControlDataJson}");
                    }
                }
                //ALink控制
                //远程通讯
                else
                {
                    var functionControlDataObj = function.GetGatewayAlinkControlData(commandDictionary);
                    var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(functionControlDataObj);
                    var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlFunctionTopic, functionControlDataJson);
                    new Control_Udp().SendLocalHdlLinkData(sendBytes, functionControlDataObj.id);
                    DAL.Server.HttpServerRequest httpServer = new DAL.Server.HttpServerRequest();
                    //ALink控制、Bus控制使用同一个接口控制，由云端负责解析
                    var apiControlData = function.GetApiControlData(commandDictionary);
                    var actionObjs = new List<ApiAlinkControlActionObj>();
                    actionObjs.Add(apiControlData);
                    var pack = httpServer.ControlDevice(actionObjs);
                }

            }
        }
        /// <summary>
        /// 全开全关功能
        /// </summary>
        public void SwtichFunctions(bool open,List<Function> functions)
        {
            //dome模式控制
            if(MainPage.NoLoginMode)
            {
                new System.Threading.Thread(() =>
                {
                    foreach (var temp in functions)
                    {
                        Dictionary<string, string> d1 = new Dictionary<string, string>();
                        d1.Add(FunctionAttributeKey.OnOff, open ? "on" : "off");
                        SendWriteCommand(temp, d1);
                        System.Threading.Thread.Sleep(100);
                    }
                })
                { IsBackground = true }.Start();
                return;
            }

            var count = 0;
            var logString = open ? "打开\r\n" : "关闭\r\n";
            List<ApiAlinkControlActionObj> actionObjs = new List<ApiAlinkControlActionObj>();
            Dictionary<string, string> d = new Dictionary<string, string>();
            d.Add(FunctionAttributeKey.OnOff, open ? "on" : "off");
            var pm = new DAL.Server.HttpServerRequest();
            foreach (var temp in functions)
            {
                logString += temp.spk + ":" + temp.sid + "\r\n";
                var apiControlData = temp.GetApiControlData(d);
                actionObjs.Add(apiControlData);
                count++;
                if (count > 9)
                {
                    var result = pm.ControlDevice(actionObjs);
                    actionObjs = new List<ApiAlinkControlActionObj>();
                    count = 0;
                    MainPage.Log(logString);
                    logString = "";
                }
            }
            var pack = pm.ControlDevice(actionObjs);
            MainPage.Log(logString);
        }

        public void SendApiReadCommand(List<string> functionIds)
@@ -280,67 +506,90 @@
            var pm = new DAL.Server.HttpServerRequest();
            var pack = pm.RefreshDeviceStatus(functionIds);
        }
        /// <summary>
        /// 读取功能详细数据
        /// </summary>
        /// <param name="functionIds"></param>
        public void ReadFunctionsInfo(List<string> functionIds)
        {
            var pm = new DAL.Server.HttpServerRequest();
            var pack = pm.GetDeviceInfoList(functionIds);
            if(pack!= null&& pack.Data!=null)
            {
                //待测试2021-03-04
                var ddd = Newtonsoft.Json.JsonConvert.DeserializeObject<List<AlinkStatusData>>(pack.Data.ToString());
                if(ddd!= null)
                {
                    foreach(var function in ddd)
                    {
                        var temp = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.deviceId == function.deviceId);
                        if(temp!= null)
                        {
                            if (SPK.Get3tySpk(SPK.BrandType.Tuya).Contains(temp.spk))
                            {
                                Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(temp.sid, function.status);
                            }
                        }
                    }
                }
            }
        }

        /// <summary>
        /// 发送读取命令
        /// 自动判断是否为A协议设备
        /// </summary>
        public void SendReadCommand(Function function)
        public void SendReadCommand(Function function ,bool forceRemote = false)
        {
            function.refreshTime = DateTime.Now;
            if (Ins.IsRemote)
            if (forceRemote)
            {
                var pm = new DAL.Server.HttpServerRequest();
                var pack = pm.RefreshDeviceStatus(new List<string>() { function.deviceId });
            }
            else
            {
                if (DB_ResidenceData.Instance.GatewayType == 0)
                if (Ins.GatewayOnline_Local)
                {
                    try

                    if (DB_ResidenceData.Instance.GatewayType == 0)
                    {
                        new Control_Udp().ReadBusData(function);
                        try
                        {
                            new Control_Udp().ReadBusData(function);
                        }
                        catch (Exception ex)
                        {
                            MainPage.Log($"发送数据异常: {ex.Message}");
                        }
                    }
                    catch (Exception ex)
                    else
                    {
                        MainPage.Log($"发送数据异常: {ex.Message}");
                        var readKey = new Dictionary<string, string>();
                        readKey.Add("sid", function.sid);

                        var readDataObj = new AlinkReadFunctionStatusObj()
                        {
                            id = Ins.msg_id.ToString(),
                            objects = new List<Dictionary<string, string>>()
                        {
                            readKey
                        },
                            time_stamp = Utlis.GetTimestamp()
                        };
                        var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(readDataObj);
                        var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ReadStatus, functionControlDataJson);
                        MainPage.Log($"本地通讯 发送HDL-Link数据:{functionControlDataJson}");
                        new Control_Udp().SendLocalHdlLinkData(sendBytes, readDataObj.id);
                    }
                }
                else
                {
                    var readKey = new Dictionary<string, string>();
                    readKey.Add("sid", function.sid);

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

        /// <summary>
        /// a协议控制场景
@@ -348,10 +597,10 @@
        /// <param name="scene"></param>
        static void ControlAProtocolScene(Scene scene)
        {
            if (Ins.IsRemote)
            if (!Ins.GatewayOnline_Local)//网关本地不在线
            {
                var pm = new HDL_ON.DAL.Server.HttpServerRequest();
                pm.ExecuteScene(scene.userSceneId);
                var pm = new DAL.Server.HttpServerRequest();
                var result = pm.ExecuteScene(scene.userSceneId);
            }
            else
            {
@@ -372,7 +621,7 @@
            }
        }
        /// <summary>
        /// 转换通讯数据
        /// 转换发送数据
        /// </summary>
        public byte[] ConvertSendBodyData(string topic, string bodyDataString)
        {
@@ -422,6 +671,10 @@
                            break;
                    }
                }

                MainPage.Log($"局域网信息: {receiveObj.Topic}  : 内容: {res[1]}");


                //验证有效数据长度
                //if (res[1].Length != receiveObj.Length)
                //{
@@ -430,17 +683,20 @@
                //}
                receiveObj.BodyDataString = res[1];

                var bodyJObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(res[1]);
                if (bodyJObj == null)
                {
                    return receiveObj;
                }
                if (receiveObj.Topic == CommunicationTopic.SearchLoaclGatewayReply)
                {
                    var device = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceModule>(bodyJObj.objects.ToString());
                    if (device.device_mac == DB_ResidenceData.Instance.residenceGatewayMAC)
                    var bodyJObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(res[1]);
                    if (bodyJObj == null)
                    {
                        Ins.GatewayOnline = true;
                        return receiveObj;
                    }

                    var device = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceModule>(bodyJObj.objects.ToString());
                    if (device.device_mac.ToUpper() == DB_ResidenceData.Instance.HomeGateway.mac.ToUpper())
                    {
                        MainPage.Log("本地搜索网关成功");
                        Ins.IsSearchLocalGatewaySuccessful = true;
                        Ins.GatewayOnline_Local = true;
                        if (!string.IsNullOrEmpty(device.gatewayId))
                        {
                            Ins.GatewayId = device.gatewayId;
@@ -449,15 +705,20 @@
                        {
                            Ins.GatewayId = device.device_mac;
                        }
                        reportIp = "239.0.168.188";// device.ip_address;
                        Ins.IsRemote = false;
                        reportIp = "239.0.168.188";// device.ip_address;//主播地址也能控制设备
                    }
                }
                else if (receiveObj.Topic == CommunicationTopic.ct.ReadStatus + "_reply" ||
                    receiveObj.Topic == CommunicationTopic.ct.ControlFunctionTopic + "_reply" ||
                    receiveObj.Topic == CommunicationTopic.ct.GatewayUpStatus)
                {
                    //TODO 暂时不传正确的数据上去，如果后面要优化前面这些代码
                    UpdataFunctionStatus(receiveObj.BodyDataString, null);
                }
                else
                {
                    //一些特殊的主题处理(为了执行速度,尽可能的别加耗时的操作)
                    Stan.HdlCloudReceiveLogic.Current.CloudOverallMsgReceiveEx(receiveObj.Topic, receiveObj.BodyDataString);
                }
            }
            return receiveObj;
@@ -468,9 +729,8 @@
        /// A协议数据
        /// </summary>
        /// <param name="updateBytes"></param>
        public void UpdataFunctionStatus(string revString, byte[] usefulBytes)
        public void UpdataFunctionStatus(string revString, byte[] usefulBytes,bool isCloudData = false)
        {
            MainPage.Log($"A协议更新状态:{revString}");
            var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<AlinkFunctionStatusObj>(revString);
            if (temp != null)
            {
@@ -480,278 +740,192 @@
                {
                    try
                    {
                        //bool hadChange = false;//状态有变化再更新界面
                        var localFunction = allLocalFuntion.Find((obj) => obj.sid == updateTemp.sid);
                        if (localFunction != null)

                        if (Ins.GatewayOnline_Local && isCloudData)//本地链接，除了涂鸦设备数据之外的云端数据不处理
                        {
                            //var updateInfoString = $"更新设备:{localFunction.name}";
                            //foreach (var attr in updateTemp.status)
                            //{
                            //    updateInfoString += $"  key:{attr.key};value:{attr.value}";
                            //}
                            //MainPage.Log(updateInfoString);


                            //更新界面状态
                            Function localObj = null;
                            switch (localFunction.spk)
                            if (FunctionList.List.OtherBrandFunction.Count != 0)
                            {
                                case SPK.LightSwitch:
                                    var localSwitch = FunctionList.List.lights.Find((obj) => obj.sid == updateTemp.sid);
                                    if (localSwitch != null)
                                    {
                                        localObj = localSwitch;
                                        foreach (var attr in updateTemp.status)
                                        {
                                            var localAttr = localSwitch.attributes.Find((obj) => obj.key == attr.key);
                                            if (localAttr != null)
                                            {
                                                localAttr.curValue = attr.value;
                                            }
                                        }
                                        MainPage.Log($"{localSwitch.trait_on_off.curValue}: ");
                                        RelayPage.UpdataState(localSwitch);
                                    }
                                    break;
                                case SPK.LightDimming:
                                    var dimming = FunctionList.List.lights.Find((obj) => obj.sid == updateTemp.sid);
                                    if (dimming != null)
                                    {
                                        localObj = dimming;
                                        foreach (var attr in updateTemp.status)
                                        {
                                            var localAttr = dimming.attributes.Find((obj) => obj.key == attr.key);
                                            if (localAttr != null)
                                            {
                                                localAttr.curValue = attr.value;
                                            }
                                        }
                                        dimming.lastState = Language.StringByID(StringId.Brightness) + " : " + dimming.brightness + "%";
                                        DimmerPage.UpdataStates(dimming);
                                    }
                                    break;
                                case SPK.ElectricFan:
                                    var fan = FunctionList.List.fans.Find((obj) => obj.sid == updateTemp.sid);
                                    if (fan != null)
                                    {
                                        localObj = fan;
                                        foreach (var attr in updateTemp.status)
                                        {
                                            var localAttr = fan.attributes.Find((obj) => obj.key == attr.key);
                                            if (localAttr != null)
                                            {
                                                localAttr.curValue = attr.value;
                                            }
                                        }
                                        fan.lastState = Language.StringByID(StringId.Level) + " : " + fan.openLevel;
                                        FanPage.UpdataState(fan);
                                    }
                                    break;
                                case SPK.LightRGB:
                                    var rgb = FunctionList.List.lights.Find((obj) => obj.sid == updateTemp.sid);
                                    if (rgb != null)
                                    {
                                        localObj = rgb;
                                        foreach (var attr in updateTemp.status)
                                        {
                                            var localAttr = rgb.attributes.Find((obj) => obj.key == attr.key);
                                            if (localAttr != null)
                                            {
                                                localAttr.curValue = attr.value;
                                            }
                                        }
                                        rgb.lastState = Language.StringByID(StringId.Brightness) + " : " + rgb.brightness + "%";
                                        RGBPage.UpdataStates(rgb);
                                    }
                                    break;
                                case SPK.LightRGBW:
                                case SPK.LightCCT:
                                    break;
                                case SPK.CurtainSwitch:
                                    var curtain = FunctionList.List.curtains.Find((obj) => obj.sid == updateTemp.sid);
                                    if (curtain != null)
                                    {
                                        localObj = curtain;
                                        foreach (var attr in updateTemp.status)
                                        {
                                            var localAttr = curtain.attributes.Find((obj) => obj.key == attr.key);
                                            if (localAttr != null)
                                            {
                                                localAttr.curValue = attr.value;
                                            }
                                        }
                                        curtain.lastState = curtain.trait_on_off.curValue.ToString() == "on" ? Language.StringByID(StringId.Open) : Language.StringByID(StringId.Close);
                                        CurtainModulePage.UpdataState(curtain);
                                    }
                                    break;
                                case SPK.CurtainTrietex:
                                    var trietex = FunctionList.List.curtains.Find((obj) => obj.sid == updateTemp.sid);
                                    if (trietex != null)
                                    {
                                        localObj = trietex;
                                        foreach (var attr in updateTemp.status)
                                        {
                                            var localAttr = trietex.attributes.Find((obj) => obj.key == attr.key);
                                            if (localAttr != null)
                                            {
                                                localAttr.curValue = attr.value;
                                            }
                                        }
                                        trietex.lastState = Language.StringByID(StringId.Open) + trietex.percent + "%";
                                        MotorCurtainPage.UpdataState(trietex);
                                    }
                                    break;
                                case SPK.CurtainRoller:
                                    var roller = FunctionList.List.curtains.Find((obj) => obj.sid == updateTemp.sid);
                                    if (roller != null)
                                    {
                                        localObj = roller;
                                        foreach (var attr in updateTemp.status)
                                        {
                                            var localAttr = roller.attributes.Find((obj) => obj.key == attr.key);
                                            if (localAttr != null)
                                            {
                                                localAttr.curValue = attr.value;
                                            }
                                        }
                                        roller.lastState = Language.StringByID(StringId.Open) + roller.percent + "%";
                                        RollingShutterPage.UpdataState(roller);
                                    }
                                    break;
                                case SPK.CurtainShades:
                                    break;
                                case SPK.AcStandard:
                                    var ac = FunctionList.List.aCs.Find((obj) => obj.sid == updateTemp.sid);
                                    if (ac != null)
                                    {
                                        localObj = ac;
                                        foreach (var attr in updateTemp.status)
                                        {
                                            var localAttr = ac.attributes.Find((obj) => obj.key == attr.key);
                                            if (localAttr != null)
                                            {
                                                localAttr.curValue = attr.value;
                                            }
                                        }
                                        ac.lastState = "";
                                        switch (ac.trait_mode.curValue.ToString())
                                        {
                                            case "cool":
                                                ac.lastState = Language.StringByID(StringId.Cool);
                                                break;
                                            case "heat":
                                                ac.lastState = Language.StringByID(StringId.Heat);
                                                break;
                                            case "dry":
                                                ac.lastState = Language.StringByID(StringId.Dry);
                                                break;
                                            case "auto":
                                                ac.lastState = Language.StringByID(StringId.Auto);
                                                break;
                                            case "fan":
                                                ac.lastState = Language.StringByID(StringId.AirSupply);
                                                break;
                                        }
                                        switch (ac.trait_fan.curValue.ToString())
                                        {
                                            case "high":
                                                ac.lastState += " " + Language.StringByID(StringId.HighWindSpeed);
                                                break;
                                            case "medium":
                                                ac.lastState += " " + Language.StringByID(StringId.MiddleWindSpeed);
                                                break;
                                            case "low":
                                                ac.lastState += " " + Language.StringByID(StringId.LowWindSpeed);
                                                break;
                                            case "auto":
                                                ac.lastState += " " + Language.StringByID(StringId.Auto);
                                                break;
                                        }
                                        ac.lastState += " " + ac.trait_temp.curValue + ac.tempUnitString;
                                        ACPage.UpdataStates(ac);
                                    }
                                    break;
                                case SPK.FloorHeatStandard:
                                    var fh = FunctionList.List.floorHeatings.Find((obj) => obj.sid == updateTemp.sid);
                                    if (fh != null)
                                    {
                                        localObj = fh;
                                        foreach (var attr in updateTemp.status)
                                        {
                                            var localAttr = fh.attributes.Find((obj) => obj.key == attr.key);
                                            if (localAttr != null)
                                            {
                                                localAttr.curValue = attr.value;
                                            }
                                        }
                                        switch (fh.trait_mode.curValue)
                                        {
                                            case "normal":
                                                fh.lastState = Language.StringByID(StringId.Normal);
                                                break;
                                            case "day":
                                                fh.lastState = Language.StringByID(StringId.Day);
                                                break;
                                            case "night":
                                                fh.lastState = Language.StringByID(StringId.Night);
                                                break;
                                            case "timer":
                                                fh.lastState = Language.StringByID(StringId.Auto);
                                                break;
                                            case "away":
                                                fh.lastState = Language.StringByID(StringId.Away);
                                                break;
                                        }
                                        fh.lastState += " " + fh.trait_temp.curValue + fh.tempUnitString;
                                        FloorHeatingPage.UpdataStates(fh);
                                    }
                                    break;
                                case SPK.SensorPm25:
                                case SPK.SensorCO2:
                                case SPK.SensorTVOC:
                                case SPK.SensorTemperature:
                                case SPK.SensorHumidity:
                                    var sensor = FunctionList.List.sensorsEnvironmentalScience.Find((obj) => obj.sid == updateTemp.sid);
                                    if (sensor != null)
                                    {
                                        localObj = sensor;
                                        foreach (var attr in updateTemp.status)
                                        {
                                            var localAttr = sensor.attributes.Find((obj) => obj.key == attr.key);
                                            if (localAttr != null)
                                            {
                                                localAttr.curValue = attr.value;
                                            }
                                        }
                                        EnvironmentalSciencePage.LoadEvent_UpdataStatus(sensor);
                                    }
                                    break;
                                case SPK.ElectricSocket:
                                    var es = FunctionList.List.switchSockets.Find((obj) => obj.sid == updateTemp.sid);
                                    if (es != null)
                                    {
                                        localObj = es;
                                        foreach (var attr in updateTemp.status)
                                        {
                                            var localAttr = es.attributes.Find((obj) => obj.key == attr.key);
                                            if (localAttr != null)
                                            {
                                                localAttr.curValue = attr.value;
                                            }
                                        }
                                        SocketPage.UpdataState(es);
                                    }
                                    break;
                                case SPK.ElectricTV:
                                    break;
                                default:
                                    break;
                                if (FunctionList.List.OtherBrandFunction.Find((obj) => obj.sid == updateTemp.sid) == null)
                                {
                                    //MainPage.Log($"A协议更新状态:本地链接，除了涂鸦设备数据之外的云端数据不处理...");
                                    return;
                                }
                            }
                            HomePage.UpdataFunctionStates(localObj);
                            RoomPage.UpdataStates(localObj);
                            FunctionPage.UpdataStates(localObj);
                            ClassificationPage.UpdataInfo(localObj);
                        }




                        var localFunction = allLocalFuntion.Find((obj) => obj.sid == updateTemp.sid);
                        if (localFunction == null)
                        {
                            continue;
                        }
                        if (Ins.GatewayOnline_Local && isCloudData)//本地链接，除了涂鸦设备数据之外的云端数据不处理
                        {
                            if (!SPK.Get3tySpk(SPK.BrandType.All3tyBrand).Contains(localFunction.spk))
                            {
                                //MainPage.Log($"A协议更新状态:本地链接，除了涂鸦设备数据之外的云端数据不处理........");
                                return;
                            }
                        }
                        MainPage.Log($"A协议更新状态:{revString}");
                        foreach (var attr in updateTemp.status)
                        {
                            localFunction.time_stamp = temp.time_stamp;
                            localFunction.SetAttrState(attr.key, attr.value);
                        }

                        //更新界面状态
                        Function localObj = null;
                        switch (localFunction.spk)
                        {
                            case SPK.ElectricEnergy:
                                EnergyMainPage.UpdataStatus(localFunction);
                                break;
                            case SPK.LightSwitch:
                                RelayPage.UpdataState(localFunction);
                                break;
                            case SPK.LightDimming:
                                localFunction.lastState = Language.StringByID(StringId.Brightness) + " : " +
                                                        localFunction.GetAttrState(FunctionAttributeKey.Brightness) + "%";
                                DimmerPage.UpdataStates(localFunction);
                                break;
                            case SPK.ElectricFan:
                                localFunction.lastState = Language.StringByID(StringId.Level) + " : " +
                                   localFunction.GetAttrState(FunctionAttributeKey.OpenLevel);
                                FanPage.UpdataState(localFunction);
                                break;
                            case SPK.LightRGB:
                                localFunction.lastState = Language.StringByID(StringId.Brightness) + " : " + localFunction.GetAttrState(FunctionAttributeKey.Brightness) + "%";
                                RGBPage.UpdataStates(localFunction);
                                break;
                            case SPK.LightRGBW:
                                break;
                            case SPK.LightCCT:
                                localFunction.lastState = Language.StringByID(StringId.Brightness) + " : " + localFunction.GetAttrState(FunctionAttributeKey.Brightness) + "%";
                                ColorTureLampPage.UpdataStatus(localFunction);
                                break;
                            case SPK.CurtainSwitch:
                                localFunction.lastState = localFunction.trait_on_off.curValue.ToString() == "on" ? Language.StringByID(StringId.Open) : Language.StringByID(StringId.Close);
                                CurtainModulePage.UpdataState(localFunction);
                                break;
                            case SPK.CurtainTrietex:
                                localFunction.lastState = Language.StringByID(StringId.Open) + localFunction.GetAttrState(FunctionAttributeKey.Percent) + "%";
                                MotorCurtainPage.UpdataState(localFunction);
                                break;
                            case SPK.CurtainRoller:
                                localFunction.lastState = Language.StringByID(StringId.Open) + localFunction.GetAttrState(FunctionAttributeKey.Percent) + "%";
                                RollingShutterPage.UpdataState(localFunction);
                                break;
                            case SPK.CurtainShades:
                                break;
                            case SPK.AcStandard:
                                Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid, updateTemp.status);
                                if (localFunction != null)
                                {
                                    localFunction.lastState = "";
                                    switch (localFunction.GetAttrState(FunctionAttributeKey.Mode))
                                    {
                                        case "cool":
                                            localFunction.lastState = Language.StringByID(StringId.Cool);
                                            break;
                                        case "heat":
                                            localFunction.lastState = Language.StringByID(StringId.Heat);
                                            break;
                                        case "dry":
                                            localFunction.lastState = Language.StringByID(StringId.Dry);
                                            break;
                                        case "auto":
                                            localFunction.lastState = Language.StringByID(StringId.Auto);
                                            break;
                                        case "fan":
                                            localFunction.lastState = Language.StringByID(StringId.AirSupply);
                                            break;
                                    }
                                    switch (localFunction.GetAttrState(FunctionAttributeKey.FanSpeed))
                                    {
                                        case "high":
                                            localFunction.lastState += " " + Language.StringByID(StringId.HighWindSpeed);
                                            break;
                                        case "medium":
                                            localFunction.lastState += " " + Language.StringByID(StringId.MiddleWindSpeed);
                                            break;
                                        case "low":
                                            localFunction.lastState += " " + Language.StringByID(StringId.LowWindSpeed);
                                            break;
                                        case "auto":
                                            localFunction.lastState += " " + Language.StringByID(StringId.Auto);
                                            break;
                                    }
                                    localFunction.lastState += " " + localFunction.GetAttrState(FunctionAttributeKey.SetTemp) + new AC().GetTempUnitString(localFunction);
                                    ACPage.UpdataStates(localFunction);
                                }
                                break;
                            case SPK.FloorHeatStandard:
                                switch (localFunction.GetAttrState(FunctionAttributeKey.Mode))
                                {
                                    case "normal":
                                        localFunction.lastState = Language.StringByID(StringId.Normal);
                                        break;
                                    case "day":
                                        localFunction.lastState = Language.StringByID(StringId.Day);
                                        break;
                                    case "night":
                                        localFunction.lastState = Language.StringByID(StringId.Night);
                                        break;
                                    case "timer":
                                        localFunction.lastState = Language.StringByID(StringId.Auto);
                                        break;
                                    case "away":
                                        localFunction.lastState = Language.StringByID(StringId.Away);
                                        break;
                                }
                                localFunction.lastState += " " + localFunction.GetAttrState(FunctionAttributeKey.SetTemp) + new FloorHeating().GetTempUnitString(localFunction);
                                FloorHeatingPage.UpdataStates(localFunction);
                                break;
                            case SPK.SensorPm25:
                            case SPK.SensorCO2:
                            case SPK.SensorTVOC:
                            case SPK.SensorTemperature:
                            case SPK.SensorHumidity:
                                if(localFunction.spk == SPK.SensorTemperature)
                                {
                                    HomePage.LoadEvent_RefreshEnvirIndoorTemp();
                                }
                                else if (localFunction.spk == SPK.SensorHumidity)
                                {
                                    HomePage.LoadEvent_RefreshEnvirIndoorHumi();
                                }
                                EnvironmentalPage.LoadEvent_UpdataStatus(localFunction);
                                break;
                            case SPK.ElectricSocket:
                                SocketPage.UpdataState(localFunction);
                                break;
                            case SPK.ElectricTV:
                                break;
                            case SPK.ElectricTuyaAirCleaner:
                            case SPK.ElectricTuyaFan:
                            case SPK.ElectricTuyaWeepRobot:
                            case SPK.ElectricTuyaWaterValve:
                            case SPK.SensorPir:
                            case SPK.SensorDoorWindow:
                            case SPK.SensorSmoke:
                            case SPK.SensorWater:
                            case SPK.ClothesHanger:
                            case SPK.AcIr:
                            case SPK.SenesorMegahealth:
                                //设备状态推送
                                //状态更新
                                Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid, updateTemp.status);
                                break;
                        }

                        HomePage.UpdataFunctionStates(localFunction);
                        RoomPage.UpdataStates(localFunction);
                        FunctionPage.UpdataStates(localFunction);
                        ClassificationPage.UpdataInfo(localFunction);

                    }
                    catch (Exception ex)
                    {