fix 审计日志上传
This commit is contained in:
cyh
parent
d0db23eaa6
commit
185e060a72
|
|
@ -167,6 +167,7 @@ android {
|
|||
// sourceSets.all {
|
||||
// jniLibs.srcDir("src/main/jniLibs")
|
||||
// }
|
||||
|
||||
}
|
||||
repositories {
|
||||
flatDir {
|
||||
|
|
|
|||
|
|
@ -149,7 +149,6 @@ class NewMainActivity : BaseActivity() {
|
|||
var isApiHost = false;
|
||||
val originalUrl =
|
||||
mmkv.decodeString(BZYConstants.MMKV_KEY_CURRENT_HOST, BuildConfig.service_url)
|
||||
|
||||
val routerHost = mmkv.decodeStringSet(BZYConstants.MMKV_KEY_ROUTER_HOST, HashSet())
|
||||
// Log.d("originalUrl==>${originalUrl}, host==>${host}")
|
||||
if (originalUrl?.contains(host) == true) {
|
||||
|
|
@ -173,10 +172,10 @@ class NewMainActivity : BaseActivity() {
|
|||
return
|
||||
}
|
||||
isUpload = true
|
||||
try {
|
||||
|
||||
|
||||
GlobalScope.async {
|
||||
GlobalScope.async {
|
||||
try {
|
||||
val hostsJsonArray = JsonArray()
|
||||
for (hostItem in hostsMem) {
|
||||
val hostAndTime = hostItem.split("{")
|
||||
|
|
@ -188,7 +187,6 @@ class NewMainActivity : BaseActivity() {
|
|||
hostJsonObject.addProperty("requestTime", hostAndTime[1])
|
||||
hostsJsonArray.add(hostJsonObject)
|
||||
}
|
||||
|
||||
val httpApi = NetService.instances.createHttps(HttpApi::class.java)
|
||||
val hostsJsonArrayStr = hostsJsonArray.toString()
|
||||
// Log.d("hostsJsonArrayStr==>$hostsJsonArrayStr")
|
||||
|
|
@ -207,20 +205,18 @@ class NewMainActivity : BaseActivity() {
|
|||
val uploadRequestLogs = httpApi.uploadRequestLogs(requestBody)
|
||||
Log.d("uploadRequestLogs==>${uploadRequestLogs}")
|
||||
// if ("0" == uploadRequestLogs.code) {
|
||||
|
||||
// }
|
||||
//登录失效
|
||||
if (uploadRequestLogs.code == "-3") {
|
||||
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
e.printStackTrace()
|
||||
} finally {
|
||||
hostsMem.clear()
|
||||
isUpload = false
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
e.printStackTrace()
|
||||
} finally {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private val REQUEST_CODE_WRITE_STORAGE = 1
|
||||
|
|
@ -248,6 +244,7 @@ class NewMainActivity : BaseActivity() {
|
|||
//
|
||||
// }
|
||||
// }
|
||||
|
||||
mainAtyVM = ViewModelProvider(this).get(MainAtyVM::class.java)
|
||||
observe(this, mainAtyVM)
|
||||
|
||||
|
|
@ -261,7 +258,7 @@ class NewMainActivity : BaseActivity() {
|
|||
|
||||
val isGlobal = MMKV.defaultMMKV().decodeBool(BZYConstants.MMKV_KEY_GLOBAL_MODEL, false)
|
||||
val uc = MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_VPN_UserCommand, "")
|
||||
Log.i("newMainActGlo isGlobal==>${isGlobal}, uc==>${uc}")
|
||||
// Log.i("newMainActGlo isGlobal==>${isGlobal}, uc==>${uc}")
|
||||
newMainActGlo = isGlobal
|
||||
|
||||
startLog()
|
||||
|
|
|
|||
|
|
@ -51,8 +51,8 @@ subprojects {
|
|||
minSdk = 21
|
||||
//noinspection ExpiredTargetSdkVersion
|
||||
targetSdk = 31
|
||||
versionName = "1.0.2.5"
|
||||
versionCode = 1025
|
||||
versionName = "1.0.2.6"
|
||||
versionCode = 1026
|
||||
resValue("string", "release_name", "v$versionName")
|
||||
resValue("integer", "release_code", "$versionCode")
|
||||
externalNativeBuild {
|
||||
|
|
@ -771,6 +771,23 @@ subprojects {
|
|||
)
|
||||
}
|
||||
//八爪鱼 182227 182250 182256 182251
|
||||
create("182276") {
|
||||
isDefault = true
|
||||
dimension = flavorDimensionList[0]
|
||||
buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
|
||||
buildConfigField("boolean", "is_free", "false")
|
||||
buildConfigField("boolean", "is_back_cn", "false")
|
||||
buildConfigField("boolean", "is_ym", "false")
|
||||
buildConfigField("String", "applicationId", "\"com.yingmao.clash\"")
|
||||
buildConfigField("boolean", "is_tz", "false")
|
||||
buildConfigField("String", "service_url", "\"https://app.bazhuayujiasu.cc:8700\"")
|
||||
buildConfigField("String", "productId", "\"182276\"")
|
||||
manifestPlaceholders(
|
||||
mapOf(
|
||||
"APP_NAME" to "@string/app_name", "APP_ICON" to "@mipmap/logo"
|
||||
)
|
||||
)
|
||||
}
|
||||
create("1822275") {
|
||||
isDefault = true
|
||||
dimension = flavorDimensionList[0]
|
||||
|
|
|
|||
|
|
@ -0,0 +1,35 @@
|
|||
#!/bin/bash
|
||||
# 定义变量
|
||||
PROJECT_DIR=$(pwd) # 当前项目根目录
|
||||
OUTPUT_DIR="/Users/cyh/Documents/buildApp" # 自定义输出目录
|
||||
FLAVORS=("11111" "182222" "182223" "182224" "182226" "182227" "182250" "182251" "182253" "182256" "182257" "182258") # 渠道列表
|
||||
#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}"
|
||||
Loading…
Reference in New Issue