From 23ee4f8c373f9abecf079ef9d4297d8b6cd8d5e6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 16 十二月 2020 15:16:00 +0800
Subject: [PATCH] Merge branch 'NewFilePath'

---
 HDL_ON/DAL/DriverLayer/Packet.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/HDL_ON/DAL/DriverLayer/Packet.cs b/HDL_ON/DAL/DriverLayer/Packet.cs
index 78c1cd2..b094ea1 100644
--- a/HDL_ON/DAL/DriverLayer/Packet.cs
+++ b/HDL_ON/DAL/DriverLayer/Packet.cs
@@ -309,7 +309,7 @@
                             if (ac.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
                             {
                                 ac.curTempType = receiveBytes[1];
-                                ac.indoorTemp = receiveBytes[2];
+                                ac.trait_IndoorTemp.curValue = receiveBytes[2];
                                 ac.trait_on_off.curValue = receiveBytes[8] == 1 ? "on" : "off";
                                 ac.curModeIndex = receiveBytes[9];
                                 ac.curFanIndex = receiveBytes[10];
@@ -563,7 +563,7 @@
                         {
                             if (ac.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
                             {
-                                ac.indoorTemp = receiveBytes[1];
+                                ac.trait_IndoorTemp.curValue = receiveBytes[1];
                                 FunctionPage.UpdataStates(ac);
                             }
                         }
@@ -574,8 +574,8 @@
                         MainPage.Log($"name : {Name} ; mac : {mac}");
                         if (DB_ResidenceData.Instance.residenceGatewayMAC == mac)
                         {
-                            DriverLayer.Control.Ins.GatewayOnline = true;
-                            DriverLayer.Control.Ins.IsRemote = false;
+                            Control.Ins.GatewayOnline = true;
+                            Control.Ins.IsRemote = false;
                             DAL.Mqtt.MqttClient.DisConnectRemote();//鏂紑mqtt
                         }
                         break;

--
Gitblit v1.8.0