ABBIDOT_APP/Abbidot_Android
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修复连接蓝牙，宠物头像还显示关机bug

Browse Source 
2.修复过期充值有时会出现蓝牙激活bug
This commit is contained in:
yezhiqiu
2026-01-28 16:25:18 +08:00
parent a9ec548557
commit 3ddc5c23f6
8 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@@ -28,9 +28,9 @@ android {
applicationId "com.abbidot.tracker"
minSdkVersion 23
targetSdkVersion 35
versionCode 2105
// versionName "2.1.5"
versionName "2.1.5-Beta2"
versionCode 2106
// versionName "2.1.6"
versionName "2.1.6-Beta1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

4
app/src/main/java/com/abbidot/tracker/adapter/NotificationV2Adapter.kt
View File

@@ -58,7 +58,7 @@ class NotificationV2Adapter(
private fun getRelativeTimeString(sendTime: String): String {
var formatDateStr = ""
val time = Utils.stringToTimestamp(sendTime)
val time = Utils.stringToTimestamp(sendTime, isUtc = true)
val now = System.currentTimeMillis()
formatDateStr = if (DateUtils.isToday(time)) {
mContext.getString(R.string.txt_today) + " " + Utils.formatTime(
@@ -70,7 +70,7 @@ class NotificationV2Adapter(
)
} else {
Utils.formatTime(
Utils.stringToTimestamp(sendTime, isUtc = true), Utils.DATE_FORMAT_PATTERN_EN9
Utils.stringToTimestamp(sendTime), Utils.DATE_FORMAT_PATTERN_EN9
)
}
return formatDateStr

2
app/src/main/java/com/abbidot/tracker/ui/activity/HomeV2Activity.kt
View File

@@ -174,6 +174,8 @@ class HomeV2Activity : BaseActivity<ActivityHomeV2Binding>(ActivityHomeV2Binding
mCountdownType = ConstantInt.Type0
mCountDownTimerViewModel.startCountDown(4)
} else {
//清除首次绑定设备信息
MMKVUtil.putString(MMKVKey.FirstDeviceMac, "")
val connectivityManager = getSystemService(CONNECTIVITY_SERVICE) as ConnectivityManager
val networkCallback: ConnectivityManager.NetworkCallback =
object : ConnectivityManager.NetworkCallback() {

5
app/src/main/java/com/abbidot/tracker/ui/activity/pet/InviteFamilyActivity.kt
View File

@@ -92,12 +92,15 @@ class InviteFamilyActivity :
override fun liveDataObserve() {
mFamilyViewModel.mInviteLiveData.observe(this) {
mViewBinding.btnInviteFamilyInvite.isEnabled = true
dealRequestResult(it, object : GetResultCallback {
override fun onResult(any: Any) {
XEventBus.post(EventName.RefreshFamily)
showToast(R.string.tracker_manage_set_add_family_succ, true)
}
override fun onRequestError(exceptionCode: String?) {
mViewBinding.btnInviteFamilyInvite.isEnabled = true
}
})
}
}

2
app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/PaymentSuccessActivity.kt
View File

@@ -83,7 +83,7 @@ class PaymentSuccessActivity :
mMac = MMKVUtil.getString(MMKVKey.FirstDeviceMac)
if (TextUtils.isEmpty(mMac)) {
btnPaymentSuccessContinue.setText(R.string.txt_continue)
btnPaymentSuccessContinue.setText(R.string.txt_done)
tvPaymentSuccessActivateTip.visibility = View.INVISIBLE
ilPaymentSuccessBluetoothTips.root.visibility = View.GONE
} else {

5
app/src/main/java/com/abbidot/tracker/ui/fragment/device/HomeTrackFragment.kt
View File

@@ -609,8 +609,9 @@ class HomeTrackFragment :
(gnssInterval / 60).toString() + getString(R.string.data_active_unit_min)
it[2].menuValue =
(liveTime / 60).toString() + getString(R.string.data_active_unit_min)
it[4].type = if (powerSwitch == ConstantInt.Type3) ConstantInt.SpecialType
else ConstantInt.Type0
it[4].type =
if (powerSwitch == ConstantInt.Type3 || powerSwitch == ConstantInt.Type0) ConstantInt.SpecialType
else ConstantInt.Type0
it[4].menuValue = when (powerSwitch) {
ConstantInt.Type0 -> getString(R.string.tracker_manage_set_led_off)
ConstantInt.Type1 -> getString(R.string.tracker_manage_set_led_on)

13
app/src/main/java/com/abbidot/tracker/ui/fragment/map/MapV3Fragment.kt
View File

@@ -286,6 +286,13 @@ class MapV3Fragment : BaseFragment<FragmentMapV3Binding>(FragmentMapV3Binding::i
if (trackBle.mac == macID) {
if (trackBle.conState == ConState.CONNECTED) {
mMapDeviceBean?.let {
//连接上蓝牙，关机不显示
if (it.powerSwitch == ConstantInt.Type0) {
it.canShowBattery = false
it.isCloseBattery = true
mViewBinding.llHomeMapDeviceBatteryLayout.visibility =
View.INVISIBLE
}
mMapViewModel.setDeviceStateAndWarningData(
mContext!!,
getHomeV2Activity()?.getPet(),
@@ -298,6 +305,12 @@ class MapV3Fragment : BaseFragment<FragmentMapV3Binding>(FragmentMapV3Binding::i
)
}
} else {
mMapDeviceBean?.let {
if (it.powerSwitch == ConstantInt.Type0) {
it.canShowBattery = true
it.isCloseBattery = false
}
}
//隐藏蓝牙nearby
mViewBinding.ilHomeMapDeviceMsg.root.visibility = View.GONE
//蓝牙断开就重新获取服务器数据，蓝牙数据上报断开

12
app/src/main/java/com/abbidot/tracker/vm/MapViewModel.kt
View File

@@ -440,9 +440,15 @@ class MapViewModel : ViewModel() {
canShowBattery = true
rootView.visibility = View.VISIBLE
if (powerSwitch == ConstantInt.Type0) {
it.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0)
it.text = context.getString(R.string.txt_powered_off)
ViewUtil.instance.viewShow(closeBtn)
//连接蓝牙就不显示关机
if (SRBleUtil.instance.isMacConnect(deviceMacId)) {
rootView.visibility = View.INVISIBLE
canShowBattery = false
} else {
it.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0)
it.text = context.getString(R.string.txt_powered_off)
ViewUtil.instance.viewShow(closeBtn)
}
} else if (powerSwitch == ConstantInt.Type3) {
it.setCompoundDrawablesWithIntrinsicBounds(
R.drawable.icon_charge_image, 0, 0, 0