20201224-3

wei

2020-12-24 d1af1b8337591363e60c286348501a841138dbb3

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -25,6 +25,8 @@

    public class Control
    {
       

        static Control _control;
        public static Control Ins
        {
@@ -58,6 +60,14 @@
            return t.ToString();
        }

        /// <summary>
        /// 是否搜索本地网关成功
        /// </summary>
        public bool IsSearchLocalGatewaySuccessful = false;
      
        /// <summary>
        /// 
        /// </summary>
        bool _gatewayOnline = false;
        /// <summary>
        /// 网关是否在线
@@ -72,11 +82,23 @@
            {
                if (_gatewayOnline != value)
                {
                    _gatewayOnline = value;
                    //修改主页连接状态
                    UI.HomePage.LoadEvent_CheckLinkStatus();
                    if (value)
                    if(value)
                    {
                        if (IsRemote)//如果是远程
                        {
                            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;
                            }
                        }
                        _gatewayOnline = value;
                        //修改主页连接状态
                        HomePage.LoadEvent_CheckLinkStatus();
                        MainPage.Log($"网关在线，刷新设备状态");
                        new System.Threading.Thread(() =>
                        {
@@ -84,6 +106,12 @@
                            FunctionList.List.ReadAllFunctionStatus();
                        })
                        { IsBackground = true, Priority = System.Threading.ThreadPriority.AboveNormal }.Start();
                    }
                    else
                    {
                        _gatewayOnline = value;
                        //修改主页连接状态
                        HomePage.LoadEvent_CheckLinkStatus();
                    }
                }
            }
@@ -93,23 +121,10 @@
        /// </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 +183,61 @@
            }
        }

        ///// <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(() =>
            var ggg = DB_ResidenceData.Instance.GatewayType == 0 ? "一端口" : "A网关";
            var ggg1 = MainPage.InternetStatus == 1 ? "4G" : "wifi";
            MainPage.Log($"搜索网关列表，网关类型:{ggg};网络类型:{ggg1}");
            if (MainPage.InternetStatus == 0)
            {
                for (int i = 0; i < 5; i++)
                Ins.GatewayOnline = false;
                return;
            }
            else if (MainPage.InternetStatus == 1)
            {
                if (!Ins.IsRemote)
                {
                    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);
                    Ins.IsRemote = true;
                    DAL.Mqtt.MqttClient.InitState();
                }
            })
            { IsBackground = true }.Start();
            if (!GatewayOnline)//网关不在线的时候才可尝试远程连接
            }
            else if (MainPage.InternetStatus == 2)
            {
                Ins.IsRemote = true;
                DAL.Mqtt.MqttClient.InitState();
                OpenUdp(DB_ResidenceData.Instance.GatewayType == 0 ? 6000 : 8585);
                //重置搜索网关标志
                IsSearchLocalGatewaySuccessful = false;

                new System.Threading.Thread(() =>
                {
                    for (int i = 0; i < 5; i++)
                    {
                        if (IsSearchLocalGatewaySuccessful)
                            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);
                    }

                    if (!IsSearchLocalGatewaySuccessful)
                    {
                        //本地搜索不到网关
                        if (!Ins.IsRemote)
                        {
                            Ins.IsRemote = true;
                            DAL.Mqtt.MqttClient.InitState();
                        }
                    }
                })
                { IsBackground = true }.Start();
            }
        }

@@ -214,7 +248,11 @@
        {
            if (Ins.IsRemote || DB_ResidenceData.Instance.GatewayType == 1)
            {
                ControlAProtocolScene(scene);
                new System.Threading.Thread(() =>
                {
                    ControlAProtocolScene(scene);
                })
                { IsBackground = true }.Start();
            }
            else
            {
@@ -235,8 +273,32 @@
        /// <returns></returns>
        public void SendWriteCommand(Function function, Dictionary<string, string> commandDictionary)
        {
            function.usageCount++;
            function.controlCounter++;
            function.refreshTime = DateTime.Now;

            //如果是控制调光的开时，亮度值不能为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";
                        }
                    }
                }
            }

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

            //远程通讯
            if (Ins.IsRemote)
@@ -247,7 +309,6 @@
                var actionObjs = new List<ApiAlinkControlActionObj>();
                actionObjs.Add(apiControlData);
                var pack = httpServer.ControlDevice(actionObjs);
                //MainPage.Log($"{pack.Code}:{pack.Data}");
            }
            //本地通讯
            else
@@ -271,8 +332,38 @@
                    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}");
                }
            }
        }
        /// <summary>
        /// 全开全关功能
        /// </summary>
        public void SwtichFunctions(bool open,List<Function> functions)
        {
            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)
@@ -322,6 +413,7 @@
                    };
                    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);
                }
            }
@@ -350,8 +442,8 @@
        {
            if (Ins.IsRemote)
            {
                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
            {
@@ -382,7 +474,7 @@

            string sendDataString = topicString + lengthString + bodyDataString;
            byte[] sendDataBytes = Encoding.ASCII.GetBytes(sendDataString);
            MainPage.Log($"转换HDL-Link数据\r\n{sendDataString}\r\n");
            //MainPage.Log($"转换HDL-Link数据\r\n{sendDataString}\r\n");

            return sendDataBytes;
        }
@@ -422,6 +514,10 @@
                            break;
                    }
                }

                MainPage.Log($"time 1 :{receiveObj.Topic}");


                //验证有效数据长度
                //if (res[1].Length != receiveObj.Length)
                //{
@@ -440,6 +536,8 @@
                    var device = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceModule>(bodyJObj.objects.ToString());
                    if (device.device_mac == DB_ResidenceData.Instance.residenceGatewayMAC)
                    {
                        MainPage.Log("本地搜索网关成功");
                        Control.Ins.IsSearchLocalGatewaySuccessful = true;
                        Ins.GatewayOnline = true;
                        if (!string.IsNullOrEmpty(device.gatewayId))
                        {
@@ -454,6 +552,7 @@
                    }
                }
                else if (receiveObj.Topic == CommunicationTopic.ct.ReadStatus + "_reply" ||
                    receiveObj.Topic == CommunicationTopic.ct.ControlFunctionTopic + "_reply" ||
                    receiveObj.Topic == CommunicationTopic.ct.GatewayUpStatus)
                {
                    //TODO 暂时不传正确的数据上去，如果后面要优化前面这些代码
@@ -509,7 +608,7 @@
                                                localAttr.curValue = attr.value;
                                            }
                                        }
                                        MainPage.Log($"{localSwitch.trait_on_off.curValue}: ");
                                        //rgb.lastState = Language.StringByID(StringId.Brightness) + " : " + rgb.brightness + "%";
                                        RelayPage.UpdataState(localSwitch);
                                    }
                                    break;
@@ -565,7 +664,23 @@
                                    }
                                    break;
                                case SPK.LightRGBW:
                                case SPK.LightCCT:
                                    break;
                                case SPK.LightCCT:

                                    var lightCCT = FunctionList.List.lights.Find((obj) => obj.sid == updateTemp.sid);
                                    if (lightCCT != null)
                                    {
                                        localObj = lightCCT;
                                        foreach (var attr in updateTemp.status)
                                        {
                                            var localAttr = lightCCT.attributes.Find((obj) => obj.key == attr.key);
                                            if (localAttr != null)
                                            {
                                                localAttr.curValue = attr.value;
                                            }
                                        }
                                        lightCCT.lastState = Language.StringByID(StringId.Brightness) + " : " + lightCCT.brightness + "%";
                                        ColorTureLampPage.UpdataStates(lightCCT);
                                    }
                                    break;
                                case SPK.CurtainSwitch:
                                    var curtain = FunctionList.List.curtains.Find((obj) => obj.sid == updateTemp.sid);