diff --git a/app/src/main/java/com/abbidot/tracker/bean/MapDeviceBean.kt b/app/src/main/java/com/abbidot/tracker/bean/MapDeviceBean.kt index 394ba09..682793a 100644 --- a/app/src/main/java/com/abbidot/tracker/bean/MapDeviceBean.kt +++ b/app/src/main/java/com/abbidot/tracker/bean/MapDeviceBean.kt @@ -37,6 +37,7 @@ data class MapDeviceBean( var endTime: String, var deviceType: Int, var wifiZoneName: String, + var version: String, var notifyLocationFail: Boolean, var canShowBattery: Boolean,//是否可以显示电池提示布局 var isCloseBattery: Boolean,//是否关闭电池提示 @@ -74,6 +75,7 @@ data class MapDeviceBean( "", 1, "", + "", false, false, false, diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/device/HomeTrackFragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/device/HomeTrackFragment.kt index 9521b8a..51f9d72 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/fragment/device/HomeTrackFragment.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/device/HomeTrackFragment.kt @@ -719,6 +719,9 @@ class HomeTrackFragment : mTrackMenuList.let { findItem(it, getString(R.string.tracker_manage_set_duration))?.menuValue = (gnssInterval / 60).toString() + getString(R.string.data_active_unit_min) + if (!BleManager.getInstance().isConnected(deviceMacId)) { + findItem(it, getString(R.string.txt_firmware_version))?.menuValue = version + } findItem(it, getString(R.string.txt_live_duration))?.menuValue = (liveTime / 60).toString() + getString(R.string.data_active_unit_min) findItem(it, getString(R.string.txt_power_off))?.let { menu ->