diff --git a/android/TradeBotMonitor/app/build.gradle.kts b/android/TradeBotMonitor/app/build.gradle.kts index ceaa312..53c2cb9 100644 --- a/android/TradeBotMonitor/app/build.gradle.kts +++ b/android/TradeBotMonitor/app/build.gradle.kts @@ -10,7 +10,7 @@ android { applicationId = "xyz.kusoft.tradebotmonitor" minSdk = 26 targetSdk = 36 - versionCode = 10 - versionName = "0.2.7" + versionCode = 11 + versionName = "0.2.8" } } diff --git a/android/TradeBotMonitor/app/src/main/java/xyz/kusoft/tradebotmonitor/MainActivity.kt b/android/TradeBotMonitor/app/src/main/java/xyz/kusoft/tradebotmonitor/MainActivity.kt index 305cd82..fb04b0d 100644 --- a/android/TradeBotMonitor/app/src/main/java/xyz/kusoft/tradebotmonitor/MainActivity.kt +++ b/android/TradeBotMonitor/app/src/main/java/xyz/kusoft/tradebotmonitor/MainActivity.kt @@ -1141,15 +1141,17 @@ class MainActivity : Activity() { (retrain.optJSONObject("coordination") ?: JSONObject()).toString() private fun trainingJobLabel(status: String, phase: String): String = - when { - status == "pending" -> "ждет Windows-agent" - phase == "claimed" -> "задание получено" - phase == "training" -> "идет обучение" - phase == "guard" -> "проверка качества" - phase == "uploading" -> "загрузка результата" - status == "completed" -> "завершено успешно" - status == "failed" -> "ошибка обучения" - status == "running" -> "идет работа" + when (status) { + "pending" -> "ждет Windows-agent" + "completed" -> "завершено успешно" + "failed" -> "ошибка обучения" + "running" -> when (phase) { + "claimed" -> "задание получено" + "training" -> "идет обучение" + "guard" -> "проверка качества" + "uploading" -> "загрузка результата" + else -> "идет работа" + } else -> "готов к запуску" }