From 1293fea19c6a2b558986856e301d5218c1979692 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:08:43 +0800
Subject: [PATCH] Revert "20201127 接受bus数据修改完成，搜索网关、一端口修改完成"
---
HDL_ON/Entity/DB_ResidenceData.cs | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 2c4bde6..489d7d3 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -1,7 +1,5 @@
锘縰sing System;
using System.Collections.Generic;
-using HDL_ON.DAL;
-using HDL_ON.DAL.Net;
using Shared;
namespace HDL_ON.Entity
@@ -409,7 +407,7 @@
ins_Function = null;
if (MainPage.IsRemote)
{
- Mqtt_Cloud.DisConnectRemoteMqttClient("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
+ DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
}
}
@@ -420,7 +418,7 @@
/// <summary>
/// 褰撳墠浣忓畢鐨勭綉鍏矼AC
/// </summary>
- public string residenceGatewayMAC = "0281B9078C000000";// "00964E19C4467B1E";
+ public string residenceGatewayMAC = "4E47323347591243";//"0281B9078C000000";// "00964E19C4467B1E";
/// <summary>
/// 淇濆瓨浣忓畢鏁版嵁
/// </summary>
@@ -672,7 +670,7 @@
case FunctionCategory.Thermostat:
if (DB_ResidenceData.residenceData.GatewayType == 0)
{
- DriverLayer.Control.ins.SendReadCommand(function);
+ DriverLayer.Control.Ins.SendReadCommand(function);
}
break;
}
--
Gitblit v1.8.0