From 7c9b2fb257fa18346f95c24b88c13eeb308d7ec0 Mon Sep 17 00:00:00 2001
From: level <1364007522@qq.com>
Date: Tue, 3 Jun 2025 15:34:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=A4=87=E7=94=A8=E5=9F=9F?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yingmao/clash/act/SplashActivity.kt    | 10 +++++-----
 .../java/com/yingmao/clash/base/PublicViewMode.kt   | 13 ++++---------
 .../main/java/com/yingmao/clash/net/http/HttpApi.kt |  6 ++++--
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/yingmao/clash/act/SplashActivity.kt b/app/src/main/java/com/yingmao/clash/act/SplashActivity.kt
index 59591d1..d9f85c2 100644
--- a/app/src/main/java/com/yingmao/clash/act/SplashActivity.kt
+++ b/app/src/main/java/com/yingmao/clash/act/SplashActivity.kt
@@ -123,6 +123,10 @@ class SplashActivity : BaseActivity() {
 
         rlPb = findViewById(R.id.rl_pb)
         ll_action = findViewById(R.id.ll_action)
+        webView = findViewById(R.id.webView)
+        pb_web = findViewById(R.id.pb_web)
+        but_skip = findViewById(R.id.but_skip)
+        but_register = findViewById(R.id.but_register)
         serStore.isYM = BuildConfig.is_ym
         if (!BuildConfig.is_ym) {
             if (BuildConfig.is_tz) {
@@ -238,7 +242,7 @@ class SplashActivity : BaseActivity() {
                 var ss2 = cb.getSS2(si)
                 registerKey = cb.getRegisterKey(si)
                 registerIV2 = cb.getRegisterKiv(si)
-                com.cncat.vpn.common.log.Log.d("si==>${si}, ss1==>${ss1}, ss2==>${ss2}")
+//                com.cncat.vpn.common.log.Log.d("si==>${si}, ss1==>${ss1}, ss2==>${ss2}")
                 MainApplication.KEY2 = ss1
                 MainApplication.IV2 = ss2
                 //   太子
@@ -336,10 +340,6 @@ class SplashActivity : BaseActivity() {
             return
         }
         if (!BuildConfig.is_free && BuildConfig.productId.isNotEmpty()) {
-            webView = findViewById(R.id.webView)
-            pb_web = findViewById(R.id.pb_web)
-            but_skip = findViewById(R.id.but_skip)
-            but_register = findViewById(R.id.but_register)
             but_skip?.setOnClickListener {
                 val intent = Intent(this@SplashActivity, LoginActivity::class.java)
                 startActivity(intent)
diff --git a/app/src/main/java/com/yingmao/clash/base/PublicViewMode.kt b/app/src/main/java/com/yingmao/clash/base/PublicViewMode.kt
index 7706545..2c14671 100644
--- a/app/src/main/java/com/yingmao/clash/base/PublicViewMode.kt
+++ b/app/src/main/java/com/yingmao/clash/base/PublicViewMode.kt
@@ -28,12 +28,12 @@ open class PublicViewMode : BaseViewMode() {
 
     fun getHost(callback: AsyncCallback) {
         val rt =
-            NetService.instances.createFreeBaseUrl("https://yingmao.oss-cn-hongkong.aliyuncs.com/")
+            NetService.instances.createFreeBaseUrl("https://pubtofile.oss-cn-hongkong.aliyuncs.com/app_host/")
         doAsyncNoNeedReturn(HttpReqType.GET_HOST) {
             try { //TODO  bug 会引起崩溃
                 val host = when {
                     BuildConfig.is_ym -> {
-                        rt.getHostGithub()
+                        rt.getHost()
                     }
 
                     BuildConfig.is_tz -> {
@@ -75,7 +75,7 @@ open class PublicViewMode : BaseViewMode() {
             try {
                 val host = when {
                     BuildConfig.is_ym -> {
-                        rt.getHostGithub()
+                        rt.getHostGithubjl()
                     }
 
                     BuildConfig.is_tz -> {
@@ -111,7 +111,7 @@ open class PublicViewMode : BaseViewMode() {
 
     fun getHostByAWS(callback: AsyncCallback) {
         val rt =
-            NetService.instances.createFreeBaseUrl("https://yingmao2.s3.ap-east-1.amazonaws.com/")
+            NetService.instances.createFreeBaseUrl("https://wfjsq.s3.ap-east-1.amazonaws.com/")
         doAsyncNoNeedReturn(HttpReqType.GET_HOST) {
             try {
                 val host = when {
@@ -122,11 +122,6 @@ open class PublicViewMode : BaseViewMode() {
                     BuildConfig.is_tz -> {
                         rt.getTzHostAWS()
                     }
-
-                    BuildConfig.is_yunti -> {
-                        rt.getYunTiHostAWS()
-                    }
-
                     else -> {
                         rt.getBzyHostAWS()
                     }
diff --git a/app/src/main/java/com/yingmao/clash/net/http/HttpApi.kt b/app/src/main/java/com/yingmao/clash/net/http/HttpApi.kt
index 8bf3cf8..3e4ad68 100644
--- a/app/src/main/java/com/yingmao/clash/net/http/HttpApi.kt
+++ b/app/src/main/java/com/yingmao/clash/net/http/HttpApi.kt
@@ -180,14 +180,16 @@ interface HttpApi {
 //    suspend fun getHost() : String
 
     //影猫
-    @GET("/host_ym.txt")
+    @GET("/host_wf.txt")
     suspend fun getHost(): String
 
-    @GET("/host_ym.txt")
+    @GET("/host_wf.txt")
     suspend fun getHostAWS(): String
 
     @GET("/ym-source/ym/main/host_ym.txt")
     suspend fun getHostGithub(): String
+    @GET("/ym-source/ym/main/host_yjl.txt")
+    suspend fun getHostGithubjl(): String
 
     //八爪鱼
     @GET("/hostdef.txt")