diff --git a/app/src/main/java/com/github/catvod/crawler/JarLoader.java b/app/src/main/java/com/github/catvod/crawler/JarLoader.java index abd0146c..097dbcee 100644 --- a/app/src/main/java/com/github/catvod/crawler/JarLoader.java +++ b/app/src/main/java/com/github/catvod/crawler/JarLoader.java @@ -7,7 +7,6 @@ import com.github.tvbox.osc.base.App; import org.json.JSONObject; import java.io.File; -import java.io.FileOutputStream; import java.lang.reflect.Method; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java index 50e1275f..596de2be 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java @@ -27,10 +27,7 @@ import com.github.tvbox.osc.api.ApiConfig; import com.github.tvbox.osc.base.BaseActivity; import com.github.tvbox.osc.base.BaseLazyFragment; import com.github.tvbox.osc.bean.AbsSortXml; -import com.github.tvbox.osc.bean.Movie; import com.github.tvbox.osc.bean.MovieSort; -import com.github.tvbox.osc.bean.VodInfo; -import com.github.tvbox.osc.cache.RoomDataManger; import com.github.tvbox.osc.event.RefreshEvent; import com.github.tvbox.osc.server.ControlManager; import com.github.tvbox.osc.ui.adapter.HomePageAdapter; diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java index d065f966..ae8af4f2 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java @@ -14,6 +14,8 @@ import android.view.KeyEvent; import android.view.View; import android.view.ViewGroup; import android.webkit.ConsoleMessage; +import android.webkit.JsPromptResult; +import android.webkit.JsResult; import android.webkit.SslErrorHandler; import android.webkit.ValueCallback; import android.webkit.WebChromeClient; @@ -59,6 +61,7 @@ import com.orhanobut.hawk.Hawk; import org.greenrobot.eventbus.EventBus; import org.json.JSONException; import org.json.JSONObject; +import org.xwalk.core.XWalkJavascriptResult; import org.xwalk.core.XWalkResourceClient; import org.xwalk.core.XWalkSettings; import org.xwalk.core.XWalkUIClient; @@ -885,6 +888,21 @@ public class PlayActivity extends BaseActivity { public boolean onConsoleMessage(ConsoleMessage consoleMessage) { return false; } + + @Override + public boolean onJsAlert(WebView view, String url, String message, JsResult result) { + return false; + } + + @Override + public boolean onJsConfirm(WebView view, String url, String message, JsResult result) { + return false; + } + + @Override + public boolean onJsPrompt(WebView view, String url, String message, String defaultValue, JsPromptResult result) { + return false; + } }); mSysWebClient = new SysWebClient(); webView.setWebViewClient(mSysWebClient); @@ -1027,6 +1045,21 @@ public class PlayActivity extends BaseActivity { public boolean onConsoleMessage(XWalkView view, String message, int lineNumber, String sourceId, ConsoleMessageType messageType) { return false; } + + @Override + public boolean onJsAlert(XWalkView view, String url, String message, XWalkJavascriptResult result) { + return false; + } + + @Override + public boolean onJsConfirm(XWalkView view, String url, String message, XWalkJavascriptResult result) { + return false; + } + + @Override + public boolean onJsPrompt(XWalkView view, String url, String message, String defaultValue, XWalkJavascriptResult result) { + return false; + } }); mX5WebClient = new XWalkWebClient(webView); webView.setResourceClient(mX5WebClient); diff --git a/app/src/main/java/com/github/tvbox/osc/util/OkGoHelper.java b/app/src/main/java/com/github/tvbox/osc/util/OkGoHelper.java index de0e8ecf..d731254d 100644 --- a/app/src/main/java/com/github/tvbox/osc/util/OkGoHelper.java +++ b/app/src/main/java/com/github/tvbox/osc/util/OkGoHelper.java @@ -5,6 +5,7 @@ import com.github.tvbox.osc.util.SSL.SSLSocketFactoryCompat; import com.lzy.okgo.OkGo; import com.lzy.okgo.https.HttpsUtils; import com.lzy.okgo.interceptor.HttpLoggingInterceptor; +import com.lzy.okgo.model.HttpHeaders; import com.orhanobut.hawk.Hawk; import com.squareup.picasso.OkHttp3Downloader; import com.squareup.picasso.Picasso; @@ -22,6 +23,7 @@ import okhttp3.Cache; import okhttp3.HttpUrl; import okhttp3.OkHttpClient; import okhttp3.dnsoverhttps.DnsOverHttps; +import okhttp3.internal.Version; import xyz.doikki.videoplayer.exo.ExoMediaSourceHelper; public class OkGoHelper { @@ -130,9 +132,10 @@ public class OkGoHelper { th.printStackTrace(); } + HttpHeaders.setUserAgent(Version.userAgent()); + OkHttpClient okHttpClient = builder.build(); OkGo.getInstance().setOkHttpClient(okHttpClient); - OkGo.getInstance().setRetryCount(2); initExoOkHttpClient(); initPicasso(okHttpClient);