From 1877d455d7a8fbb0d05d75ed5a341b8e3579acbd Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期四, 02 四月 2026 16:23:47 +0800
Subject: [PATCH] 新服务器
---
SmartHome/UI/SimpleControl/CommonPage.cs | 50 +++++++++++++++-----------------------------------
1 files changed, 15 insertions(+), 35 deletions(-)
diff --git a/SmartHome/UI/SimpleControl/CommonPage.cs b/SmartHome/UI/SimpleControl/CommonPage.cs
index f422a89..cbdf35d 100644
--- a/SmartHome/UI/SimpleControl/CommonPage.cs
+++ b/SmartHome/UI/SimpleControl/CommonPage.cs
@@ -86,45 +86,25 @@
List<byte> ButtonBkeyModelList = new List<byte> ();
switch (command) {
case Command.ReadRemarkACK:
- if(supportList.Contains(deviceTypeNumber)) {
- //if (IsRemote) {
- // if (remoteIp.ToString().Contains("118.31.3.103") || remoteIp.ToString ().Contains ("157.175.231.123"))
- // lock (GateWayList_NewServer) {
- // if (GateWayList_NewServer.Find ((l) => { return l.SubnetID == subnetID && l.DeviceID == deviceID; }) != null) {
- // return;
- // }
- // DeviceType deviceType = (DeviceType)(usefullBytes [2] * 256 + usefullBytes [3]);
- // GatewayBase gatewayBase = new GatewayBase ();
- // gatewayBase.DeviceTypeNumber = deviceTypeNumber;
- // gatewayBase.SubnetID = subnetID;
- // gatewayBase.DeviceID = deviceID;
- // gatewayBase.Type = deviceType;
- // gatewayBase.Name = MyEncodingGB2312.GetString (usefullBytes, 0, 20).Trim ('\0');//=============
- // GateWayList_NewServer.Add (gatewayBase);
- // Console.WriteLine ($"name:{gatewayBase.Name}++{deviceTypeNumber}");
- // }
- //} else
- {
- lock (GateWayList) {
- if (GateWayList.Find ((l) => { return l.SubnetID == subnetID && l.DeviceID == deviceID; }) != null) {
- return;
- }
- DeviceType deviceType = (DeviceType)(usefullBytes [2] * 256 + usefullBytes [3]);
- GatewayBase gatewayBase = new GatewayBase ();
- gatewayBase.DeviceTypeNumber = deviceTypeNumber;
- gatewayBase.SubnetID = subnetID;
- gatewayBase.DeviceID = deviceID;
- gatewayBase.Type = deviceType;
- gatewayBase.Name = MyEncodingGB2312.GetString (usefullBytes, 0, 20).Trim ('\0');//=============
- var name = Encoding.Default.GetString (usefullBytes, 0, 20).Trim ('\0');
- GateWayList.Add (gatewayBase);
-
- Console.WriteLine ($"name:{gatewayBase.Name}++{deviceTypeNumber}");
+ if (supportList.Contains (deviceTypeNumber)) {
+ lock (GateWayList) {
+ if (GateWayList.Find ((l) => { return l.SubnetID == subnetID && l.DeviceID == deviceID; }) != null) {
+ return;
}
+ DeviceType deviceType = (DeviceType)(usefullBytes [2] * 256 + usefullBytes [3]);
+ GatewayBase gatewayBase = new GatewayBase ();
+ gatewayBase.DeviceTypeNumber = deviceTypeNumber;
+ gatewayBase.SubnetID = subnetID;
+ gatewayBase.DeviceID = deviceID;
+ gatewayBase.Type = deviceType;
+ gatewayBase.Name = MyEncodingGB2312.GetString (usefullBytes, 0, 20).Trim ('\0');//=============
+ var name = Encoding.Default.GetString (usefullBytes, 0, 20).Trim ('\0');
+ GateWayList.Add (gatewayBase);
+
+ Console.WriteLine ($"name:{gatewayBase.Name}++{deviceTypeNumber}");
}
}
break;
-
case Command.WriteWirelessPanelButtonKey:
//01 01 59(+30) 02 0D 03 64 00 01
break;
--
Gitblit v1.8.0