diff --git a/app/build.gradle b/app/build.gradle index 1027656..d805e57 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,9 +28,9 @@ android { applicationId "com.abbidot.tracker" minSdkVersion 23 targetSdkVersion 35 - versionCode 2106 -// versionName "2.1.6" - versionName "2.1.6-Beta3" + versionCode 2107 +// versionName "2.1.7" + versionName "2.1.7-Beta1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/abbidot/tracker/base/BaseActivity.kt b/app/src/main/java/com/abbidot/tracker/base/BaseActivity.kt index 511c2f0..a78534d 100644 --- a/app/src/main/java/com/abbidot/tracker/base/BaseActivity.kt +++ b/app/src/main/java/com/abbidot/tracker/base/BaseActivity.kt @@ -671,6 +671,41 @@ abstract class BaseActivity(val inflater: (inflater: LayoutInfl showToast(R.string.txt_no_dfu) return true } + //系统异常 + "1001" -> { + showToast(R.string.txt_system_error) + return true + } + + "1002" -> { + showToast(R.string.txt_missing_param) + return true + } + + "1003" -> { + showToast(R.string.txt_tracker_busy) + return true + } + + "1004" -> { + showToast(R.string.txt_tracker_offline) + return true + } + + "1005" -> { + showToast(R.string.txt_tracker_live) + return true + } + + "1006" -> { + showToast(R.string.txt_time_out_try_again) + return true + } + + "1007" -> { + showToast(R.string.txt_abnormity) + return true + } else -> return false } diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 0aaba98..9181392 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -971,5 +971,11 @@ 低至 APP出现异常,即将退出! + 系统异常 + 缺少参数 + Tracker设备繁忙,还有之前的下发任务未完成 + Tracker设备未在线 + Tracker启动了Live直播 + 其他异常 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ea313d1..161df8e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1056,11 +1056,17 @@ Unbind Device Edit Profile No internet connection + System Error: Please try again later. + Missing Parameters. + Tracker Busy. Please wait and retry. + Tracker Offline. Unable to proceed. + Live stream in progress. Settings unavailable. + Operation failed. Please try again. /day Renewal: $%s/%s day on %s /day x%s - "ABBIDOT APP collects location data,The route and distance between the current location and the device can be calculated." + "ABBIDOT APP collects location data,The route and distance between the current location and the device can be calculated." (Renew at $%s per %s day thereafter) \ No newline at end of file