pull/137/head
FongMi 3 years ago
parent 6f179e205f
commit 2b53d604df
  1. 1
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/PushActivity.java
  2. 1
      app/src/leanback/java/com/fongmi/android/tv/ui/presenter/HistoryPresenter.java
  3. 1
      app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java
  4. 1
      app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java
  5. 1
      app/src/main/java/com/fongmi/android/tv/api/WallConfig.java
  6. 6
      app/src/main/java/com/fongmi/android/tv/bean/Result.java
  7. 2
      app/src/main/java/com/fongmi/android/tv/bean/Vod.java
  8. 1
      app/src/main/java/com/fongmi/android/tv/impl/Callback.java
  9. 3
      app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java
  10. 2
      app/src/main/java/com/fongmi/android/tv/player/Players.java
  11. 2
      app/src/main/java/com/fongmi/android/tv/player/source/Force.java
  12. 1
      app/src/main/java/com/fongmi/android/tv/utils/Notify.java
  13. 2
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
  14. 1
      app/src/mobile/java/com/fongmi/android/tv/ui/base/BaseActivity.java
  15. 1
      app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/ControlDialog.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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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) {

@ -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;

@ -1,7 +1,6 @@
package com.fongmi.android.tv.impl;
import androidx.annotation.NonNull;
import androidx.annotation.StringRes;
import java.io.IOException;

@ -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;

@ -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 {

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

Loading…
Cancel
Save