diff --git a/app/src/main/java/com/github/catvod/bean/market/Item.java b/app/src/main/java/com/github/catvod/bean/market/Item.java index 9f92c5d7..f2b274c3 100644 --- a/app/src/main/java/com/github/catvod/bean/market/Item.java +++ b/app/src/main/java/com/github/catvod/bean/market/Item.java @@ -13,9 +13,15 @@ public class Item { private String url; @SerializedName("icon") private String icon; + @SerializedName("copy") + private String copy; @SerializedName("version") private String version; + public Item(String url) { + this.url = url; + } + public String getName() { return TextUtils.isEmpty(name) ? "" : name; } @@ -28,6 +34,10 @@ public class Item { return TextUtils.isEmpty(icon) ? "" : icon; } + public String getCopy() { + return TextUtils.isEmpty(copy) ? "" : copy; + } + public String getVersion() { return TextUtils.isEmpty(version) ? "" : version; } @@ -35,4 +45,12 @@ public class Item { public Vod vod() { return new Vod(getUrl(), getName(), getIcon(), getVersion(), Vod.Style.rect(1.0f)); } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (!(obj instanceof Item)) return false; + Item it = (Item) obj; + return getUrl().equals(it.getUrl()); + } } diff --git a/app/src/main/java/com/github/catvod/spider/Market.java b/app/src/main/java/com/github/catvod/spider/Market.java index 27a48d62..7b1e29a8 100644 --- a/app/src/main/java/com/github/catvod/spider/Market.java +++ b/app/src/main/java/com/github/catvod/spider/Market.java @@ -11,6 +11,7 @@ import com.github.catvod.bean.Class; import com.github.catvod.bean.Result; import com.github.catvod.bean.Vod; import com.github.catvod.bean.market.Data; +import com.github.catvod.bean.market.Item; import com.github.catvod.crawler.Spider; import com.github.catvod.net.OkHttp; import com.github.catvod.utils.FileUtil; @@ -100,6 +101,7 @@ public class Market extends Spider { if (file.getName().endsWith(".zip")) FileUtil.unzip(file, Path.download()); if (file.getName().endsWith(".apk")) FileUtil.openFile(Path.chmod(file)); else Utils.notify("下載完成"); + checkCopy(url); dismiss(); } catch (Exception e) { Utils.notify(e.getMessage()); @@ -121,6 +123,16 @@ public class Market extends Spider { } } + private void checkCopy(String url) { + for (Data data : datas) { + int index = data.getList().indexOf(new Item(url)); + if (index != -1) { + String text = data.getList().get(index).getCopy(); + if (!text.isEmpty()) Utils.copy(text); + } + } + } + private void setDialog() { Init.run(() -> { try { diff --git a/app/src/main/java/com/github/catvod/utils/Utils.java b/app/src/main/java/com/github/catvod/utils/Utils.java index ed6762e2..432a1fc6 100644 --- a/app/src/main/java/com/github/catvod/utils/Utils.java +++ b/app/src/main/java/com/github/catvod/utils/Utils.java @@ -1,5 +1,8 @@ package com.github.catvod.utils; +import android.content.ClipData; +import android.content.ClipboardManager; +import android.content.Context; import android.net.Uri; import android.os.Build; import android.util.DisplayMetrics; @@ -152,6 +155,12 @@ public class Utils { return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, getDisplayMetrics()); } + public static void copy(String text) { + ClipboardManager clipboard = (ClipboardManager) Init.context().getSystemService(Context.CLIPBOARD_SERVICE); + ClipData clip = ClipData.newPlainText("fongmi", text); + clipboard.setPrimaryClip(clip); + } + public static void loadUrl(WebView webView, String script) { loadUrl(webView, script, null); } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index a413a815..5c275c66 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 62cffd9e..e801a98f 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -9cc15b83a755468e6b725667ef362a04 +a8d5d275bb8703210af343b98eda5f6d