demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-25 14:55:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Yeelight] Fix disconnect method (#14670)

Browse Source 
* fix disconnect

---------

Signed-off-by: Alexandr Salamatov <goopilot@gmail.com>
This commit is contained in:
goopilot 2023-03-26 05:16:09 -05:00 committed by GitHub
parent 43f016c98a
commit 6757a84b6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bundles/org.openhab.binding.yeelight/src/main/java/org/openhab/binding/yeelight/internal/handler/YeelightHandlerBase.java
View File

@ -80,6 +80,11 @@ public abstract class YeelightHandlerBase extends BaseThingHandler
DeviceManager.getInstance().startDiscovery(15 * 1000);
}
@Override
public void dispose() {
mDevice.disconnect();
}
private DeviceType getDeviceModel(ThingTypeUID typeUID) {
if (typeUID.equals(THING_TYPE_CEILING)) {
return DeviceType.ceiling;

5
bundles/org.openhab.binding.yeelight/src/main/java/org/openhab/binding/yeelight/internal/lib/device/DeviceBase.java
View File

@ -299,6 +299,11 @@ public abstract class DeviceBase {
mConnection.connect();
}
public void disconnect() {
setConnectionState(ConnectState.DISCONNECTED);
mConnection.disconnect();
}
public void setConnectionState(ConnectState connectState) {
logger.debug("{}: set connection state to: {}", TAG, connectState.name());
if (connectState == ConnectState.DISCONNECTED) {

16
bundles/org.openhab.binding.yeelight/src/main/java/org/openhab/binding/yeelight/internal/lib/device/connection/WifiConnection.java
View File

@ -128,6 +128,20 @@ public class WifiConnection implements ConnectionBase {
@Override
public boolean disconnect() {
mDevice.setAutoConnect(false);
return false;
mCmdRun = false;
try {
if (mConnectThread != null) {
mConnectThread.interrupt();
}
if (mSocket != null) {
mSocket.close();
}
} catch (Exception e) {
logger.debug("Exception while terminating connection", e);
} finally {
mSocket = null;
mDevice.setConnectionState(ConnectState.DISCONNECTED);
}
return true;
}
}