From 6d73bf6e816570291865674bef8bce8972e4de3f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 01 十二月 2021 16:32:57 +0800
Subject: [PATCH] 2021-12-01-01

---
 HDL_ON/DAL/DriverLayer/Control_Udp.cs | 1026 ++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 657 insertions(+), 369 deletions(-)

diff --git a/HDL_ON/DAL/DriverLayer/Control_Udp.cs b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
index 0f458fb..6991ad8 100644
--- a/HDL_ON/DAL/DriverLayer/Control_Udp.cs
+++ b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
@@ -50,8 +50,17 @@
         /// <summary>
         /// 鍙戦�佹暟鎹紝涓嶉渶瑕佺瓑寰呭洖澶�
         /// </summary>
-        public void ControlBytesSend(Command command, byte subnetID, byte deviceID, byte[] gatewayBytes, int sendCount = 3)
+        public void ControlBytesSend(Command command, byte subnetID, byte deviceID, byte[] gatewayBytes, int sendCount = 3,bool reSend = false)
         {
+#if DEBUG
+            string ddd = "";
+            foreach (var bb in gatewayBytes)
+            {
+                ddd += bb + ",";
+            }
+            MainPage.Log($"鍙戦�乥us鍛戒护:" + ((int)command).ToString("X").PadLeft(4,'0') + " : 鏁版嵁:" + ddd);
+#endif
+
             var control = new Control_Udp();
             control.Send(new Target()
             {
@@ -60,7 +69,8 @@
                 SubnetID = subnetID,
                 DeviceID = deviceID,
                 AddData = gatewayBytes,
-            }, sendCount, false);
+            //}, 3, true);
+            }, sendCount, reSend);
         }
 
         /// <summary>
@@ -156,50 +166,411 @@
         /// </summary>
         public void ControlBusScenes(Scene scene)
         {
-            foreach (var f in scene.functions)
+            if(Control.Ins.GatewayOnline_Local)
             {
-                switch (f.localFunction.functionType)
+                foreach (var f in scene.functions)
                 {
-                    case FunctionType.Curtain:
-                        foreach (var attr in f.status)
-                        {
-                            if (attr.key == FunctionAttributeKey.OnOff)
+                    if (f.localFunction == null)
+                    {
+                        continue;
+                    }
+                    switch (f.localFunction.spk)
+                    {
+                        case SPK.CurtainSwitch:
+                            foreach (var attr in f.status)
                             {
-                                byte curtainState = 0;
-                                switch (attr.value)
+                                if (attr.key == FunctionAttributeKey.OnOff)
                                 {
-                                    case "on":
-                                        curtainState = 1;
+                                    byte curtainState = 0;
+                                    switch (attr.value)
+                                    {
+                                        case "on":
+                                            curtainState = 1;
+                                            break;
+                                        case "off":
+                                            curtainState = 2;
+                                            break;
+                                    }
+                                    ControlBytesSend(Command.SetCurtainModelStutas, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID,
+                                        new byte[] { f.localFunction.bus.LoopId, curtainState },0);
+                                    break;
+                                }
+                            }
+                            break;
+                        case SPK.AcStandard:
+                        case SPK.HvacAC:
+                            AC acTemp = new AC();
+                            byte onoff = 0;
+                            byte mode = 0;
+                            byte fan = 0;
+                            foreach (var attr in f.status)
+                            {
+                                byte modeKey = 4;
+                                switch (attr.key)
+                                {
+                                    case FunctionAttributeKey.OnOff:
+                                        if(attr.value == "on")
+                                        {
+                                            onoff = 1;
+                                        }
+                                        else
+                                        {
+                                            onoff = 0;
+                                        }
                                         break;
-                                    case "off":
-                                        curtainState = 2;
+                                    case FunctionAttributeKey.Mode:
+                                        switch (attr.value)
+                                        {
+                                            case "auto":
+                                                mode = 3;
+                                                modeKey = 8;
+                                                break;
+                                            case "cool":
+                                                mode = 0;
+                                                modeKey = 4;
+                                                break;
+                                            case "heat":
+                                                mode = 1;
+                                                modeKey = 7;
+                                                break;
+                                            case "dry":
+                                                mode = 4;
+                                                modeKey = 19;
+                                                break;
+                                            case "fan":
+                                                mode = 2;
+                                                modeKey = 2;
+                                                break;
+                                        }
+                                        break;
+                                    case FunctionAttributeKey.FanSpeed:
+                                        switch (attr.value)
+                                        {
+                                            case "high":
+                                                fan = 1;
+                                                break;
+                                            case "medium":
+                                                fan = 2;
+                                                break;
+                                            case "low":
+                                                fan = 3;
+                                                break;
+                                            case "auto":
+                                                fan = 0;
+                                                break;
+                                            default:
+                                                fan = 0;
+                                                break;
+                                        }
                                         break;
                                 }
-                                ControlBytesSend(Command.SetCurtainModelStutas, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID,
-                                    new byte[] { f.localFunction.bus_Data.loopId, curtainState });
-                                break;
+                                ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] { 3, onoff, f.localFunction.bus.LoopId });
+                                ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] { 6, mode, f.localFunction.bus.LoopId });
+                                ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] { 5, fan, f.localFunction.bus.LoopId });
+                                ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] { modeKey, modeKey, f.localFunction.bus.LoopId });
+                            }
+                            break;
+                        case SPK.LightSwitch:
+                        case SPK.LightDimming:
+                            byte brightness = 0;
+                            foreach (var attr in f.status)
+                            {
+                                switch (attr.key)
+                                {
+                                    case FunctionAttributeKey.OnOff:
+                                        switch (attr.value)
+                                        {
+                                            case "on":
+                                                brightness = 100;
+                                                break;
+                                            case "off":
+                                                brightness = 0;
+                                                break;
+                                        }
+                                        break;
+                                    case FunctionAttributeKey.Brightness:
+                                        brightness = Convert.ToByte(attr.value);
+                                        break;
+                                }
+                            }
+                            ControlBytesSend(Command.SetSingleLight, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID,
+                                new byte[] { f.localFunction.bus.LoopId, brightness, (byte)(f.localFunction.delay / 255), (byte)(f.localFunction.delay % 255) });
+                            break;
+                        case SPK.LightRGB:
+                            break;
+                        case SPK.HvacFloorHeat:case SPK.FloorHeatStandard:
+                            if (f.status.Find((obj)=>obj.key ==FunctionAttributeKey.Mode) == null)
+                            {
+                                foreach (var dic in f.status)
+                                {
+                                    switch (dic.key)
+                                    {
+                                        case FunctionAttributeKey.OnOff:
+                                            ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] { 20, dic.value.ToString() == "on" ? (byte)1 : (byte)0, f.localFunction.bus.LoopId });
+                                            break;
+                                        case "mode":
+                                            ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] { 21, Convert.ToByte(dic.value), f.localFunction.bus.LoopId });
+                                            break;
+                                        case FunctionAttributeKey.SetTemp:
+                                            ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] {
+                                                25, Convert.ToByte(dic.value), f.localFunction.bus.LoopId });
+                                            break;
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                byte onoff_1 = 0;
+                                byte setTemp_1 = 0;
+                                byte mode_1 = 0;
+                                foreach (var attr in f.status)
+                                {
+                                    switch (attr.key)
+                                    {
+                                        case FunctionAttributeKey.OnOff:
+                                            if (attr.value == "on")
+                                            {
+                                                onoff_1 = 1;
+                                            }
+                                            else
+                                            {
+                                                onoff_1 = 0;
+                                            }
+                                            break;
+                                        case FunctionAttributeKey.SetTemp:
+                                            setTemp_1 = Convert.ToByte(attr.value);
+                                            break;
+                                        case FunctionAttributeKey.Mode:
+                                            switch (attr.value)
+                                            {
+                                                case "day":
+                                                    mode_1 = 2;
+                                                    break;
+                                                case "night":
+                                                    mode_1 = 3;
+                                                    break;
+                                                case "away":
+                                                    mode_1 = 4;
+                                                    break;
+                                                case "normal":
+                                                    mode_1 = 1;
+                                                    break;
+                                                case "timer":
+                                                    mode_1 = 5;
+                                                    break;
+                                            }
+                                            break;
+                                    }
+                                }
+                                ControlBytesSend(Command.SetFloorHeat, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] {
+                                f. localFunction.bus.LoopId, onoff_1, 0, setTemp_1, mode_1,  setTemp_1, setTemp_1, setTemp_1, 0, 0 });
+                            }
+                            break;
+                        case SPK.ElectricSocket:
+                        case SPK.PanelSocket:
+                            foreach (var attr in f.status)
+                            {
+                                if (attr.key == FunctionAttributeKey.OnOff)
+                                {
+                                    byte onOffValue = 0;
+                                    switch (attr.value)
+                                    {
+                                        case "on":
+                                            onOffValue = 1;
+                                            break;
+                                        case "off":
+                                            onOffValue = 2;
+                                            break;
+                                    }
+                                    ControlBytesSend(Command.SetSingleLight, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID,
+                                        new byte[] { f.localFunction.bus.LoopId, onOffValue });
+                                    break;
+                                }
+                            }
+                            break;
+                    }
+                }
+            }
+            else
+            {
+                foreach (var f in scene.functions)
+                {
+                    var count = 0;
+                    List<ApiAlinkControlActionObj> actionObjs = new List<ApiAlinkControlActionObj>();
+                    Dictionary<string, string> d = new Dictionary<string, string>();
+                    var pm = new DAL.Server.HttpServerRequest();
+                    foreach (var temp in f.status)
+                    {
+                        if (f.localFunction == null)
+                        {
+                            continue;
+                        }
+                        d.Add(temp.key, temp.value);
+                        var apiControlData = f.localFunction.GetApiControlData(d);
+                        actionObjs.Add(apiControlData);
+                        count++;
+                        if (count > 9)
+                        {
+                            var result = pm.ControlDevice(actionObjs);
+                            actionObjs = new List<ApiAlinkControlActionObj>();
+                            count = 0;
+                        }
+                    }
+                    var pack = pm.ControlDevice(actionObjs);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 鎺у埗bus璁惧
+        /// </summary>
+        /// <param name="commandString"></param>
+        /// <returns></returns>
+        public void WriteBusData(Function function, Dictionary<string, string> commandDictionary, bool reSend = false)
+        {
+            try
+            {
+                var subnetId = function.bus.SubnetID;
+                var deviceId = function.bus.DeviceID;
+                var loopId = function.bus.LoopId;
+
+                switch (function.spk)
+                {
+                    case SPK.LightCCT:
+                        #region cct light
+                        byte b0 = 100;
+                        if (commandDictionary.ContainsKey(FunctionAttributeKey.OnOff))
+                        {
+                            if (function.trait_on_off.curValue.ToString() == "off")
+                            {
+                                b0 = 0;
+                            }
+                            else
+                            {
+                                b0 = function.lastBrightness == 0 ? (byte)100 : Convert.ToByte(function.lastBrightness);
                             }
                         }
-                        break;
-                    case FunctionType.AC:
-                        AC tempAc = new AC();
-                        foreach (var attr in f.status)
+                        else
                         {
-                            byte modeKey = 4;
-                            switch (attr.key)
+                            b0 = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
+                        }
+                        var bytes0 = new byte[] { function.bus.LoopId,
+                                            b0,
+                                            254, 0,Convert.ToByte(function.GetAttrState(FunctionAttributeKey.FadeTime)) ,2,
+                                            (byte)(Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.CCT))/256),
+                                            (byte)(Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.CCT))%256),
+                                            0,
+                                            0,0};
+                        ControlBytesSend(Command.SetLogicLoopColor, subnetId, deviceId, bytes0, 1);
+                        #endregion
+                        break;
+                    case SPK.LightRGB:
+                        #region rgb light
+                        byte b = 100;
+                        if (commandDictionary.ContainsKey(FunctionAttributeKey.OnOff))
+                        {
+                            if (function.trait_on_off.curValue.ToString() == "off")
+                            {
+                                b = 0;
+                            }
+                            else
+                            {
+                                b = function.lastBrightness == 0 ? (byte)100 : Convert.ToByte(function.lastBrightness);
+                            }
+                        }
+                        else
+                        {
+                            b = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
+                        }
+                        var tempLight = new Light();
+                        var bytes = new byte[] { function.bus.LoopId,
+                                            b,
+                                            254, 0,Convert.ToByte(function.GetAttrState(FunctionAttributeKey.FadeTime)) ,3,
+                                            (byte)tempLight.GetColor(0,function),
+                                            (byte)tempLight.GetColor(1,function),
+                                            (byte)tempLight.GetColor(2,function),
+                                            0,0};
+                        ControlBytesSend(Command.SetLogicLoopColor, subnetId, deviceId, bytes, 1);
+                        #endregion
+                        break;
+                    case SPK.LightDimming:
+                        #region dimming light
+                        byte b1 = 100;
+                        if (commandDictionary.ContainsKey(FunctionAttributeKey.OnOff))
+                        {
+                            if (function.trait_on_off.curValue.ToString() == "off")
+                            {
+                                b1 = 0;
+                            }
+                            else
+                            {
+                                b1 = function.lastBrightness == 0 ? (byte)100 : Convert.ToByte(function.lastBrightness);
+                            }
+                        }
+                        else
+                        {
+                            b1 = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Brightness));
+                        }
+                        ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] {
+                                            function.bus.LoopId,
+                                            b1,
+                                            0, Convert.ToByte(function.GetAttrState(FunctionAttributeKey.FadeTime)) });
+                        #endregion
+                        break;
+                    case SPK.LightSwitch:
+                        #region LightSwitch
+                        ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId, function.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0, 0, 0 });
+                        #endregion
+                        break;
+                    case SPK.CurtainSwitch:
+                        #region switch curtain
+                        byte switchCurtain = 0;
+                        if (function.trait_on_off.curValue.ToString() == "stop")
+                        {
+                            switchCurtain = 0;
+                        }
+                        else if (function.trait_on_off.curValue.ToString() == "on")
+                        {
+                            switchCurtain = 1;
+                        }
+                        else
+                        {
+                            switchCurtain = 2;
+                        }
+                        ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { function.bus.LoopId, switchCurtain });
+                        #endregion
+                        break;
+                    case SPK.CurtainTrietex:
+                    case SPK.CurtainRoller:
+                        if (function.trait_on_off.curValue.ToString() == "stop")
+                        {
+                            ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { function.bus.LoopId, 0 });
+                        }
+                        else
+                        {
+                            ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { 17, Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Percent)) });
+
+                        }
+                        break;
+                    case SPK.AcStandard:
+                    case SPK.HvacAC:
+                        var ac = new AC();
+                        foreach (var dic in commandDictionary)
+                        {
+                            switch (dic.Key)
                             {
                                 case FunctionAttributeKey.OnOff:
-                                    tempAc.trait_on_off.curValue = attr.value;
+                                    ControlBytesSend(Command.InstructionPanelKey, function.bus.SubnetID, function.bus.DeviceID, new byte[] { 3, function.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, function.bus.LoopId });
                                     break;
-                                case FunctionAttributeKey.Mode:
-                                    tempAc.trait_mode.curValue = attr.value;
+                                case "mode":
+                                    ControlBytesSend(Command.InstructionPanelKey, function.bus.SubnetID, function.bus.DeviceID, new byte[] { 6, ac.GetModeIndex(function), function.bus.LoopId });
                                     break;
-                                case FunctionAttributeKey.FanSpeed:
-                                    tempAc.trait_fan.curValue = attr.value;
+                                case "fan":
+                                    ControlBytesSend(Command.InstructionPanelKey, function.bus.SubnetID, function.bus.DeviceID, new byte[] { 5, ac.GetFanIndex(function), function.bus.LoopId });
                                     break;
                                 case FunctionAttributeKey.SetTemp:
-                                    tempAc.trait_temp.curValue = attr.value;
-                                    switch (tempAc.curModeIndex)
+                                    byte modeKey = 4;
+                                    switch (ac.GetModeIndex(function))
                                     {
                                         case 3:
                                             modeKey = 8;
@@ -217,307 +588,193 @@
                                             modeKey = 2;
                                             break;
                                     }
+                                    ControlBytesSend(Command.InstructionPanelKey, function.bus.SubnetID, function.bus.DeviceID, new byte[] {
+                                                modeKey, Convert.ToByte(function.GetAttrState(FunctionAttributeKey.SetTemp)), function.bus.LoopId });
+                                    break;
+                                default:
+                                    MainPage.Log($"鍔熻兘鏈敮鎸� : {dic.Key}");
                                     break;
                             }
-                            ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID, new byte[] { 3, tempAc.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, f.localFunction.bus_Data.loopId });
-                            ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID, new byte[] { 6, tempAc.curModeIndex, f.localFunction.bus_Data.loopId });
-                            ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID, new byte[] { 5, tempAc.curFanIndex, f.localFunction.bus_Data.loopId });
-                            ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID, new byte[] { modeKey, Convert.ToByte(tempAc.trait_temp.curValue), f.localFunction.bus_Data.loopId });
                         }
                         break;
-                    case FunctionType.Relay:
-                    case FunctionType.Dimmer:
-                        byte brightness = 0;
-                        foreach (var attr in f.status)
+                    case SPK.HvacFloorHeat:case SPK.FloorHeatStandard:
+                        var fhTemp = new FloorHeating();
+                        if (function.Fh_Mode_Temp.Count == 4)
                         {
-                            switch (attr.key)
+                            if (function.GetAttribute(FunctionAttributeKey.Mode) == null)
                             {
-                                case FunctionAttributeKey.OnOff:
-                                    switch (attr.value)
-                                    {
-                                        case "on":
-                                            brightness = 100;
-                                            break;
-                                        case "off":
-                                            brightness = 0;
-                                            break;
-                                    }
-                                    break;
-                                case FunctionAttributeKey.Brightness:
-                                    brightness = Convert.ToByte(attr.value);
-                                    break;
-                            }
-                        }
-                        ControlBytesSend(Command.SetSingleLight, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID,
-                            new byte[] { f.localFunction.bus_Data.loopId, brightness });
-                        break;
-                    case FunctionType.RGB:
-                        break;
-                    case FunctionType.FloorHeating:
-                        var tempFh = new FloorHeating();
-                        foreach (var attr in f.status)
-                        {
-                            switch (attr.key)
-                            {
-                                case FunctionAttributeKey.OnOff:
-                                    tempFh.trait_on_off.curValue = attr.value;
-                                    break;
-                                case FunctionAttributeKey.SetTemp:
-                                    tempFh.trait_temp.curValue = attr.value;
-                                    break;
-                                case FunctionAttributeKey.Mode:
-                                    tempFh.trait_mode.curValue = attr.value;
-                                    break;
-                            }
-                        }
-                        byte b1 = tempFh.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0;
-                        ControlBytesSend(Command.SetFloorHeat, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID, new byte[] {
-                                f. localFunction.bus_Data.loopId, b1, 0, tempFh.curModeIndex, Convert.ToByte( tempFh.trait_temp.curValue),  Convert.ToByte( tempFh.trait_temp.curValue), Convert.ToByte( tempFh.trait_temp.curValue), Convert.ToByte( tempFh.trait_temp.curValue), 0, 0 });
-                        break;
-                    case FunctionType.Socket:
-                        foreach (var attr in f.status)
-                        {
-                            if (attr.key == FunctionAttributeKey.OnOff)
-                            {
-                                byte onOffValue = 0;
-                                switch (attr.value)
-                                {
-                                    case "on":
-                                        onOffValue = 1;
-                                        break;
-                                    case "off":
-                                        onOffValue = 2;
-                                        break;
-                                }
-                                ControlBytesSend(Command.SetSingleLight, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID,
-                                    new byte[] { f.localFunction.bus_Data.loopId, onOffValue });
-                                break;
-                            }
-                        }
-                        break;
-                }
-            }
-        }
-
-        /// <summary>
-        /// 鎺у埗bus璁惧
-        /// </summary>
-        /// <param name="commandString"></param>
-        /// <returns></returns>
-        public void WriteBusData(Function function, Dictionary<string, string> commandDictionary)
-        {
-            try
-            {
-                var subnetId = function.bus_Data.SubnetID;
-                var deviceId = function.bus_Data.DeviceID;
-                var loopId = function.bus_Data.loopId;
-
-                switch (function.functionCategory)
-                {
-                    case FunctionCategory.Light:
-                        var light = function as Light;
-                        switch (light.functionType)
-                        {
-                            case FunctionType.RGB:
-                                MainPage.Log($"rgb level : {light.brightness}");
-                                byte b = 100;//寮�鍏虫搷浣滀緷鎹畂n_off瀛楁锛屽疄闄呭紑鍏冲�间緷鎹産rightness锛屽綋on_off涓烘墦寮�锛宐rightness涓嶈兘涓�0
-                                if (light.trait_on_off.curValue.ToString() == "off")
-                                {
-                                    b = 0;
-                                }
-                                else
-                                {
-                                    b = (byte)light.brightness == 0 ? (byte)100 : (byte)light.brightness;
-                                }
-                                var bytes = new byte[] { function.bus_Data.loopId,
-                                            b,
-                                            254, 0,Convert.ToByte(light.fadeTime) ,3,
-                                            (byte)light.redColor,(byte)light.greenColor,
-                                            (byte)light.blueColor,
-                                            0,0};
-                                ControlBytesSend(Command.SetLogicLoopColor, subnetId, deviceId, bytes, 1);
-                                break;
-                            case FunctionType.Dimmer:
-                                byte b1 = 100;
-                                if (light.trait_on_off.curValue.ToString() == "off")
-                                {
-                                    b1 = 0;
-                                }
-                                else
-                                {
-                                    b1 = (byte)light.brightness == 0 ? (byte)100 : (byte)light.brightness;
-                                }
-                                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] {
-                                            function.bus_Data.loopId,
-                                            b1,
-                                            0, Convert.ToByte(light.fadeTime) });
-                                //DimmerPage.UpdataStates(light);
-                                break;
-                            case FunctionType.Relay:
-                                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus_Data.loopId, light.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0, 0, 0 });
-                                //RelayPage.UpdataState(light);
-                                break;
-                        }
-                        break;
-                    case FunctionCategory.Curtain:
-                        var curtain = function as Curtain;
-                        switch (curtain.functionType)
-                        {
-                            case FunctionType.Curtain:
-                                byte b1 = 0;
-                                if (curtain.trait_on_off.curValue.ToString() == "stop")
-                                {
-                                    b1 = 0;
-                                }
-                                else if (curtain.trait_on_off.curValue.ToString() == "on")
-                                {
-                                    b1 = 1;
-                                }
-                                else
-                                {
-                                    b1 = 2;
-                                }
-                                ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus_Data.loopId, b1 });
-                                break;
-                            case FunctionType.MotorCurtain:
-                            case FunctionType.RollingShutter:
-                                //if (commandDictionary.Count > 0)
-                                //{
-                                if (curtain.trait_on_off.curValue.ToString() == "stop")
-                                {
-                                    ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus_Data.loopId, 0 });
-                                }
-                                else
-                                {
-                                    ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { 17, Convert.ToByte(curtain.percent) });
-
-                                }
-                                //}
-                                //else
-                                //{
-                                //    if (curtain.trait_on_off.value.ToString() == "stop")
-                                //    {
-                                //        ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus_Data.loopId, 0 });
-                                //    }
-                                //    else if (curtain.trait_on_off.value.ToString() == "on")
-                                //    {
-                                //        ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { 17, 100 });
-                                //    }
-                                //    else if (curtain.trait_on_off.value.ToString() == "off")
-                                //    {
-                                //        ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { 17, 0 });
-                                //    }
-                                //}
-                                break;
-                        }
-                        break;
-                    case FunctionCategory.Thermostat:
-                        switch (function.functionType)
-                        {
-                            case FunctionType.AC:
-                                var aC = function as AC;
-                                ControlBytesSend(Command.SetACMode, subnetId, deviceId, new byte[] { aC.bus_Data.loopId, (byte)aC.curTempType, 32, 32, 32, 32, 32, 0, aC.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, aC.curModeIndex, aC.curFanIndex, Convert.ToByte(aC.trait_temp.curValue), 0 });
-                                //ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 3, aC.on_off == "on" ? (byte)1 : (byte)0, aC.bus_Data.loopId });
                                 foreach (var dic in commandDictionary)
                                 {
                                     switch (dic.Key)
                                     {
-                                        case "on_off":
-                                            ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 3, aC.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, aC.bus_Data.loopId });
+                                        case FunctionAttributeKey.OnOff:
+                                            ControlBytesSend(Command.InstructionPanelKey, function.bus.SubnetID, function.bus.DeviceID, new byte[] { 20, function.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, function.bus.LoopId });
                                             break;
                                         case "mode":
-                                            ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 6, aC.curModeIndex, aC.bus_Data.loopId });
+                                            ControlBytesSend(Command.InstructionPanelKey, function.bus.SubnetID, function.bus.DeviceID, new byte[] { 21, fhTemp.GetModeIndex(function), function.bus.LoopId });
                                             break;
-                                        case "fan":
-                                            ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 5, aC.curFanIndex, aC.bus_Data.loopId });
-                                            break;
-                                        case "temp":
-                                            byte modeKey = 4;
-                                            switch (aC.curModeIndex)
+                                        case FunctionAttributeKey.SetTemp:
+                                            byte modeKey = 25;
+                                            switch (fhTemp.GetModeIndex(function))
                                             {
-                                                case 3:
-                                                    modeKey = 8;
-                                                    break;
-                                                case 0:
-                                                    modeKey = 4;
-                                                    break;
                                                 case 1:
-                                                    modeKey = 7;
-                                                    break;
-                                                case 4:
-                                                    modeKey = 19;
+                                                    modeKey = 25;
                                                     break;
                                                 case 2:
-                                                    modeKey = 2;
+                                                    modeKey = 26;
+                                                    break;
+                                                case 3:
+                                                    modeKey = 27;
+                                                    break;
+                                                case 4:
+                                                    modeKey = 28;
                                                     break;
                                             }
-                                            ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { modeKey, Convert.ToByte(aC.trait_temp.curValue), aC.bus_Data.loopId });
+                                            ControlBytesSend(Command.InstructionPanelKey, function.bus.SubnetID, function.bus.DeviceID, new byte[] {
+                                                modeKey, Convert.ToByte(function.GetAttrState(FunctionAttributeKey.SetTemp)), function.bus.LoopId });
                                             break;
                                         default:
                                             MainPage.Log($"鍔熻兘鏈敮鎸� : {dic.Key}");
                                             break;
                                     }
                                 }
+                            }
+                            else
+                            {
+                                var onoffString = function.trait_on_off.curValue.ToString();
+                                byte b12 = 1;
+                                if (onoffString == "off")
+                                {
+                                    b12 = 0;
+                                }
+                                var wm = fhTemp.GetWorkModeIndex(function);
+                                if (wm > 0)
+                                {
+                                    b12 += (byte)(16 + wm);
+                                }
+                                if (commandDictionary.ContainsKey("set_temp"))
+                                {
+                                    var dicTempString = "";
+                                    commandDictionary.TryGetValue("set_temp", out dicTempString);
+                                    var dicTemp = Convert.ToByte(dicTempString);
+                                    var mode = function.GetAttrState(FunctionAttributeKey.Mode);
+                                    switch (mode)
+                                    {
+                                        case "day":
+                                            function.Fh_Mode_Temp["day"] = dicTemp;
+                                            break;
+                                        case "night":
+                                            function.Fh_Mode_Temp["night"] = dicTemp;
+                                            break;
+                                        case "away":
+                                            function.Fh_Mode_Temp["away"] = dicTemp;
+                                            break;
+                                        case "normal":
+                                            function.Fh_Mode_Temp["normal"] = dicTemp;
+                                            break;
+                                    }
+                                }
+                                var tt = fhTemp.GetTempUintIndex(function);
+                                ControlBytesSend(Command.SetFloorHeat, subnetId, deviceId, new byte[] { function.bus.LoopId, b12,
+                                        (byte)tt,fhTemp.GetModeIndex(function), function.Fh_Mode_Temp["normal"], function.Fh_Mode_Temp["day"], function.Fh_Mode_Temp["night"], function.Fh_Mode_Temp["away"], 0, 0 });
+                            }
+                        }
+                        break;
+                    case SPK.HvacFan:
+                    case SPK.ElectricFan:
+                        #region ElectricFan
+                        if (function.trait_on_off.curValue.ToString() == "on")
+                        {
+                            ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId, Convert.ToByte(function.GetAttrState(FunctionAttributeKey.OpenLevel)) });
+                        }
+                        {
+                            ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId, 0 });
+                        }
+                        #endregion
+                        break;
+                    case SPK.ElectricSocket:
+                    case SPK.PanelSocket:
+                        ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId, function.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0 });
+                        break;
+                    case SPK.AirFreshJinmao:case SPK.HvacAirFreshJinmao:
+                        #region AirFresh
+                        //1   鏂伴缂栧彿    1~200
+                        //2   绫诲瀷 绗笁鏂圭被鍨�  0锛氶噾鑼傛柊椋�
 
-                                break;
-                            case FunctionType.FloorHeating:
-                                var fh = function as FloorHeating;
-                                if (fh.modeTemp.Count == 4)
-                                {
-                                    byte b1 = fh.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0;
-                                    if (fh.workMode > 0)
-                                    {
-                                        b1 += (byte)(16 + fh.workMode);
-                                    }
-                                    if (commandDictionary.ContainsKey("temp"))
-                                    {
-                                        var dicTempString = "";
-                                        commandDictionary.TryGetValue("temp", out dicTempString);
-                                        var dicTemp = Convert.ToByte(dicTempString);
-                                        switch (fh.trait_mode.curValue)
-                                        {
-                                            case "day":
-                                                fh.modeTemp["day"] = dicTemp;
-                                                break;
-                                            case "night":
-                                                fh.modeTemp["night"] = dicTemp;
-                                                break;
-                                            case "away":
-                                                fh.modeTemp["away"] = dicTemp;
-                                                break;
-                                            case "normal":
-                                                fh.modeTemp["normal"] = dicTemp;
-                                                break;
-                                        }
-                                    }
-                                    ControlBytesSend(Command.SetFloorHeat, subnetId, deviceId, new byte[] { fh.bus_Data.loopId, b1, (byte)fh.curTempType, fh.curModeIndex, fh.modeTemp["normal"], fh.modeTemp["day"], fh.modeTemp["night"], fh.modeTemp["away"], 0, 0 });
-                                }
-                                break;
-                        }
-                        break;
-                    case FunctionCategory.Electrical:
-                        switch (function.functionType)
+                        //3   寮�鍏�  0 - 鍏虫満锛�1 - 寮�鏈�
+                        byte switchValue = 0;
+                        if (commandDictionary.ContainsKey(FunctionAttributeKey.OnOff) == true
+                            && commandDictionary[FunctionAttributeKey.OnOff] == "on")
                         {
-                            case FunctionType.Fan:
-                                var fan = function as Fan;
-                                if (fan.trait_on_off.curValue.ToString() == "on")
-                                {
-                                    ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus_Data.loopId, (byte)fan.openLevel });
-                                }
-                                {
-                                    ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus_Data.loopId, 0 });
-                                }
-                                break;
+                            switchValue = 1;
                         }
-                        break;
-                    case FunctionCategory.SwitchDevice:
-                        switch (function.functionType)
+
+                        //4   杩愯妯″紡    1 - 閫氶锛�2 - 鍔犳箍
+                        byte airFreshMode = 1;
+                        if (commandDictionary.ContainsKey(FunctionAttributeKey.Mode) == true
+                            && commandDictionary[FunctionAttributeKey.Mode] == "humidification")
                         {
-                            case FunctionType.Socket:
-                                var s = function as SwitchSocket;
-                                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus_Data.loopId, s.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0 });
-                                break;
+                            airFreshMode = 2;
                         }
+                        //5   鑺傝兘鑸掗�傞�夋嫨  1 - 鑸掗�傦紝2 - 鑺傝兘
+                        byte airFreshEnergy = 1;
+                        if (commandDictionary.ContainsKey(FunctionAttributeKey.Energy) == true
+                           && commandDictionary[FunctionAttributeKey.Energy] == "true")
+                        {
+                            airFreshEnergy = 2;
+                        }
+                        //6   椋庨�熸。浣�    0 - 鑷姩锛�1 - 1妗o紝2 - 2妗o紝3 - 3妗�
+                        byte airFreshFan = 0;
+                        if (commandDictionary.ContainsKey(FunctionAttributeKey.FanSpeed) == true)
+                        {
+                            switch (commandDictionary[FunctionAttributeKey.FanSpeed])
+                            {
+                                case "auto":
+                                    airFreshFan = 0;
+                                    break;
+                                case "level_1":
+                                    airFreshFan = 1;
+                                    break;
+                                case "level_2":
+                                    airFreshFan = 2;
+                                    break;
+                                case "level_3":
+                                    airFreshFan = 3;
+                                    break;
+                            }
+                        }
+                        //7   婀垮害璁惧畾 %
+                        byte hum = 0;
+                        if (commandDictionary.ContainsKey(FunctionAttributeKey.Humidity) == true)
+                        {
+                            hum = Convert.ToByte(commandDictionary[FunctionAttributeKey.Humidity]);
+                        }
+                        //8   瀹ゅ唴娓╁害鍊�   鈩�
+                        byte indoorTemp_airFrsh = 0;
+                        if (commandDictionary.ContainsKey(FunctionAttributeKey.IndoorTemp) == true)
+                        {
+                            indoorTemp_airFrsh = Convert.ToByte(commandDictionary[FunctionAttributeKey.IndoorTemp]);
+                        }
+                        byte indoorHumidity_airFrsh = 0;
+                        if (commandDictionary.ContainsKey(FunctionAttributeKey.IndoorHumidity) == true)
+                        {
+                            indoorHumidity_airFrsh = Convert.ToByte(commandDictionary[FunctionAttributeKey.IndoorHumidity]);
+                        }
+                        //9   瀹ゅ唴婀垮害鍊�   鈩�
+                        //10  杩囨护缃戝墿浣� %
+                        //11  杩囨护缃戜娇鐢ㄨ秴鏃� 1 瓒呮椂 0 鏃�    
+                        ControlBytesSend(Command.FreshAirControl_JinMao, subnetId, deviceId, new byte[] {
+                                    function.bus.LoopId,0, switchValue ,
+                                    airFreshMode,airFreshEnergy,
+                                    airFreshFan,
+                                    hum,
+                                    indoorTemp_airFrsh,
+                                    indoorHumidity_airFrsh,
+                                    //Convert.ToByte( function.GetAttrState(FunctionAttributeKey.FilterRemain)),
+                                    //function.GetAttrState(FunctionAttributeKey.FilterTimeout) =="true"?1:0,
+                                    0,0
+                                });
+                        #endregion
                         break;
                 }
                 #region 鍙戦�佸懡浠ょ珛鍗虫洿鏂癠I
@@ -540,67 +797,60 @@
         {
             try
             {
-                var subnetId = function.bus_Data.SubnetID;
-                var deviceId = function.bus_Data.DeviceID;
-                var loopId = function.bus_Data.loopId;
+                var subnetId = function.bus.SubnetID;
+                var deviceId = function.bus.DeviceID;
+                var loopId = function.bus.LoopId;
 
-                switch (function.functionCategory)
+                switch (function.spk)
                 {
-                    case FunctionCategory.Light:
-                        switch (function.functionType)
-                        {
-                            case FunctionType.Relay:
-                            case FunctionType.Dimmer:
-                                ControlBytesSend(Command.ReadLightAllLoopBrightness, subnetId, deviceId, new byte[] { });
-                                break;
-                            case FunctionType.RGB:
-                                ControlBytesSend(Command.ReadLogicLoopColor, subnetId, deviceId, new byte[] { function.bus_Data.loopId });
-                                break;
-                        }
+                    case SPK.LightSwitch:
+                    case SPK.LightDimming:
+                        ControlBytesSend(Command.ReadLightAllLoopBrightness, subnetId, deviceId, new byte[] { });
                         break;
-                    case FunctionCategory.Curtain:
-                        switch (function.functionType)
-                        {
-                            case FunctionType.Curtain:
-                            case FunctionType.MotorCurtain:
-                            case FunctionType.RollingShutter:
-                                ControlBytesSend(Command.ReadCurtainStatus, subnetId, deviceId, new byte[] { function.bus_Data.loopId });
-                                break;
-                        }
+                    case SPK.LightRGB:
+                        ControlBytesSend(Command.ReadLogicLoopColor, subnetId, deviceId, new byte[] { function.bus.LoopId });
                         break;
-                    case FunctionCategory.Thermostat:
-                        switch (function.functionType)
-                        {
-                            case FunctionType.AC:
-                                ControlBytesSend(Command.ReadACMode, subnetId, deviceId, new byte[] { function.bus_Data.loopId });
-                                break;
-                            case FunctionType.FloorHeating:
-                                ControlBytesSend(Command.ReadFloorHeat, subnetId, deviceId, new byte[] { function.bus_Data.loopId });
-                                break;
-                        }
+                    case SPK.LightCCT:
+                        ControlBytesSend(Command.ReadLogicLoopColor, subnetId, deviceId, new byte[] { function.bus.LoopId });
                         break;
-                    case FunctionCategory.Electrical:
-                        switch (function.functionType)
-                        {
-                            case FunctionType.Fan:
-                                var fan = function as Fan;
-                                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus_Data.loopId });
-                                break;
-                        }
+                    case SPK.CurtainSwitch:
+                    case SPK.CurtainTrietex:
+                    case SPK.CurtainRoller:
+                        ControlBytesSend(Command.ReadCurtainStatus, subnetId, deviceId, new byte[] { function.bus.LoopId });
                         break;
-                    case FunctionCategory.SwitchDevice:
-                        switch (function.functionType)
-                        {
-                            case FunctionType.Socket:
-                                var s = function as SwitchSocket;
-                                ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus_Data.loopId });
-                                break;
-                        }
+                    case SPK.AcStandard:
+                    case SPK.HvacAC:
+                        ControlBytesSend(Command.ReadACMode, subnetId, deviceId, new byte[] { function.bus.LoopId });
                         break;
-                    case FunctionCategory.Sensor:
-                        var sensor = function as Sensor;
-                        ControlBytesSend(Command.ReadDeviceLoopInfo, subnetId, deviceId, new byte[] { (byte)5,
-                                            (byte)((int)sensor.functionType % 256), sensor.bus_Data.loopId });
+                    case SPK.HvacFloorHeat:case SPK.FloorHeatStandard:
+                        ControlBytesSend(Command.ReadFloorHeat, subnetId, deviceId, new byte[] { function.bus.LoopId });
+                        break;
+                    case SPK.HvacFan:
+                    case SPK.ElectricFan:
+                        ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId });
+                        break;
+                    case SPK.ElectricSocket:
+                    case SPK.PanelSocket:
+                        ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId });
+                        break;
+                    case SPK.SensorTemperature:
+                        ControlBytesSend(Command.ReadDeviceLoopInfo, subnetId, deviceId, new byte[] { 5, 2, function.bus.LoopId });
+                        break;
+                    case SPK.SensorHumidity:
+                        ControlBytesSend(Command.ReadDeviceLoopInfo, subnetId, deviceId, new byte[] { 5, 3, function.bus.LoopId });
+                        break;
+                    case SPK.SensorTVOC:
+                        ControlBytesSend(Command.ReadDeviceLoopInfo, subnetId, deviceId, new byte[] { 5, 5, function.bus.LoopId });
+                        break;
+                    case SPK.SensorPm25:
+                        ControlBytesSend(Command.ReadDeviceLoopInfo, subnetId, deviceId, new byte[] { 5, 6, function.bus.LoopId });
+                        break;
+                    case SPK.SensorCO2:
+                        ControlBytesSend(Command.ReadDeviceLoopInfo, subnetId, deviceId, new byte[] { 5, 7, function.bus.LoopId });
+                        break;
+                    case SPK.AirFreshJinmao:
+                    case SPK.HvacAirFreshJinmao:
+                        ControlBytesSend(Command.FreshAirRead_JinMao, subnetId, deviceId, new byte[] { function.bus.LoopId });
                         break;
                 }
             }
@@ -715,7 +965,7 @@
 
             try
             {
-                //MainPage.Log("鍙戦�佹暟鎹�:" + SendFlag);
+                MainPage.Log("鍙戦�佹暟鎹�:" + SendFlag);
                 UdpSocket._BusSocket.AsyncBeginSend(packet);
                 packet.HaveSendCount--;
 
@@ -728,7 +978,7 @@
                         UdpSocket._BusSocket.AsyncBeginSend(packet);
                         controlLostCount++;
                     }
-                    System.Threading.Thread.Sleep(100);
+                    System.Threading.Thread.Sleep(1000);
                 }
             }
             catch (Exception ex)
@@ -761,6 +1011,10 @@
                 case Command.SetACMode:
                 case Command.ReadFloorHeat:
                 case Command.SetFloorHeat:
+                case Command.FreshAirRead:
+                case Command.FreshAirControl:
+                case Command.FreshAirRead_JinMao:
+                case Command.FreshAirControl_JinMao:
                     this.sendFlag += string.Format("{0}", target.AddData[0]);
                     break;
                 case Command.SetLogicLoopColor:
@@ -787,6 +1041,10 @@
             }
 
         }
+
+        //private void signAlinkPacket()
+        //{
+        //}
 
         /// <summary>
         /// 鍙戦�佹暟鎹�
@@ -820,21 +1078,30 @@
         /// <summary>
         /// 璇诲彇缃戝叧IP
         /// </summary>
-        public void SearchLocalGateway()
+        public void SearchLocalGateway(bool broadcast = false)
         {
             try
             {
-                var sendJob = new JObject { { "id", Control.Ins.msg_id.ToString() }, { "time_stamp", (DateTime.Now.Ticks / 100000).ToString() } };
+                var sendJob = new JObject { { "id", Control.Ins.msg_id.ToString() }, { "time_stamp", Utlis.GetTimestamp ()} };
                 var bodyString = JsonConvert.SerializeObject(sendJob);
                 
-                var sendBytes = Control.Ins.ConvertSendBodyData(CommunicationTopic.SearchLoaclGateway, bodyString);
-                //缁勬挱鍙戦��
-                packet = new Packet(sendBytes, new System.Net.IPEndPoint(System.Net.IPAddress.Parse("239.0.168.188"), 8585));
-                packet.HaveSendCount = 4;//ps锛氭病鏈夐噸鍙戯紝鍚庢湡鏈夋椂闂村彲浠ュ鍔犻噸鍙戝垽鏂�
+                var sendBytes = Control.Ins.ConvertSendBodyData(CommunicationTopic.SearchLoaclGateway, bodyString, false);
+                if (broadcast)
+                {
+                    //骞挎挱
+                    packet = new Packet(sendBytes, new System.Net.IPEndPoint(System.Net.IPAddress.Parse("255.255.255.255"), 8585));
+                }
+                else
+                {
+                    //缁勬挱鍙戦��
+                    packet = new Packet(sendBytes, new System.Net.IPEndPoint(System.Net.IPAddress.Parse("239.0.168.188"), 8585));
+                }
+                packet.HaveSendCount = 4;
                 System.Threading.Thread thread = new System.Threading.Thread(new System.Threading.ParameterizedThreadStart(managerSendCount));
                 thread.IsBackground = true;
                 thread.Start(packet);
                 //wait();涓嶉渶瑕佺瓑寰�
+
             }
             catch (Exception ex)
             {
@@ -842,22 +1109,43 @@
             }
         }
 
+        /// <summary>
+        /// 璇诲彇缃戝叧IP
+        /// </summary>
+        public void SendLinkCommand(string topic,string bodyString)
+        {
+            try
+            {
+                var sendBytes = Control.Ins.ConvertSendBodyData(topic, bodyString, false);
+                //缁勬挱鍙戦��
+                packet = new Packet(sendBytes, new System.Net.IPEndPoint(System.Net.IPAddress.Parse("239.0.168.188"), 8585));
+                packet.HaveSendCount = 4;
+                System.Threading.Thread thread = new System.Threading.Thread(new System.Threading.ParameterizedThreadStart(managerSendCount));
+                thread.IsBackground = true;
+                thread.Start(packet);
+            }
+            catch (Exception ex)
+            {
+                MainPage.Log($"Send bus data error {ex.Message}");
+            }
+        }
 
         /// <summary>
         /// 鍙戦�乽dp A鍗忚鏁版嵁
         /// </summary>
-        public void SendLocalHdlLinkData(byte[] sendBytes,string id, bool isWait=false)
+        public void SendLocalHdlLinkData(byte[] sendBytes,string id, int resend = 3)
         {
             packet = new Packet(sendBytes, new System.Net.IPEndPoint(System.Net.IPAddress.Parse(Control.Ins.reportIp), 8585));
+            packet.HaveSendCount = 3 - resend;//閲嶅彂娆℃暟
             sendFlag = id;
             System.Threading.Thread thread = new System.Threading.Thread(new System.Threading.ParameterizedThreadStart(managerSendCount));
             thread.IsBackground = true;
             thread.Start(packet);
-            if (isWait)
-            {
-                wait(); 
-            }
-            //MainPage.Log($"鍙戦�丠dl-Link鏁版嵁锛孖P:{Control.Ins.reportIp}:8585");
+            //if (isWait)
+            //{
+            //    wait(); 
+            //}
+            MainPage.Log($"鍙戦�丠dl-Link鏁版嵁锛孖P:{Control.Ins.reportIp}:8585");
         }
     }
 

--
Gitblit v1.8.0