From 2b53d604df68e688210c55b1562ff9df666f4eac Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Fri, 7 Jul 2023 17:09:17 +0800
Subject: [PATCH] Clean code

---
 .../com/fongmi/android/tv/ui/activity/PushActivity.java     | 1 -
 .../fongmi/android/tv/ui/presenter/HistoryPresenter.java    | 1 -
 app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java  | 1 -
 app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java | 1 -
 app/src/main/java/com/fongmi/android/tv/api/WallConfig.java | 1 -
 app/src/main/java/com/fongmi/android/tv/bean/Result.java    | 6 +-----
 app/src/main/java/com/fongmi/android/tv/bean/Vod.java       | 2 --
 app/src/main/java/com/fongmi/android/tv/impl/Callback.java  | 1 -
 .../java/com/fongmi/android/tv/model/SiteViewModel.java     | 3 ---
 app/src/main/java/com/fongmi/android/tv/player/Players.java | 2 +-
 .../java/com/fongmi/android/tv/player/source/Force.java     | 2 +-
 app/src/main/java/com/fongmi/android/tv/utils/Notify.java   | 1 -
 .../com/fongmi/android/tv/ui/activity/CollectActivity.java  | 2 +-
 .../java/com/fongmi/android/tv/ui/base/BaseActivity.java    | 1 -
 .../fongmi/android/tv/ui/custom/dialog/ControlDialog.java   | 1 -
 15 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/PushActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/PushActivity.java
index 70a3820fe..c95af210e 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/PushActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/PushActivity.java
@@ -8,7 +8,6 @@ import android.view.View;
 import androidx.viewbinding.ViewBinding;
 
 import com.fongmi.android.tv.R;
-import com.fongmi.android.tv.api.ApiConfig;
 import com.fongmi.android.tv.databinding.ActivityPushBinding;
 import com.fongmi.android.tv.server.Server;
 import com.fongmi.android.tv.ui.base.BaseActivity;
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/HistoryPresenter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/HistoryPresenter.java
index 271f9df96..65ef4c99b 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/HistoryPresenter.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/HistoryPresenter.java
@@ -9,7 +9,6 @@ import androidx.leanback.widget.Presenter;
 
 import com.fongmi.android.tv.Product;
 import com.fongmi.android.tv.R;
-import com.fongmi.android.tv.api.ApiConfig;
 import com.fongmi.android.tv.bean.History;
 import com.fongmi.android.tv.databinding.AdapterVodBinding;
 import com.fongmi.android.tv.utils.ImgUtil;
diff --git a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java
index 630bd78f5..917915a4d 100644
--- a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java
+++ b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java
@@ -12,7 +12,6 @@ import com.fongmi.android.tv.bean.Site;
 import com.fongmi.android.tv.impl.Callback;
 import com.fongmi.android.tv.utils.Json;
 import com.fongmi.android.tv.utils.Notify;
-import com.fongmi.android.tv.utils.ResUtil;
 import com.fongmi.android.tv.utils.Utils;
 import com.github.catvod.bean.Doh;
 import com.github.catvod.crawler.Spider;
diff --git a/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java b/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java
index 61fa1a60e..c3c13127b 100644
--- a/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java
+++ b/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java
@@ -16,7 +16,6 @@ import com.fongmi.android.tv.impl.Callback;
 import com.fongmi.android.tv.utils.Json;
 import com.fongmi.android.tv.utils.Notify;
 import com.fongmi.android.tv.utils.Prefers;
-import com.fongmi.android.tv.utils.ResUtil;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
diff --git a/app/src/main/java/com/fongmi/android/tv/api/WallConfig.java b/app/src/main/java/com/fongmi/android/tv/api/WallConfig.java
index a153490b8..fb967ecd6 100644
--- a/app/src/main/java/com/fongmi/android/tv/api/WallConfig.java
+++ b/app/src/main/java/com/fongmi/android/tv/api/WallConfig.java
@@ -12,7 +12,6 @@ import com.fongmi.android.tv.utils.FileUtil;
 import com.fongmi.android.tv.utils.ImgUtil;
 import com.fongmi.android.tv.utils.Notify;
 import com.fongmi.android.tv.utils.Prefers;
-import com.fongmi.android.tv.utils.ResUtil;
 import com.github.catvod.net.OkHttp;
 
 import java.io.File;
diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Result.java b/app/src/main/java/com/fongmi/android/tv/bean/Result.java
index 7cbd97fe7..4dc9c05ee 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Result.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Result.java
@@ -150,11 +150,7 @@ public class Result {
     }
 
     public Integer getParse() {
-        return getParse(0);
-    }
-
-    public Integer getParse(Integer def) {
-        return parse == null ? def : parse;
+        return parse == null ? 0 : parse;
     }
 
     public void setParse(Integer parse) {
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 2506eeb80..d030f2aa9 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
@@ -5,8 +5,6 @@ import android.view.View;
 
 import androidx.annotation.NonNull;
 
-import com.fongmi.android.tv.R;
-import com.fongmi.android.tv.utils.ResUtil;
 import com.fongmi.android.tv.utils.Trans;
 import com.fongmi.android.tv.utils.Utils;
 import com.google.gson.Gson;
diff --git a/app/src/main/java/com/fongmi/android/tv/impl/Callback.java b/app/src/main/java/com/fongmi/android/tv/impl/Callback.java
index a42f8958a..be2417748 100644
--- a/app/src/main/java/com/fongmi/android/tv/impl/Callback.java
+++ b/app/src/main/java/com/fongmi/android/tv/impl/Callback.java
@@ -1,7 +1,6 @@
 package com.fongmi.android.tv.impl;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.StringRes;
 
 import java.io.IOException;
 
diff --git a/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java b/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java
index 6228308cd..076b2bdd3 100644
--- a/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java
+++ b/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java
@@ -6,10 +6,8 @@ import android.util.ArrayMap;
 
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
-import androidx.media3.common.util.Log;
 
 import com.fongmi.android.tv.App;
-import com.fongmi.android.tv.BuildConfig;
 import com.fongmi.android.tv.Constant;
 import com.fongmi.android.tv.R;
 import com.fongmi.android.tv.api.ApiConfig;
@@ -24,7 +22,6 @@ import com.github.catvod.crawler.Spider;
 import com.github.catvod.crawler.SpiderDebug;
 import com.github.catvod.net.OkHttp;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/app/src/main/java/com/fongmi/android/tv/player/Players.java b/app/src/main/java/com/fongmi/android/tv/player/Players.java
index a5a0f1d35..37473edf3 100644
--- a/app/src/main/java/com/fongmi/android/tv/player/Players.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/Players.java
@@ -296,7 +296,7 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, Analytic
     public void start(Result result, boolean useParse, int timeout) {
         if (result.getUrl().isEmpty()) {
             ErrorEvent.url();
-        } else if (result.getParse(1) == 1 || result.getJx() == 1) {
+        } else if (result.getParse() == 1 || result.getJx() == 1) {
             stopParse();
             parseJob = ParseJob.create(this).start(result, useParse);
         } else {
diff --git a/app/src/main/java/com/fongmi/android/tv/player/source/Force.java b/app/src/main/java/com/fongmi/android/tv/player/source/Force.java
index 4c07b66ee..e146bde7c 100644
--- a/app/src/main/java/com/fongmi/android/tv/player/source/Force.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/source/Force.java
@@ -8,8 +8,8 @@ import android.os.IBinder;
 import android.os.SystemClock;
 
 import com.fongmi.android.tv.App;
-import com.fongmi.android.tv.utils.Github;
 import com.fongmi.android.tv.utils.FileUtil;
+import com.fongmi.android.tv.utils.Github;
 import com.forcetech.Util;
 import com.github.catvod.net.OkHttp;
 
diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Notify.java b/app/src/main/java/com/fongmi/android/tv/utils/Notify.java
index 4f492781a..ab4a52413 100644
--- a/app/src/main/java/com/fongmi/android/tv/utils/Notify.java
+++ b/app/src/main/java/com/fongmi/android/tv/utils/Notify.java
@@ -11,7 +11,6 @@ import android.widget.Toast;
 import androidx.appcompat.app.AlertDialog;
 
 import com.fongmi.android.tv.App;
-import com.fongmi.android.tv.R;
 import com.fongmi.android.tv.databinding.ViewProgressBinding;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
index fc5cdd293..6aa9c9dad 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
@@ -26,9 +26,9 @@ import com.fongmi.android.tv.bean.Site;
 import com.fongmi.android.tv.bean.Suggest;
 import com.fongmi.android.tv.bean.Vod;
 import com.fongmi.android.tv.databinding.ActivityCollectBinding;
+import com.fongmi.android.tv.impl.Callback;
 import com.fongmi.android.tv.impl.SiteCallback;
 import com.fongmi.android.tv.model.SiteViewModel;
-import com.fongmi.android.tv.impl.Callback;
 import com.fongmi.android.tv.ui.adapter.CollectAdapter;
 import com.fongmi.android.tv.ui.adapter.RecordAdapter;
 import com.fongmi.android.tv.ui.adapter.VodAdapter;
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/base/BaseActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/base/BaseActivity.java
index 19edab990..0e262552c 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/base/BaseActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/base/BaseActivity.java
@@ -5,7 +5,6 @@ import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.View;
-import android.view.Window;
 import android.view.WindowManager;
 
 import androidx.appcompat.app.AppCompatActivity;
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/ControlDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/ControlDialog.java
index 4f069f3d4..5b18a4fcd 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/ControlDialog.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/ControlDialog.java
@@ -1,6 +1,5 @@
 package com.fongmi.android.tv.ui.custom.dialog;
 
-import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;