From 696e42ade71f4f0c176635a1fc4bd3aeb1b89a86 Mon Sep 17 00:00:00 2001 From: FongMi Date: Wed, 28 May 2025 12:02:50 +0800 Subject: [PATCH] Support proxy for core --- .../java/com/fongmi/android/tv/bean/Core.java | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Core.java b/app/src/main/java/com/fongmi/android/tv/bean/Core.java index bb169b07b..bf7a959e3 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Core.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Core.java @@ -5,7 +5,9 @@ import android.text.TextUtils; import androidx.annotation.Nullable; import com.fongmi.android.tv.server.Server; +import com.fongmi.android.tv.utils.UrlUtil; import com.fongmi.hook.Hook; +import com.github.catvod.net.OkHttp; import com.google.gson.annotations.SerializedName; public class Core { @@ -30,23 +32,23 @@ public class Core { private String so; public String getAuth() { - return !getResp().isEmpty() ? Server.get().getAddress("/tvbus") : TextUtils.isEmpty(auth) ? "" : auth; + return !getResp().isEmpty() ? Server.get().getAddress("/tvbus") : TextUtils.isEmpty(auth) ? "" : getString(auth); } public String getName() { - return TextUtils.isEmpty(name) ? "" : name; + return TextUtils.isEmpty(name) ? "" : getString(name); } public String getPass() { - return TextUtils.isEmpty(pass) ? "" : pass; + return TextUtils.isEmpty(pass) ? "" : getString(pass); } public String getBroker() { - return TextUtils.isEmpty(broker) ? "" : broker; + return TextUtils.isEmpty(broker) ? "" : getString(broker); } public String getDomain() { - return TextUtils.isEmpty(domain) ? "" : domain; + return TextUtils.isEmpty(domain) ? "" : getString(domain); } public String getResp() { @@ -54,21 +56,26 @@ public class Core { } public String getSign() { - return TextUtils.isEmpty(sign) ? "" : sign; + return TextUtils.isEmpty(sign) ? "" : getString(sign); } public String getPkg() { - return TextUtils.isEmpty(pkg) ? "" : pkg; + return TextUtils.isEmpty(pkg) ? "" : getString(pkg); } public String getSo() { - return TextUtils.isEmpty(so) ? "" : so; + return TextUtils.isEmpty(so) ? "" : getString(so); } public Hook getHook() { return !getPkg().isEmpty() && !getSign().isEmpty() ? new Hook(getSign(), getPkg()) : null; } + private String getString(String value) { + value = UrlUtil.convert(value); + return value.startsWith("http") ? OkHttp.string(value) : value; + } + @Override public boolean equals(@Nullable Object obj) { if (this == obj) return true;