diff --git a/app/src/main/java/com/github/catvod/debug/MainActivity.java b/app/src/main/java/com/github/catvod/debug/MainActivity.java index 17ff9de..0a6b1e3 100644 --- a/app/src/main/java/com/github/catvod/debug/MainActivity.java +++ b/app/src/main/java/com/github/catvod/debug/MainActivity.java @@ -1,19 +1,10 @@ package com.github.catvod.debug; import android.app.Activity; -import android.os.*; +import android.os.Bundle; -import android.view.ViewGroup; -import android.webkit.CookieManager; -import android.webkit.WebView; -import android.webkit.WebViewClient; import com.github.catvod.R; -import com.github.catvod.net.OkHttp; -import com.github.catvod.spider.*; -import org.apache.commons.lang3.StringEscapeUtils; - -import static com.github.catvod.utils.Util.addView; -import static com.github.catvod.utils.Util.removeView; +import com.github.catvod.spider.Init; public class MainActivity extends Activity { @@ -23,64 +14,12 @@ public class MainActivity extends Activity { setContentView(R.layout.activity_main); //Logger.addLogAdapter(new AndroidLogAdapter()); Init.init(getApplicationContext()); - // It is usually init in the application. new Thread(() -> { try { - bypassCf("https://www.czzy88.com/xssearch?q=斗罗"); - while (cookie[0] == null) SystemClock.sleep(1000); - System.out.println(html); - - - } catch (Exception e) { e.printStackTrace(); } }).start(); } - - - static final String[] cookie = new String[1]; - static String html = ""; - public static void bypassCf(String url) { - String content = OkHttp.string(url); - if (content.contains("Just a moment...")) { - Init.run(() -> { - WebView webView = new WebView(Init.context()); - webView.getSettings().setDatabaseEnabled(true); - webView.getSettings().setDomStorageEnabled(true); - webView.getSettings().setJavaScriptEnabled(true); - ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(0, 0); - addView(webView, layoutParams); - webView.setWebViewClient(new WebViewClient() { - @Override - public void onPageFinished(WebView view, String url1) { - cookie[0] = CookieManager.getInstance().getCookie(url1); - if (cookie[0] != null && cookie[0].contains("cf_clearance")) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - view.evaluateJavascript("(function() { return document.documentElement.outerHTML; })();", - html -> { - if (html != null && !html.isEmpty()) { - String htmlString = html.replaceAll("^\"+|\"+$", ""); - MainActivity.html = StringEscapeUtils.unescapeJava(htmlString); - - } - }); - } - if (view != null) { - new Handler(Looper.getMainLooper()).post(() -> { - removeView(webView); - webView.destroy(); - }); - } - } - } - }); - webView.loadUrl(url); - }); - } else { - html = content; - } - } - } \ No newline at end of file diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 9312890..6d9cf1d 100644 Binary files a/jar/custom_spider.jar and b/jar/custom_spider.jar differ diff --git a/jar/custom_spider.jar.md5 b/jar/custom_spider.jar.md5 index c7cf431..dca1574 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -597b8487790ab300d3776d20315ec7f7 +2f42b42b34c08da62657fc4ab2d78c90 diff --git a/json/demo.json b/json/demo.json index 2377afa..b2dd0b3 100644 --- a/json/demo.json +++ b/json/demo.json @@ -1,5 +1,5 @@ { - "spider": "https://fm.t4tv.hz.cz/jar/custom_spider.jar;md5;597b8487790ab300d3776d20315ec7f7", + "spider": "https://fm.t4tv.hz.cz/jar/custom_spider.jar", "wallpaper": "http://饭太硬.top/深色壁纸/api.php", "sites": [ {