From 4c17caa61bc3b0a05a2b303bccdfedfbf3853f6d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 24 十一月 2020 15:58:10 +0800
Subject: [PATCH] 2020-11-24 1.优化登录界面失败提示。
---
HDL_ON/DriverLayer/UdpSocket.cs | 32 ++++++++------------------------
1 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/HDL_ON/DriverLayer/UdpSocket.cs b/HDL_ON/DriverLayer/UdpSocket.cs
index 72d7db5..3a3758f 100644
--- a/HDL_ON/DriverLayer/UdpSocket.cs
+++ b/HDL_ON/DriverLayer/UdpSocket.cs
@@ -27,7 +27,7 @@
{
get
{
- if (MainPage.LoginUser != null && Entity.DB_ResidenceData.residenceData != null)
+ if ( UserInfo.Current != null && Entity.DB_ResidenceData.residenceData != null)
{
return Entity.DB_ResidenceData.residenceData.GatewayType == 0 ? 6000 : 8585;
}
@@ -52,14 +52,14 @@
try {
busSocket.Bind (new IPEndPoint (IPAddress.Any, port));
- busSocket.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.AddMembership, new MulticastOption(IPAddress.Parse("224.0.168.188")));
+ busSocket.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.AddMembership, new MulticastOption(IPAddress.Parse("239.0.168.188")));
}
catch{
busSocket = null;
return;
}
- asyncBeginReceive ();
+ asyncBeginReceive();
MainPage.Log ($"udp port : {port}");
}
@@ -113,6 +113,10 @@
Console.WriteLine($"asyncBeginReceive {e.Message}");
}
}
+ /// <summary>
+ /// 鎼滅储缃戠粶璁惧瑙﹀彂鐨勫洖璋冧簨浠�
+ /// </summary>
+ public Action<string> SearchNetDeviceAction;
/// <summary>
/// 寮傛鎺ユ敹鏁版嵁缁撴潫
@@ -148,27 +152,7 @@
jt.TryGetValue("objects", out jto);
if (jto != null)
{
- var jt2 = Newtonsoft.Json.JsonConvert.DeserializeObject<JObject>(jto.ToString());
- JToken model_id = null;
- jt2.TryGetValue("model_id", out model_id);
- if (model_id != null)
- {
- if (model_id.ToString() == "")//Bus缃戝叧
- {
- var revIp = jt2.GetValue("ip_address").ToString();
- var revMac = jt2.GetValue("device_mac").ToString();
- var revName = jt2.GetValue("device_name").ToString();
- //if (revIp == Entity.DB_ResidenceData.residenceData.residenceGatewayMAC)
- {
- DriverLayer.Control.ins.reportIp = revIp;
- DriverLayer.Control.ins.ChangeCommunicationMode(DriverLayer.CommunicationMode.tcp_local_client);
- }
- }
- else if (model_id.ToString() == "4")//澹板繀鍙闊抽潰鏉�
- {
-
- }
- }
+ SearchNetDeviceAction?.Invoke(jto.ToString());
}
}
}
--
Gitblit v1.8.0