From 8ebaad01441fc07fa8c8e8a8ac6f7ed7a084c263 Mon Sep 17 00:00:00 2001 From: shenzuqiang Date: Wed, 11 Mar 2026 17:40:34 +0800 Subject: [PATCH] =?UTF-8?q?Dev=EF=BC=9A=201=E3=80=81=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=80=A7=E8=83=BD=E9=97=AE=E9=A2=98=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/img/rabbit/pages/screen/HomeScreen.kt | 17 ++++++++--------- .../java/com/img/rabbit/utils/UniAppUtils.kt | 5 +++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/img/rabbit/pages/screen/HomeScreen.kt b/app/src/main/java/com/img/rabbit/pages/screen/HomeScreen.kt index 70edea3..681afc1 100644 --- a/app/src/main/java/com/img/rabbit/pages/screen/HomeScreen.kt +++ b/app/src/main/java/com/img/rabbit/pages/screen/HomeScreen.kt @@ -78,7 +78,6 @@ fun HomeScreen( val TAG = "Rabbit_HomeScreen" val context = LocalContext.current val scope: CoroutineScope = rememberCoroutineScope() -// val progressPair = mutableStateMapOf() val progressPair = remember { mutableStateMapOf() } // 获取当前路由状态 @@ -217,19 +216,19 @@ fun HomeScreen( UniMpUpdate.DOWNLOAD_START -> { //资源开始下载 progressPair.apply { put(uniMpId, 0f) } - Log.i("HomeScreen", "DOWNLOAD_START") + Log.i(TAG, "DOWNLOAD_START") } UniMpUpdate.DOWNLOAD_FINISH -> { //资源下载完成 progressPair.apply { put(uniMpId, 1f) } - Log.i("HomeScreen", "DOWNLOAD_FINISH") + Log.i(TAG, "DOWNLOAD_FINISH") } UniMpUpdate.DOWNLOAD_FAIL -> { //资源下载失败 progressPair.apply { put(uniMpId, -1f) } - Log.i("HomeScreen", "DOWNLOAD_FAIL") + Log.i(TAG, "DOWNLOAD_FAIL") } else -> { @@ -242,7 +241,7 @@ fun HomeScreen( ) } Log.i( - "HomeScreen", + TAG, "DOWNLOAD_PROGRESS:$progress" ) } @@ -347,19 +346,19 @@ fun HomeScreen( UniMpUpdate.DOWNLOAD_START -> { //资源开始下载 progressPair.apply { put(uniMpId, 0f) } - Log.i("HomeScreen", "DOWNLOAD_START") + Log.i(TAG, "DOWNLOAD_START") } UniMpUpdate.DOWNLOAD_FINISH -> { //资源下载完成 progressPair.apply { put(uniMpId, 1f) } - Log.i("HomeScreen", "DOWNLOAD_FINISH") + Log.i(TAG, "DOWNLOAD_FINISH") } UniMpUpdate.DOWNLOAD_FAIL -> { //资源下载失败 progressPair.apply { put(uniMpId, -1f) } - Log.i("HomeScreen", "DOWNLOAD_FAIL") + Log.i(TAG, "DOWNLOAD_FAIL") } else -> { @@ -372,7 +371,7 @@ fun HomeScreen( ) } Log.i( - "HomeScreen", + TAG, "DOWNLOAD_PROGRESS:$progress" ) } diff --git a/app/src/main/java/com/img/rabbit/utils/UniAppUtils.kt b/app/src/main/java/com/img/rabbit/utils/UniAppUtils.kt index 3b0047d..54b25e6 100644 --- a/app/src/main/java/com/img/rabbit/utils/UniAppUtils.kt +++ b/app/src/main/java/com/img/rabbit/utils/UniAppUtils.kt @@ -363,8 +363,8 @@ object UniAppUtils { val stringBuilder = StringBuilder() stringBuilder.append("-------------> 📤 header start<-------------\n") stringBuilder.append("│ x-token = ${PreferenceUtil.getXToken()}\n") - stringBuilder.append("│ x-version = android\n") - stringBuilder.append("│ x-platform = ${getAppVersionName()}\n") + stringBuilder.append("│ x-version = ${getAppVersionName()}\n") + stringBuilder.append("│ x-platform = android\n") stringBuilder.append("│ x-device-id = ${DeviceIdentifier.getAndroidID(applicationContext)}\n") stringBuilder.append("│ x-mobile-brand = ${android.os.Build.BRAND}\n") stringBuilder.append("│ x-mobile-model = ${android.os.Build.MODEL}\n") @@ -374,6 +374,7 @@ object UniAppUtils { stringBuilder.append("│ host = ${Constants.RELEASE_BASE_URL}\n") stringBuilder.append("│ decrypt = ${Constants.AESDecrypt}\n") stringBuilder.append("│ decrypt = ${Constants.Signature}\n") + stringBuilder.append("│ isCombo = ok\n") stringBuilder.append("-------------> header end <-------------") Log.i("UniAppUtils", stringBuilder.toString())