From 69e6690364e25564e3a30681597493041d88ba9e Mon Sep 17 00:00:00 2001 From: SUMUS <49748345+yxsra@users.noreply.github.com> Date: Sat, 14 Sep 2024 12:20:47 +0800 Subject: [PATCH 1/3] Update gradle.yml --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index b6a5e36c6..c7f1b30cf 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -55,7 +55,7 @@ jobs: configuration-cache-enabled: true - name: Upload artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: ${{ !github.head_ref }} with: name: apk-debug From 9f5e165d2505b9e3b91f1e24f08d01573384cc2f Mon Sep 17 00:00:00 2001 From: SUMUS <49748345+yxsra@users.noreply.github.com> Date: Sat, 14 Sep 2024 17:38:10 +0800 Subject: [PATCH 2/3] Fix package name generation logic in annotation processor. --- .../src/main/java/ceui/lisa/processor/AnnotationProcessor.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/processor/src/main/java/ceui/lisa/processor/AnnotationProcessor.kt b/processor/src/main/java/ceui/lisa/processor/AnnotationProcessor.kt index 858e44e5e..089d5b31b 100644 --- a/processor/src/main/java/ceui/lisa/processor/AnnotationProcessor.kt +++ b/processor/src/main/java/ceui/lisa/processor/AnnotationProcessor.kt @@ -69,7 +69,7 @@ class FileGenerator : AbstractProcessor() { processingEnv.elementUtils.getPackageOf(it).toString() + ".*" } - val packageName = (packages.first().split(".").subList(0, 3) + listOf("viewholdermap")).joinToString(".") + val packageName = "ceui.pixiv.ui.viewholdermap" val holderEntries = holderElements.map { val itemHolderFullName = getClassName { From be033fbb63fbf3ea6e25056d02a698df2e83e831 Mon Sep 17 00:00:00 2001 From: Space Time Date: Wed, 4 Dec 2024 15:35:14 +0800 Subject: [PATCH 3/3] Fix 421 error --- .../main/java/ceui/lisa/fragments/FragmentWebView.java | 2 +- app/src/main/java/ceui/lisa/http/CloudFlareDns.kt | 4 ++-- app/src/main/java/ceui/lisa/http/HttpDns.java | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/ceui/lisa/fragments/FragmentWebView.java b/app/src/main/java/ceui/lisa/fragments/FragmentWebView.java index ce25c69ff..5dbe9f31a 100644 --- a/app/src/main/java/ceui/lisa/fragments/FragmentWebView.java +++ b/app/src/main/java/ceui/lisa/fragments/FragmentWebView.java @@ -478,7 +478,7 @@ public URLConnection recursiveRequest(String path, Map headers, url = new URL(path); conn = (HttpURLConnection) url.openConnection(); // 异步接口获取IP - String ip = "210.140.131.188"; + String ip = "210.140.139.157"; if (ip != null) { // 通过HTTPDNS获取IP成功，进行URL替换和HOST头设置 Log.d(TAG, "Get IP: " + ip + " for host: " + url.getHost() + " from HTTPDNS successfully!"); diff --git a/app/src/main/java/ceui/lisa/http/CloudFlareDns.kt b/app/src/main/java/ceui/lisa/http/CloudFlareDns.kt index d3c9cb7fd..d916d2291 100644 --- a/app/src/main/java/ceui/lisa/http/CloudFlareDns.kt +++ b/app/src/main/java/ceui/lisa/http/CloudFlareDns.kt @@ -10,14 +10,14 @@ class CloudFlareDns(private val service: CloudFlareDNSService) : Dns { when (hostname) { "oauth.secure.pixiv.net" -> addresses.addAll( - listOf("210.140.131.209").map { + listOf("210.140.139.156").map { InetAddress.getByName( it ) } ) "app-api.pixiv.net" -> addresses.addAll( - listOf("210.140.131.208").map { + listOf("210.140.139.155").map { InetAddress.getByName( it ) diff --git a/app/src/main/java/ceui/lisa/http/HttpDns.java b/app/src/main/java/ceui/lisa/http/HttpDns.java index 92f8101fa..b40775541 100644 --- a/app/src/main/java/ceui/lisa/http/HttpDns.java +++ b/app/src/main/java/ceui/lisa/http/HttpDns.java @@ -19,10 +19,10 @@ public class HttpDns implements Dns { */ private static final String[] addresses = { - "210.140.131.188", - "210.140.131.218", - "210.140.131.187", - "210.140.131.189" + "210.140.139.155", + "210.140.139.156", + "210.140.139.157", + "210.140.139.158" }; public static List newDns = new ArrayList<>(); private static HttpDns sHttpDns = null;