fix 太子备用服务器

app/src/main/java/com/yingmao/clash/act/SplashActivity.kt

@@ -17,9 +17,6 @@ import androidx.core.content.ContextCompat
 import androidx.lifecycle.ViewModelProvider
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.customview.customView
-import com.github.gzuliyujiang.oaid.DeviceID
-import com.github.gzuliyujiang.oaid.DeviceIdentifier
-import com.github.gzuliyujiang.oaid.IGetter
 import com.google.gson.JsonObject
 import com.orhanobut.logger.Logger
 import com.tencent.mmkv.MMKV
@@ -125,6 +122,8 @@ class SplashActivity : BaseActivity() {
 
 //        com.yingmao.clash.common.log.Log.d("onOAIDGetComplete result==>${ DeviceIdentifier.getOAID(this)}")
 
+
+
         var clashBinder = MainApplication.getApp()?.let {
             ClashManager(it).wrap() as IClashManager
         }
@@ -141,7 +140,13 @@ class SplashActivity : BaseActivity() {
 
                 AESUtil.KEY2 = ss1
                 AESUtil.IV2 = ss2
-//                com.yingmao.clash.common.log.Log.d("encrypt:"+ AESUtil.byteArrayToHexStr(AESUtil.encrypt("https://api.otcopusvpn.cc:18008")))
+                //   太子
+//             com.yingmao.clash.common.log.Log.d("tz encrypt:"+ AESUtil.byteArrayToHexStr(AESUtil.encrypt("")))
+//         八爪鱼       com.yingmao.clash.common.log.Log.d("bzy encrypt:"+ AESUtil.byteArrayToHexStr(AESUtil.encrypt("")))
+//         八爪鱼   2
+//                com.yingmao.clash.common.log.Log.d("bzy2 encrypt:"+ AESUtil.byteArrayToHexStr(AESUtil.encrypt("")))
+//           影猫
+//           com.yingmao.clash.common.log.Log.d("ym encrypt:"+ AESUtil.byteArrayToHexStr(AESUtil.encrypt("")))
                 val routerSet =
                     MMKV.defaultMMKV().decodeStringSet(BZYConstants.MMKV_KEY_ROUTER_HOST)
                 if (routerSet != null && routerSet.size > 0) {

app/src/main/java/com/yingmao/clash/vm/SplashAtyVM.kt

@@ -70,24 +70,22 @@ class SplashAtyVM : PublicViewMode() {
         doAsyncNoNeedReturn(HttpReqType.GET_HOST) {
             try { //TODO  bug 会引起崩溃
 
-                if (BuildConfig.productId == "182265") {
 
+                var host = if (BuildConfig.is_ym) {
+                    rt.getHost()
+                } else if (BuildConfig.is_tz) {
+                    rt.getHostTZ()
                 } else {
-                    var host = if (BuildConfig.is_ym) {
-                        rt.getHost()
-                    } else if (true == BuildConfig.is_tz) {
-                        rt.getHostTZ()
-                    } else {
-                        rt.getHostDef()
-                    }
-                    Log.e("data", "2:$host")
-                    if (!TextUtils.isEmpty(host)) {
-                        host = AESUtil.decrypt(host)
-                        val hostSet = host.split("+").toSet()
-                        MMKV.defaultMMKV().encode(BZYConstants.MMKV_KEY_ROUTER_HOST, hostSet)
-                    }
-//                    Log.e("data", "22:$host")
+                    rt.getHostDef()
                 }
+//                Log.e("data", "2:$host")
+                if (!TextUtils.isEmpty(host)) {
+                    host = AESUtil.decrypt(host)
+                    val hostSet = host.split("+").toSet()
+                    MMKV.defaultMMKV().encode(BZYConstants.MMKV_KEY_ROUTER_HOST, hostSet)
+                }
+//                    Log.e("data", "22:$host")
+
                 callback.suc()
             } catch (e: Exception) {
                 e.printStackTrace()

build.gradle.kts

@@ -572,7 +572,6 @@ subprojects {
                 buildConfigField("boolean", "is_free", "false")
                 buildConfigField("boolean", "is_tz", "false")
                 buildConfigField("String", "applicationId", "\"com.yingmao.clash\"")
-//                buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"")
                 buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"")
                 buildConfigField("String", "productId", "\"9972\"")
                 manifestPlaceholders(
@@ -1012,6 +1011,7 @@ subprojects {
                 buildConfigField("boolean", "is_tz", "false")
                 buildConfigField("String", "applicationId", "\"com.yingmao.clash\"")
                 buildConfigField("String", "service_url", "\"https://app.bazhuayujiasu.cc:8700\"")
+//                buildConfigField("String", "service_url", "\"https://bzyapi.yingmaox.cc\"")
                 buildConfigField("String", "productId", "\"182257\"")
                 manifestPlaceholders(
                     mapOf(

ym_build.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+# 定义变量
+PROJECT_DIR=$(pwd)  # 当前项目根目录
+OUTPUT_DIR="/Users/cyh/Documents/buildApp"  # 自定义输出目录
+FLAVORS=("3229" "9972" "6789" "9583" "9707" "9059" "5352" "8300" "7595" )  # 渠道列表
+#FLAVORS=("11111" )  # 渠道列表
+BUILD_TYPE="Release"  # 构建类型：Debug 或 Release
+
+# 清理旧的构建产物
+echo "清理旧的构建产物..."
+./gradlew clean
+
+# 创建输出目录
+mkdir -p "${OUTPUT_DIR}"
+
+# 遍历渠道列表并打包
+for FLAVOR in "${FLAVORS[@]}"
+do
+    echo "正在打包渠道: ${FLAVOR} (${BUILD_TYPE})..."
+    ./gradlew assemble${FLAVOR}${BUILD_TYPE}
+    # 查找生成的 APK
+    FLAVOR_LOWER=$(echo "${FLAVOR}" | tr '[:upper:]' '[:lower:]')
+    BUILD_TYPE_LOWER=$(echo "${BUILD_TYPE}" | tr '[:upper:]' '[:lower:]')
+    APK_PATH=$(find "${PROJECT_DIR}/app/build/outputs/apk/${FLAVOR_LOWER}/${BUILD_TYPE_LOWER}" -name "*.apk" | head -n 1)
+
+    # 检查是否成功生成 APK
+    if [ -f "${APK_PATH}" ]; then
+        # 定义自定义输出文件名
+        cp "${APK_PATH}" "${OUTPUT_DIR}/"
+    else
+        echo "❌ 渠道 ${FLAVOR} 打包失败，未找到 APK 文件。"
+    fi
+done
+
+echo "所有渠道打包完成，APK 文件存储在: ${OUTPUT_DIR}"