diff --git a/app/src/mobile/java/com/fongmi/android/tv/cast/CastDevice.java b/app/src/mobile/java/com/fongmi/android/tv/cast/CastDevice.java index 85c3b6922..0ea51b2c4 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/cast/CastDevice.java +++ b/app/src/mobile/java/com/fongmi/android/tv/cast/CastDevice.java @@ -51,9 +51,8 @@ public class CastDevice { return create(device); } - public void clear() { + public void disconnect() { for (org.fourthline.cling.model.meta.Device device : devices) DLNACastManager.INSTANCE.disconnectDevice(device); - devices.clear(); } public org.fourthline.cling.model.meta.Device find(com.fongmi.android.tv.bean.Device item) { diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/CastDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/CastDialog.java index 8f5f2efb3..a72dbb975 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/CastDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/CastDialog.java @@ -58,7 +58,6 @@ public class CastDialog extends BaseDialog implements DeviceAdapter.OnClickListe private DeviceAdapter adapter; private DeviceControl control; private CastVideo video; - private long position; private boolean fm; public static CastDialog create() { @@ -79,7 +78,6 @@ public class CastDialog extends BaseDialog implements DeviceAdapter.OnClickListe if (fd.startsWith("file")) fd = Server.get().getAddress() + "/" + fd.replace(Path.rootPath(), ""); if (fd.contains("127.0.0.1")) fd = fd.replace("127.0.0.1", Server.get().getIP()); body.add("history", history.toString().replace(id, fd)); - position = history.getPosition(); return this; } @@ -125,6 +123,7 @@ public class CastDialog extends BaseDialog implements DeviceAdapter.OnClickListe private void getDevice() { if (fm) adapter.addAll(Device.getAll()); + adapter.addAll(CastDevice.get().getAll()); } private void initDLNA() { @@ -203,7 +202,7 @@ public class CastDialog extends BaseDialog implements DeviceAdapter.OnClickListe @Override public void onDestroyView() { super.onDestroyView(); - CastDevice.get().clear(); + CastDevice.get().disconnect(); EventBus.getDefault().unregister(this); DLNACastManager.INSTANCE.unregisterListener(this); DLNACastManager.INSTANCE.unbindCastService(App.get());