From 64b84c33e8733228c624d07229026470497eb417 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 22 十二月 2020 10:41:16 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL_ON/DAL/DriverLayer/Control.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 1883b20..8e434c9 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -225,6 +225,8 @@
//鏈湴鎼滅储涓嶅埌缃戝叧
if (!Ins.IsRemote)
{
+ //杩炴帴mqtt鍓嶏紝鍏堟柇寮�--2020-12-21
+ DAL.Mqtt.MqttClient.DisConnectRemote();
Ins.IsRemote = true;
DAL.Mqtt.MqttClient.InitState();
}
@@ -567,7 +569,7 @@
localAttr.curValue = attr.value;
}
}
- MainPage.Log($"{localSwitch.trait_on_off.curValue}: ");
+ //rgb.lastState = Language.StringByID(StringId.Brightness) + " : " + rgb.brightness + "%";
RelayPage.UpdataState(localSwitch);
}
break;
@@ -638,7 +640,7 @@
}
}
lightCCT.lastState = Language.StringByID(StringId.Brightness) + " : " + lightCCT.brightness + "%";
- DimmerPage.UpdataStates(lightCCT);
+ ColorTureLampPage.UpdataStates(lightCCT);
}
break;
case SPK.CurtainSwitch:
--
Gitblit v1.8.0