From 98ceb6bd2021f9ff136cda27eef28676dd7b5d92 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 21 五月 2020 13:24:02 +0800
Subject: [PATCH] 最后的版本
---
ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
index 5fb22cb..367c79d 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
@@ -196,7 +196,6 @@
getGatewayBaseInfo = new ZbGateway.GatewayBaseInfo
{
IpAddress = ipAddress,
- Time = time,
GwName = gwName,
HomeId = homeID,
IsMainGateWay = isMainGateWay,
@@ -248,7 +247,6 @@
else
{
gateWay.PubKey = pubKey;
- gateWay.getGatewayBaseInfo.Time = time;
gateWay.getGatewayBaseInfo.GwName = gwName;
gateWay.getGatewayBaseInfo.HomeId = homeID;
await gateWay.StartLocalMqtt(ipAddress);
@@ -335,7 +333,7 @@
public static class FindGateWaySocket
{
//鏈湴Socket
- public static System.Net.Sockets.Socket busSocket;
+ public static Socket busSocket;
/// <summary>
/// 鍚姩Socket鎺ユ敹鍜屽彂閫佸姛鑳�
@@ -381,7 +379,7 @@
{
get
{
- return null == busSocket ? false : true;
+ return busSocket == null ? false : true;
}
}
--
Gitblit v1.8.0