From b9daaece938efafc546ce548410bf27316342162 Mon Sep 17 00:00:00 2001 From: jhengazuki Date: Thu, 28 Aug 2025 02:46:18 +0800 Subject: [PATCH] Clean --- app/src/main/java/com/fongmi/android/tv/bean/Channel.java | 3 +-- app/src/main/java/com/fongmi/android/tv/bean/Class.java | 3 +-- app/src/main/java/com/fongmi/android/tv/bean/Config.java | 3 +-- app/src/main/java/com/fongmi/android/tv/bean/Device.java | 3 +-- app/src/main/java/com/fongmi/android/tv/bean/Episode.java | 3 +-- app/src/main/java/com/fongmi/android/tv/bean/Flag.java | 3 +-- app/src/main/java/com/fongmi/android/tv/bean/Group.java | 3 +-- app/src/main/java/com/fongmi/android/tv/bean/Live.java | 3 +-- app/src/main/java/com/fongmi/android/tv/bean/Parse.java | 3 +-- app/src/main/java/com/fongmi/android/tv/bean/Site.java | 3 +-- app/src/main/java/com/fongmi/android/tv/bean/Value.java | 3 +-- app/src/main/java/com/fongmi/android/tv/bean/Vod.java | 3 +-- catvod/src/main/java/com/github/catvod/bean/Doh.java | 3 +-- 13 files changed, 13 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Channel.java b/app/src/main/java/com/fongmi/android/tv/bean/Channel.java index 261a985a3..9ba6d4c92 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Channel.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Channel.java @@ -385,8 +385,7 @@ public class Channel { @Override public boolean equals(Object obj) { if (this == obj) return true; - if (!(obj instanceof Channel)) return false; - Channel it = (Channel) obj; + if (!(obj instanceof Channel it)) return false; if (!getName().isEmpty()) return getName().equals(it.getName()); if (!getNumber().isEmpty()) return getNumber().equals(it.getNumber()); return getName().equals(it.getName()) && getNumber().equals(it.getNumber()); diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Class.java b/app/src/main/java/com/fongmi/android/tv/bean/Class.java index 46fe01677..9f97808f0 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Class.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Class.java @@ -142,8 +142,7 @@ public class Class implements Parcelable { @Override public boolean equals(Object obj) { if (this == obj) return true; - if (!(obj instanceof Class)) return false; - Class it = (Class) obj; + if (!(obj instanceof Class it)) return false; return getTypeId().equals(it.getTypeId()); } diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Config.java b/app/src/main/java/com/fongmi/android/tv/bean/Config.java index 2c2e2dfb5..af40e0552 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Config.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Config.java @@ -276,8 +276,7 @@ public class Config { @Override public boolean equals(Object obj) { if (this == obj) return true; - if (!(obj instanceof Config)) return false; - Config it = (Config) obj; + if (!(obj instanceof Config it)) return false; return getId() == it.getId(); } } 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 158670406..dfb80cb0b 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 @@ -165,8 +165,7 @@ public class Device { @Override public boolean equals(Object obj) { if (this == obj) return true; - if (!(obj instanceof Device)) return false; - Device it = (Device) obj; + if (!(obj instanceof Device it)) return false; return getUuid().equals(it.getUuid()) && getName().equals(it.getName()); } diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Episode.java b/app/src/main/java/com/fongmi/android/tv/bean/Episode.java index 0691eb1ce..4eee0d341 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Episode.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Episode.java @@ -116,8 +116,7 @@ public class Episode implements Parcelable { @Override public boolean equals(Object obj) { if (this == obj) return true; - if (!(obj instanceof Episode)) return false; - Episode it = (Episode) obj; + if (!(obj instanceof Episode it)) return false; return getUrl().equals(it.getUrl()) && getName().equals(it.getName()); } diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Flag.java b/app/src/main/java/com/fongmi/android/tv/bean/Flag.java index ae80e49e8..2986d7de1 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Flag.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Flag.java @@ -129,8 +129,7 @@ public class Flag implements Parcelable { @Override public boolean equals(Object obj) { if (this == obj) return true; - if (!(obj instanceof Flag)) return false; - Flag it = (Flag) obj; + if (!(obj instanceof Flag it)) return false; return getFlag().equals(it.getFlag()); } diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Group.java b/app/src/main/java/com/fongmi/android/tv/bean/Group.java index 163ea232e..7c88a5867 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Group.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Group.java @@ -157,8 +157,7 @@ public class Group { public boolean equals(Object obj) { if (obj == null) return false; if (this == obj) return true; - if (!(obj instanceof Group)) return false; - Group it = (Group) obj; + if (!(obj instanceof Group it)) return false; return getName().equals(it.getName()) && getChannel().size() == it.getChannel().size(); } } diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Live.java b/app/src/main/java/com/fongmi/android/tv/bean/Live.java index 671a5fdb7..f11e31637 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Live.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Live.java @@ -358,8 +358,7 @@ public class Live { @Override public boolean equals(Object obj) { if (this == obj) return true; - if (!(obj instanceof Live)) return false; - Live it = (Live) obj; + if (!(obj instanceof Live it)) return false; return getName().equals(it.getName()); } } diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Parse.java b/app/src/main/java/com/fongmi/android/tv/bean/Parse.java index 10fa7757c..5cccfdbb6 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Parse.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Parse.java @@ -119,8 +119,7 @@ public class Parse { @Override public boolean equals(Object obj) { if (this == obj) return true; - if (!(obj instanceof Parse)) return false; - Parse it = (Parse) obj; + if (!(obj instanceof Parse it)) return false; return getName().equals(it.getName()); } diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Site.java b/app/src/main/java/com/fongmi/android/tv/bean/Site.java index 737a80796..7e8f5e25f 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Site.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Site.java @@ -324,8 +324,7 @@ public class Site implements Parcelable { @Override public boolean equals(Object obj) { if (this == obj) return true; - if (!(obj instanceof Site)) return false; - Site it = (Site) obj; + if (!(obj instanceof Site it)) return false; return getKey().equals(it.getKey()); } diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Value.java b/app/src/main/java/com/fongmi/android/tv/bean/Value.java index efcf909eb..bbea7fa1f 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Value.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Value.java @@ -61,8 +61,7 @@ public class Value implements Parcelable { @Override public boolean equals(Object obj) { if (this == obj) return true; - if (!(obj instanceof Value)) return false; - Value it = (Value) obj; + if (!(obj instanceof Value it)) return false; return getV().equals(it.getV()); } diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Vod.java b/app/src/main/java/com/fongmi/android/tv/bean/Vod.java index 5672b8dc6..0c142bfdc 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Vod.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Vod.java @@ -301,8 +301,7 @@ public class Vod implements Parcelable { @Override public boolean equals(Object obj) { if (this == obj) return true; - if (!(obj instanceof Vod)) return false; - Vod it = (Vod) obj; + if (!(obj instanceof Vod it)) return false; return getVodId().equals(it.getVodId()); } diff --git a/catvod/src/main/java/com/github/catvod/bean/Doh.java b/catvod/src/main/java/com/github/catvod/bean/Doh.java index 605e56ce6..ada7021c6 100644 --- a/catvod/src/main/java/com/github/catvod/bean/Doh.java +++ b/catvod/src/main/java/com/github/catvod/bean/Doh.java @@ -80,8 +80,7 @@ public class Doh { @Override public boolean equals(Object obj) { if (this == obj) return true; - if (!(obj instanceof Doh)) return false; - Doh it = (Doh) obj; + if (!(obj instanceof Doh it)) return false; return getUrl().equals(it.getUrl()); }