Commit 9bfde766 by xjp0422

no message

parent 55d27899
No preview for this file type
...@@ -40,7 +40,8 @@ namespace Mqtt_AGI ...@@ -40,7 +40,8 @@ namespace Mqtt_AGI
//由level_uid生成level_system_uid 和 //由level_uid生成level_system_uid 和
public static string SerilizeString(string level_uid, systemID system) public static string SerilizeString(string level_uid, systemID system)
{ {
return Convert.ToString((Convert.ToUInt32(level_uid,2) | (((uint)system) << 16) ), 2).PadLeft(32, '0'); return level_uid +"/" +((int)system).ToString();
//return Convert.ToString((Convert.ToUInt32(level_uid,2) | (((uint)system) << 16) ), 2).PadLeft(32, '0');
} }
} }
} }
...@@ -58,8 +58,8 @@ namespace Mqtt_AGI ...@@ -58,8 +58,8 @@ namespace Mqtt_AGI
GetPrivateProfileString("role", "level1", "0", level1, 16, IniPath); GetPrivateProfileString("role", "level1", "0", level1, 16, IniPath);
GetPrivateProfileString("role", "level2", "0", level2, 16, IniPath); GetPrivateProfileString("role", "level2", "0", level2, 16, IniPath);
GetPrivateProfileString("role", "level3", "0", level3, 16, IniPath); GetPrivateProfileString("role", "level3", "0", level3, 16, IniPath);
Console.WriteLine(SerializeUid.SerilizeString(Convert.ToUInt32(level1.ToString()), Convert.ToUInt32(level2.ToString()), Convert.ToUInt32(level3.ToString()))); //Console.WriteLine(SerializeUid.SerilizeString(Convert.ToUInt32(level1.ToString()), Convert.ToUInt32(level2.ToString()), Convert.ToUInt32(level3.ToString())));
return SerializeUid.SerilizeString(Convert.ToUInt32(level1.ToString()), Convert.ToUInt32(level2.ToString()), Convert.ToUInt32(level3.ToString())); return Convert.ToUInt32(level1.ToString())+"/" +Convert.ToUInt32(level2.ToString())+ "/"+Convert.ToUInt32(level3.ToString());
//Console.WriteLine(Convert.ToString(subTopic,2).PadLeft(32,'0'));//32位 前面补0 //Console.WriteLine(Convert.ToString(subTopic,2).PadLeft(32,'0'));//32位 前面补0
} }
...@@ -141,8 +141,10 @@ namespace Mqtt_AGI ...@@ -141,8 +141,10 @@ namespace Mqtt_AGI
{ {
client.Connect(clientId, "", "", false, 30); client.Connect(clientId, "", "", false, 30);
//level1/level2/level3/system //level1/level2/level3/system
Console.WriteLine("Subscribe:" + SerializeUid.SerilizeString(LevelUid, systemID.AGI));
client.Subscribe(new string[] { SerializeUid.SerilizeString(LevelUid, systemID.AGI) }, new byte[] { MqttMsgBase.QOS_LEVEL_EXACTLY_ONCE }); client.Subscribe(new string[] { SerializeUid.SerilizeString(LevelUid, systemID.AGI) }, new byte[] { MqttMsgBase.QOS_LEVEL_EXACTLY_ONCE });
//client.Subscribe(new string[] { SerializeUid.SerilizeString(LevelUid, systemID.AGI) }, new byte[] { MqttMsgBase.QOS_LEVEL_EXACTLY_ONCE });
client.Subscribe(new string[] { "xyz_topic_parameter" }, new byte[] { MqttMsgBase.QOS_LEVEL_EXACTLY_ONCE }); client.Subscribe(new string[] { "xyz_topic_parameter" }, new byte[] { MqttMsgBase.QOS_LEVEL_EXACTLY_ONCE });
//client.Subscribe(new string[] { SerializeUid.SerilizeString(LevelUid, systemID.AGI) }, new byte[] { MqttMsgBase.QOS_LEVEL_EXACTLY_ONCE }); //client.Subscribe(new string[] { SerializeUid.SerilizeString(LevelUid, systemID.AGI) }, new byte[] { MqttMsgBase.QOS_LEVEL_EXACTLY_ONCE });
Console.WriteLine("Connect state:" + client.IsConnected); Console.WriteLine("Connect state:" + client.IsConnected);
...@@ -246,7 +248,7 @@ namespace Mqtt_AGI ...@@ -246,7 +248,7 @@ namespace Mqtt_AGI
//加载数据段 //加载数据段
Any Parameter = Any.Pack(calctleret); Any Parameter = Any.Pack(calctleret);
MessageSend.Parameters.Add(Parameter); MessageSend.Parameters.Add(Parameter);
client.Publish(SerializeUid.SerilizeString(LevelUid, systemID.SERVER), MessageSend.ToByteArray()); client.Publish(SerializeUid.SerilizeString(LevelUid, systemID.SERVER), MessageSend.ToByteArray());
...@@ -575,7 +577,6 @@ namespace Mqtt_AGI ...@@ -575,7 +577,6 @@ namespace Mqtt_AGI
client.Publish(SerializeUid.SerilizeString(LevelUid, systemID.SERVER), MessageSend.ToByteArray()); client.Publish(SerializeUid.SerilizeString(LevelUid, systemID.SERVER), MessageSend.ToByteArray());
//protobuf end //protobuf end
//CalcRetJson.Add("tasks", ReportArray); //CalcRetJson.Add("tasks", ReportArray);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment