From 5eeafe3af80bfd88306bd8ad9e76c8f4b51ca35f Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 14:16:20 +0800
Subject: [PATCH] 增加本地发送的重发机制
---
HDL_ON/DAL/DriverLayer/Control_Udp.cs | 309 +++++++++++++++++++++++++++++++-------------------
1 files changed, 190 insertions(+), 119 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control_Udp.cs b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
index c04cb5c..0f458fb 100644
--- a/HDL_ON/DAL/DriverLayer/Control_Udp.cs
+++ b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
@@ -11,15 +11,14 @@
{
public class Control_Udp
{
-
- public Control_Udp()
- {
- MainPage.Log($"control bus udp 琚垱寤猴紝鏃堕棿锛歿DateTime.Now}");
- }
+ //public Control_Udp()
+ //{
+ // MainPage.Log($"control bus udp 琚垱寤猴紝鏃堕棿锛歿DateTime.Now}");
+ //}
/// <summary>
- /// 閫氳ID
+ /// 閫氳绔彛
/// </summary>
- public const int msg_id = 1;
+ public int port = 0;
/// <summary>
/// 鎺у埗澶辫触娆℃暟
@@ -30,6 +29,7 @@
/// 鎵�鏈夊涓�绔彛鐨勬帶鍒堕兘浼氭斁鍒拌繖涓泦鍚堥噷
/// </summary>
static List<Control_Udp> controlList = new List<Control_Udp>(50);
+
public System.Net.IPEndPoint EndPoint
{
@@ -66,7 +66,7 @@
/// <summary>
/// 閲嶅彂楠岃瘉
/// </summary>
- public void ReceiveRepeatManager(string receiveFlag)
+ public static void ReceiveRepeatManager(string receiveFlag,byte []usefulBytes)
{
for (int i = 0; i < controlList.Count; i++)
{
@@ -152,93 +152,148 @@
/// <summary>
/// 鎺у埗bus鍦烘櫙
+ /// todo
/// </summary>
public void ControlBusScenes(Scene scene)
{
- foreach (var function in scene.sceneFunctionList)
+ foreach (var f in scene.functions)
{
- switch (function.functionType)
+ switch (f.localFunction.functionType)
{
case FunctionType.Curtain:
- byte curtainState = 0;
- if (function.trait_on_off.value.ToString() == "on")
+ foreach (var attr in f.status)
{
- curtainState = 1;
+ if (attr.key == FunctionAttributeKey.OnOff)
+ {
+ byte curtainState = 0;
+ switch (attr.value)
+ {
+ case "on":
+ curtainState = 1;
+ break;
+ case "off":
+ curtainState = 2;
+ break;
+ }
+ ControlBytesSend(Command.SetCurtainModelStutas, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID,
+ new byte[] { f.localFunction.bus_Data.loopId, curtainState });
+ break;
+ }
}
- else if (function.trait_on_off.value.ToString() == "off")
- {
- curtainState = 2;
- }
- ControlBytesSend(Command.SetCurtainModelStutas, function.bus_Data.SubnetID, function.bus_Data.DeviceID,
- new byte[] {
- function.bus_Data.LoopID,
- curtainState,
- });
break;
case FunctionType.AC:
- var aC = Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(Newtonsoft.Json.JsonConvert.SerializeObject(function));//as AC;
- ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 3, aC.trait_on_off.value.ToString() == "on" ? (byte)1 : (byte)0, aC.bus_Data.LoopID });
- ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 6, aC.curModeIndex, aC.bus_Data.LoopID });
- ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 5, aC.curFanIndex, aC.bus_Data.LoopID });
- byte modeKey = 4;
- switch (aC.curModeIndex)
+ AC tempAc = new AC();
+ foreach (var attr in f.status)
{
- case 3:
- modeKey = 8;
- break;
- case 0:
- modeKey = 4;
- break;
- case 1:
- modeKey = 7;
- break;
- case 4:
- modeKey = 19;
- break;
- case 2:
- modeKey = 2;
- break;
+ byte modeKey = 4;
+ switch (attr.key)
+ {
+ case FunctionAttributeKey.OnOff:
+ tempAc.trait_on_off.curValue = attr.value;
+ break;
+ case FunctionAttributeKey.Mode:
+ tempAc.trait_mode.curValue = attr.value;
+ break;
+ case FunctionAttributeKey.FanSpeed:
+ tempAc.trait_fan.curValue = attr.value;
+ break;
+ case FunctionAttributeKey.SetTemp:
+ tempAc.trait_temp.curValue = attr.value;
+ switch (tempAc.curModeIndex)
+ {
+ case 3:
+ modeKey = 8;
+ break;
+ case 0:
+ modeKey = 4;
+ break;
+ case 1:
+ modeKey = 7;
+ break;
+ case 4:
+ modeKey = 19;
+ break;
+ case 2:
+ modeKey = 2;
+ break;
+ }
+ 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 });
}
- ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { modeKey, Convert.ToByte(aC.trait_temp.value), aC.bus_Data.LoopID });
-
break;
case FunctionType.Relay:
case FunctionType.Dimmer:
byte brightness = 0;
- if (function.trait_on_off.value.ToString() == "on")
+ foreach (var attr in f.status)
{
- var brightnessTrait = function.function.Find((obj) => obj.name == "brightness");
- if (brightnessTrait != null)
+ switch (attr.key)
{
- brightness = Convert.ToByte(brightnessTrait.value);
+ 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, function.bus_Data.SubnetID, function.bus_Data.DeviceID,
- new byte[] {
- function.bus_Data.LoopID,brightness
- });
+ 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:
- //ControlBytesSend(Command.SetLogicLoopColor, function.bus_Data.SubnetID, function.bus_Data.DeviceID,
- // new byte[] {
- // });
break;
case FunctionType.FloorHeating:
- var fh = Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(Newtonsoft.Json.JsonConvert.SerializeObject(function));//as AC;
- var fhModeTempTrait = function.function.Find((obj) => obj.name == "mode");
- if (fhModeTempTrait.value_key.Count == 4)
+ var tempFh = new FloorHeating();
+ foreach (var attr in f.status)
{
- byte b1 = function.trait_on_off.value.ToString() == "on" ? (byte)1 : (byte)0;
- if (fh.workMode > 0)
+ switch (attr.key)
{
- b1 += (byte)(16 + fh.workMode);
+ 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;
}
- ControlBytesSend(Command.SetFloorHeat, function.bus_Data.SubnetID, function.bus_Data.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 });
}
+ 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:
- //var s = function as SwitchSocket;
- ControlBytesSend(Command.SetSingleLight, function.bus_Data.SubnetID, function.bus_Data.DeviceID, new byte[] { function.bus_Data.LoopID, function.trait_on_off.value.ToString() == "on" ? (byte)100 : (byte)0 });
+ 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;
}
}
@@ -255,7 +310,7 @@
{
var subnetId = function.bus_Data.SubnetID;
var deviceId = function.bus_Data.DeviceID;
- var loopId = function.bus_Data.LoopID;
+ var loopId = function.bus_Data.loopId;
switch (function.functionCategory)
{
@@ -266,7 +321,7 @@
case FunctionType.RGB:
MainPage.Log($"rgb level : {light.brightness}");
byte b = 100;//寮�鍏虫搷浣滀緷鎹畂n_off瀛楁锛屽疄闄呭紑鍏冲�间緷鎹産rightness锛屽綋on_off涓烘墦寮�锛宐rightness涓嶈兘涓�0
- if (light.trait_on_off.value.ToString() == "off")
+ if (light.trait_on_off.curValue.ToString() == "off")
{
b = 0;
}
@@ -274,7 +329,7 @@
{
b = (byte)light.brightness == 0 ? (byte)100 : (byte)light.brightness;
}
- var bytes = new byte[] { function.bus_Data.LoopID,
+ var bytes = new byte[] { function.bus_Data.loopId,
b,
254, 0,Convert.ToByte(light.fadeTime) ,3,
(byte)light.redColor,(byte)light.greenColor,
@@ -284,7 +339,7 @@
break;
case FunctionType.Dimmer:
byte b1 = 100;
- if (light.trait_on_off.value.ToString() == "off")
+ if (light.trait_on_off.curValue.ToString() == "off")
{
b1 = 0;
}
@@ -293,13 +348,13 @@
b1 = (byte)light.brightness == 0 ? (byte)100 : (byte)light.brightness;
}
ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] {
- function.bus_Data.LoopID,
+ 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.value.ToString() == "on" ? (byte)100 : (byte)0, 0, 0 });
+ 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;
}
@@ -310,11 +365,11 @@
{
case FunctionType.Curtain:
byte b1 = 0;
- if (curtain.trait_on_off.value.ToString() == "stop")
+ if (curtain.trait_on_off.curValue.ToString() == "stop")
{
b1 = 0;
}
- else if (curtain.trait_on_off.value.ToString() == "on")
+ else if (curtain.trait_on_off.curValue.ToString() == "on")
{
b1 = 1;
}
@@ -322,15 +377,15 @@
{
b1 = 2;
}
- ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus_Data.LoopID, b1 });
+ 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.value.ToString() == "stop")
+ if (curtain.trait_on_off.curValue.ToString() == "stop")
{
- ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus_Data.LoopID, 0 });
+ ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus_Data.loopId, 0 });
}
else
{
@@ -342,7 +397,7 @@
//{
// if (curtain.trait_on_off.value.ToString() == "stop")
// {
- // ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus_Data.LoopID, 0 });
+ // ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus_Data.loopId, 0 });
// }
// else if (curtain.trait_on_off.value.ToString() == "on")
// {
@@ -361,20 +416,20 @@
{
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.value.ToString() == "on" ? (byte)1 : (byte)0, aC.curModeIndex, aC.curFanIndex, Convert.ToByte(aC.trait_temp.value), 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 });
+ 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.value.ToString() == "on" ? (byte)1 : (byte)0, aC.bus_Data.LoopID });
+ 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 });
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, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 6, aC.curModeIndex, aC.bus_Data.loopId });
break;
case "fan":
- ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 5, aC.curFanIndex, aC.bus_Data.LoopID });
+ 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;
@@ -396,7 +451,7 @@
modeKey = 2;
break;
}
- ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { modeKey, Convert.ToByte(aC.trait_temp.value), aC.bus_Data.LoopID });
+ ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { modeKey, Convert.ToByte(aC.trait_temp.curValue), aC.bus_Data.loopId });
break;
default:
MainPage.Log($"鍔熻兘鏈敮鎸� : {dic.Key}");
@@ -409,7 +464,7 @@
var fh = function as FloorHeating;
if (fh.modeTemp.Count == 4)
{
- byte b1 = fh.trait_on_off.value.ToString() == "on" ? (byte)1 : (byte)0;
+ byte b1 = fh.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0;
if (fh.workMode > 0)
{
b1 += (byte)(16 + fh.workMode);
@@ -419,7 +474,7 @@
var dicTempString = "";
commandDictionary.TryGetValue("temp", out dicTempString);
var dicTemp = Convert.ToByte(dicTempString);
- switch (fh.trait_mode.value)
+ switch (fh.trait_mode.curValue)
{
case "day":
fh.modeTemp["day"] = dicTemp;
@@ -435,7 +490,7 @@
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 });
+ 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;
}
@@ -445,12 +500,12 @@
{
case FunctionType.Fan:
var fan = function as Fan;
- if (fan.trait_on_off.value.ToString() == "on")
+ 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, (byte)fan.openLevel });
}
{
- ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus_Data.LoopID, 0 });
+ ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus_Data.loopId, 0 });
}
break;
}
@@ -460,7 +515,7 @@
{
case FunctionType.Socket:
var s = function as SwitchSocket;
- ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus_Data.LoopID, s.trait_on_off.value.ToString() == "on" ? (byte)100 : (byte)0 });
+ ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus_Data.loopId, s.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0 });
break;
}
break;
@@ -487,7 +542,7 @@
{
var subnetId = function.bus_Data.SubnetID;
var deviceId = function.bus_Data.DeviceID;
- var loopId = function.bus_Data.LoopID;
+ var loopId = function.bus_Data.loopId;
switch (function.functionCategory)
{
@@ -499,7 +554,7 @@
ControlBytesSend(Command.ReadLightAllLoopBrightness, subnetId, deviceId, new byte[] { });
break;
case FunctionType.RGB:
- ControlBytesSend(Command.ReadLogicLoopColor, subnetId, deviceId, new byte[] { function.bus_Data.LoopID });
+ ControlBytesSend(Command.ReadLogicLoopColor, subnetId, deviceId, new byte[] { function.bus_Data.loopId });
break;
}
break;
@@ -509,7 +564,7 @@
case FunctionType.Curtain:
case FunctionType.MotorCurtain:
case FunctionType.RollingShutter:
- ControlBytesSend(Command.ReadCurtainStatus, subnetId, deviceId, new byte[] { function.bus_Data.LoopID });
+ ControlBytesSend(Command.ReadCurtainStatus, subnetId, deviceId, new byte[] { function.bus_Data.loopId });
break;
}
break;
@@ -517,10 +572,10 @@
switch (function.functionType)
{
case FunctionType.AC:
- ControlBytesSend(Command.ReadACMode, subnetId, deviceId, new byte[] { function.bus_Data.LoopID });
+ 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 });
+ ControlBytesSend(Command.ReadFloorHeat, subnetId, deviceId, new byte[] { function.bus_Data.loopId });
break;
}
break;
@@ -529,7 +584,7 @@
{
case FunctionType.Fan:
var fan = function as Fan;
- ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus_Data.LoopID });
+ ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus_Data.loopId });
break;
}
break;
@@ -538,14 +593,14 @@
{
case FunctionType.Socket:
var s = function as SwitchSocket;
- ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus_Data.LoopID });
+ ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus_Data.loopId });
break;
}
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 });
+ (byte)((int)sensor.functionType % 256), sensor.bus_Data.loopId });
break;
}
}
@@ -569,7 +624,7 @@
{
for (int i = 0; i < controlList.Count;)
{
- if (controlList[i] == null || 3 <= controlList[i].Packet.HaveSendCount)
+ if (controlList[i] == null || 3 <= controlList[i].packet.HaveSendCount)
{
controlList.RemoveAt(i);
}
@@ -638,7 +693,7 @@
void run()
{
allDone.Set();
- Packet.HaveSendCount = 4;
+ packet.HaveSendCount = 4;
}
//鏁版嵁鍙戦�佸鐞�
@@ -652,7 +707,7 @@
new System.Threading.Thread(() =>
{
System.Threading.Thread.Sleep(1000);
- UdpSocket._BusSocket.Start();
+ UdpSocket._BusSocket.Start(UdpSocket._BusSocket.Port);
controlLostCount = 0;
})
{ IsBackground = true }.Start();
@@ -660,17 +715,17 @@
try
{
- MainPage.Log("鍙戦�佹暟鎹�:" + SendFlag);
- UdpSocket._BusSocket.AsyncBeginSend(Packet);
- Packet.HaveSendCount--;
+ //MainPage.Log("鍙戦�佹暟鎹�:" + SendFlag);
+ UdpSocket._BusSocket.AsyncBeginSend(packet);
+ packet.HaveSendCount--;
//杩欓噷鏄噸鍙戜袱娆�
- while (Packet.HaveSendCount < 3)
+ while (packet.HaveSendCount < 3)
{
- if (Packet.FlagDateTime.AddMilliseconds(1000).Ticks <= DateTime.Now.Ticks)
+ if (packet.FlagDateTime.AddMilliseconds(1000).Ticks <= DateTime.Now.Ticks)
{
MainPage.Log("閲嶅彂鏁版嵁:" + SendFlag);
- UdpSocket._BusSocket.AsyncBeginSend(Packet);
+ UdpSocket._BusSocket.AsyncBeginSend(packet);
controlLostCount++;
}
System.Threading.Thread.Sleep(100);
@@ -689,7 +744,7 @@
/// <summary>
/// 褰撳墠鏁版嵁鍖�
/// </summary>
- Packet Packet;
+ Packet packet;
/// <summary>
/// 璁板綍鍙戦�佹暟鎹寘
/// </summary>
@@ -742,14 +797,14 @@
{
try
{
- Packet = new Packet(target.SendBytes, target.IPEndPoint);
- Packet.HaveSendCount = 3 - sendCount;
+ packet = new Packet(target.SendBytes, target.IPEndPoint);
+ packet.HaveSendCount = 3 - sendCount;
signPacket(target);
System.Threading.Thread thread = new System.Threading.Thread(new System.Threading.ParameterizedThreadStart(managerSendCount));
thread.IsBackground = true;
- thread.Start(Packet);
+ thread.Start(packet);
if (isWait)
{
@@ -769,18 +824,17 @@
{
try
{
- var sendJob = new JObject { { "id", msg_id.ToString() }, { "time_stamp", (DateTime.Now.Ticks / 10000).ToString() } };
+ var sendJob = new JObject { { "id", Control.Ins.msg_id.ToString() }, { "time_stamp", (DateTime.Now.Ticks / 100000).ToString() } };
var bodyString = JsonConvert.SerializeObject(sendJob);
- var bodyBytes = Encoding.ASCII.GetBytes(bodyString);
- var sendBytes = A_Protocal_Common.apc.ConvertSendBodyData(CommunicationTopic.SearchLoaclGateway, bodyString);
+
+ 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锛氭病鏈夐噸鍙戯紝鍚庢湡鏈夋椂闂村彲浠ュ鍔犻噸鍙戝垽鏂�
+ packet = new Packet(sendBytes, new System.Net.IPEndPoint(System.Net.IPAddress.Parse("239.0.168.188"), 8585));
+ packet.HaveSendCount = 4;//ps锛氭病鏈夐噸鍙戯紝鍚庢湡鏈夋椂闂村彲浠ュ鍔犻噸鍙戝垽鏂�
System.Threading.Thread thread = new System.Threading.Thread(new System.Threading.ParameterizedThreadStart(managerSendCount));
thread.IsBackground = true;
- thread.Start(Packet);
-
- wait();
+ thread.Start(packet);
+ //wait();涓嶉渶瑕佺瓑寰�
}
catch (Exception ex)
{
@@ -789,5 +843,22 @@
}
+ /// <summary>
+ /// 鍙戦�乽dp A鍗忚鏁版嵁
+ /// </summary>
+ public void SendLocalHdlLinkData(byte[] sendBytes,string id, bool isWait=false)
+ {
+ packet = new Packet(sendBytes, new System.Net.IPEndPoint(System.Net.IPAddress.Parse(Control.Ins.reportIp), 8585));
+ 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");
+ }
}
+
}
--
Gitblit v1.8.0