From 515231f69d68cfea8c671db28a2918337f65d7c2 Mon Sep 17 00:00:00 2001 From: okjack Date: Wed, 12 Jun 2024 08:52:33 +0800 Subject: [PATCH] Clean code --- .../com/fongmi/android/tv/bean}/CastVideo.java | 2 +- .../com/fongmi/android/tv/bean/Device.java | 8 ++++++++ .../fongmi/android/tv/event}/ScanEvent.java | 2 +- .../com/fongmi/android/tv/utils}/ScanTask.java | 2 +- .../android/tv/ui/activity/LiveActivity.java | 2 +- .../android/tv/ui/activity/ScanActivity.java | 2 +- .../android/tv/ui/activity/VideoActivity.java | 2 +- .../android/tv/ui/dialog/CastDialog.java | 18 +++++++++--------- .../android/tv/ui/dialog/SyncDialog.java | 4 ++-- .../android/tv/ui/dialog/TransmitDialog.java | 4 ++-- .../CastDevice.java => utils/DLNADevice.java} | 10 +++++----- 11 files changed, 32 insertions(+), 24 deletions(-) rename app/src/{mobile/java/com/fongmi/android/tv/cast => main/java/com/fongmi/android/tv/bean}/CastVideo.java (95%) rename app/src/{mobile/java/com/fongmi/android/tv/cast => main/java/com/fongmi/android/tv/event}/ScanEvent.java (90%) rename app/src/{mobile/java/com/fongmi/android/tv/cast => main/java/com/fongmi/android/tv/utils}/ScanTask.java (98%) rename app/src/mobile/java/com/fongmi/android/tv/{cast/CastDevice.java => utils/DLNADevice.java} (90%) diff --git a/app/src/mobile/java/com/fongmi/android/tv/cast/CastVideo.java b/app/src/main/java/com/fongmi/android/tv/bean/CastVideo.java similarity index 95% rename from app/src/mobile/java/com/fongmi/android/tv/cast/CastVideo.java rename to app/src/main/java/com/fongmi/android/tv/bean/CastVideo.java index 293c63a67..10c66eb15 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/cast/CastVideo.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/CastVideo.java @@ -1,4 +1,4 @@ -package com.fongmi.android.tv.cast; +package com.fongmi.android.tv.bean; import android.net.Uri; diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Device.java b/app/src/main/java/com/fongmi/android/tv/bean/Device.java index f56bc8d8e..3bd5a7b4f 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Device.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Device.java @@ -41,6 +41,14 @@ public class Device { return device; } + public static Device get(org.fourthline.cling.model.meta.Device item) { + Device device = new Device(); + device.setUuid(item.getIdentity().getUdn().getIdentifierString()); + device.setName(item.getDetails().getFriendlyName()); + device.setType(2); + return device; + } + public static Device objectFrom(String str) { return App.gson().fromJson(str, Device.class); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/cast/ScanEvent.java b/app/src/main/java/com/fongmi/android/tv/event/ScanEvent.java similarity index 90% rename from app/src/mobile/java/com/fongmi/android/tv/cast/ScanEvent.java rename to app/src/main/java/com/fongmi/android/tv/event/ScanEvent.java index 3a16ead01..511182412 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/cast/ScanEvent.java +++ b/app/src/main/java/com/fongmi/android/tv/event/ScanEvent.java @@ -1,4 +1,4 @@ -package com.fongmi.android.tv.cast; +package com.fongmi.android.tv.event; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/mobile/java/com/fongmi/android/tv/cast/ScanTask.java b/app/src/main/java/com/fongmi/android/tv/utils/ScanTask.java similarity index 98% rename from app/src/mobile/java/com/fongmi/android/tv/cast/ScanTask.java rename to app/src/main/java/com/fongmi/android/tv/utils/ScanTask.java index 193a207cd..bc39c3394 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/cast/ScanTask.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/ScanTask.java @@ -1,4 +1,4 @@ -package com.fongmi.android.tv.cast; +package com.fongmi.android.tv.utils; import com.fongmi.android.tv.App; import com.fongmi.android.tv.bean.Device; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index d8ee7ddc0..46edb9faf 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -35,7 +35,7 @@ import com.fongmi.android.tv.bean.Group; import com.fongmi.android.tv.bean.Keep; import com.fongmi.android.tv.bean.Live; import com.fongmi.android.tv.bean.Track; -import com.fongmi.android.tv.cast.CastVideo; +import com.fongmi.android.tv.bean.CastVideo; import com.fongmi.android.tv.databinding.ActivityLiveBinding; import com.fongmi.android.tv.event.ActionEvent; import com.fongmi.android.tv.event.ErrorEvent; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/ScanActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/ScanActivity.java index 41c8ad425..e9835572e 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/ScanActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/ScanActivity.java @@ -8,7 +8,7 @@ import android.os.Bundle; import androidx.annotation.NonNull; import androidx.viewbinding.ViewBinding; -import com.fongmi.android.tv.cast.ScanEvent; +import com.fongmi.android.tv.event.ScanEvent; import com.fongmi.android.tv.databinding.ActivityScanBinding; import com.fongmi.android.tv.ui.base.BaseActivity; import com.fongmi.android.tv.utils.Util; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index 7b53bee91..38edaa7a0 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -54,7 +54,7 @@ import com.fongmi.android.tv.bean.Site; import com.fongmi.android.tv.bean.Sub; import com.fongmi.android.tv.bean.Track; import com.fongmi.android.tv.bean.Vod; -import com.fongmi.android.tv.cast.CastVideo; +import com.fongmi.android.tv.bean.CastVideo; import com.fongmi.android.tv.databinding.ActivityVideoBinding; import com.fongmi.android.tv.db.AppDatabase; import com.fongmi.android.tv.event.ActionEvent; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/CastDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/CastDialog.java index 937792546..49269e5ec 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/CastDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/CastDialog.java @@ -22,10 +22,10 @@ import com.fongmi.android.tv.R; import com.fongmi.android.tv.api.config.VodConfig; import com.fongmi.android.tv.bean.Device; import com.fongmi.android.tv.bean.History; -import com.fongmi.android.tv.cast.CastDevice; -import com.fongmi.android.tv.cast.CastVideo; -import com.fongmi.android.tv.cast.ScanEvent; -import com.fongmi.android.tv.cast.ScanTask; +import com.fongmi.android.tv.utils.DLNADevice; +import com.fongmi.android.tv.bean.CastVideo; +import com.fongmi.android.tv.event.ScanEvent; +import com.fongmi.android.tv.utils.ScanTask; import com.fongmi.android.tv.databinding.DialogDeviceBinding; import com.fongmi.android.tv.server.Server; import com.fongmi.android.tv.ui.activity.ScanActivity; @@ -128,7 +128,7 @@ public class CastDialog extends BaseDialog implements DeviceAdapter.OnClickListe private void getDevice() { if (fm) adapter.addAll(Device.getAll()); - adapter.addAll(CastDevice.get().getAll()); + adapter.addAll(DLNADevice.get().getAll()); } private void initDLNA() { @@ -163,12 +163,12 @@ public class CastDialog extends BaseDialog implements DeviceAdapter.OnClickListe @Override public void onDeviceAdded(@NonNull org.fourthline.cling.model.meta.Device device) { - adapter.addAll(CastDevice.get().add(device)); + adapter.addAll(DLNADevice.get().add(device)); } @Override public void onDeviceRemoved(@NonNull org.fourthline.cling.model.meta.Device device) { - adapter.remove(CastDevice.get().remove(device)); + adapter.remove(DLNADevice.get().remove(device)); } @Override @@ -205,14 +205,14 @@ public class CastDialog extends BaseDialog implements DeviceAdapter.OnClickListe @Override public void onItemClick(Device item) { - if (item.isDLNA()) control = DLNACastManager.INSTANCE.connectDevice(CastDevice.get().find(item), this); + if (item.isDLNA()) control = DLNACastManager.INSTANCE.connectDevice(DLNADevice.get().find(item), this); else OkHttp.newCall(client, item.getIp().concat("/action?do=cast"), body.build()).enqueue(this); } @Override public void onDestroyView() { super.onDestroyView(); - CastDevice.get().disconnect(); + DLNADevice.get().disconnect(); EventBus.getDefault().unregister(this); DLNACastManager.INSTANCE.unregisterListener(this); DLNACastManager.INSTANCE.unbindCastService(App.get()); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SyncDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SyncDialog.java index 86826ac10..123c8a1ca 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SyncDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SyncDialog.java @@ -17,8 +17,8 @@ import com.fongmi.android.tv.bean.Config; import com.fongmi.android.tv.bean.Device; import com.fongmi.android.tv.bean.History; import com.fongmi.android.tv.bean.Keep; -import com.fongmi.android.tv.cast.ScanEvent; -import com.fongmi.android.tv.cast.ScanTask; +import com.fongmi.android.tv.event.ScanEvent; +import com.fongmi.android.tv.utils.ScanTask; import com.fongmi.android.tv.databinding.DialogDeviceBinding; import com.fongmi.android.tv.impl.Callback; import com.fongmi.android.tv.ui.activity.ScanActivity; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/TransmitDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/TransmitDialog.java index 8c79405c6..deca1e626 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/TransmitDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/TransmitDialog.java @@ -13,8 +13,8 @@ import com.fongmi.android.tv.App; import com.fongmi.android.tv.Constant; import com.fongmi.android.tv.api.config.VodConfig; import com.fongmi.android.tv.bean.Device; -import com.fongmi.android.tv.cast.ScanEvent; -import com.fongmi.android.tv.cast.ScanTask; +import com.fongmi.android.tv.event.ScanEvent; +import com.fongmi.android.tv.utils.ScanTask; import com.fongmi.android.tv.databinding.DialogDeviceBinding; import com.fongmi.android.tv.impl.Callback; import com.fongmi.android.tv.server.Server; diff --git a/app/src/mobile/java/com/fongmi/android/tv/cast/CastDevice.java b/app/src/mobile/java/com/fongmi/android/tv/utils/DLNADevice.java similarity index 90% rename from app/src/mobile/java/com/fongmi/android/tv/cast/CastDevice.java rename to app/src/mobile/java/com/fongmi/android/tv/utils/DLNADevice.java index 0ea51b2c4..5a25645d0 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/cast/CastDevice.java +++ b/app/src/mobile/java/com/fongmi/android/tv/utils/DLNADevice.java @@ -1,4 +1,4 @@ -package com.fongmi.android.tv.cast; +package com.fongmi.android.tv.utils; import com.android.cast.dlna.dmc.DLNACastManager; import com.fongmi.android.tv.bean.Device; @@ -6,19 +6,19 @@ import com.fongmi.android.tv.bean.Device; import java.util.ArrayList; import java.util.List; -public class CastDevice { +public class DLNADevice { private final List> devices; private static class Loader { - static volatile CastDevice INSTANCE = new CastDevice(); + static volatile DLNADevice INSTANCE = new DLNADevice(); } - public static CastDevice get() { + public static DLNADevice get() { return Loader.INSTANCE; } - public CastDevice() { + public DLNADevice() { this.devices = new ArrayList<>(); }