From a9ec548557aa3f6075da004a8f83c69e5553ea2c Mon Sep 17 00:00:00 2001 From: yezhiqiu <983577727@qq.com> Date: Fri, 23 Jan 2026 15:37:15 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=88=A0=E9=99=A41=E5=88=86=E9=92=9F?= =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E6=97=B6=E9=97=B4=E8=AE=BE=E7=BD=AE=202.?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Droute=E9=A1=B5=E9=9D=A2=E4=BB=8E=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E5=AE=A0=E7=89=A9=E5=88=87=E6=8D=A2=E5=88=B0=E8=BF=87?= =?UTF-8?q?=E6=9C=9F=E5=AE=A0=E7=89=A9=E6=97=B6=EF=BC=8C=E4=BC=9A=E5=BC=B9?= =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E5=85=85=E5=80=BC=E6=8F=90=E7=A4=BA=E5=BC=B9?= =?UTF-8?q?=E7=AA=97bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../adapter/SubscriptionHistoryAdapter.kt | 14 ++++------ .../tracker/ui/activity/HomeV2Activity.kt | 8 ++++-- .../device/set/TrackingDurationSetActivity.kt | 2 +- .../ui/fragment/data/RouteV2Fragment.kt | 28 +++++++++---------- .../googlemap/HistoryDataGoogleMapFragment.kt | 3 +- 6 files changed, 29 insertions(+), 28 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3c0bc8f..28146e7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,7 +30,7 @@ android { targetSdkVersion 35 versionCode 2105 // versionName "2.1.5" - versionName "2.1.5-Beta1" + versionName "2.1.5-Beta2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/abbidot/tracker/adapter/SubscriptionHistoryAdapter.kt b/app/src/main/java/com/abbidot/tracker/adapter/SubscriptionHistoryAdapter.kt index a887d17..8bcb2ce 100644 --- a/app/src/main/java/com/abbidot/tracker/adapter/SubscriptionHistoryAdapter.kt +++ b/app/src/main/java/com/abbidot/tracker/adapter/SubscriptionHistoryAdapter.kt @@ -108,15 +108,13 @@ class SubscriptionHistoryAdapter( visibility = View.VISIBLE when (item.orderStatus) { 1 -> { - val updateTimestamp = Utils.stringToTimestamp(item.updateTime) + val updateTimestamp = Utils.stringToTimestamp(item.updateTime, isUtc = true) val nowTimestamp = System.currentTimeMillis() - if (item.mealUnit == ConstantString.PackageUnitDay) { - if (item.enabled == ConstantInt.Type0 || (item.surplusDays == 0L && item.subscriptionStatus == ConstantInt.Close)) { - visibility = View.GONE - } else { - visibility = View.VISIBLE - setText(R.string.txt_refund) - } + if (item.enabled == ConstantInt.Type0 || (item.surplusDays == 0L && item.subscriptionStatus == ConstantInt.Close)) { + visibility = View.GONE + } else if (item.mealUnit == ConstantString.PackageUnitDay) { + visibility = View.VISIBLE + setText(R.string.txt_refund) } else if (item.mealUnit == ConstantString.PackageUnitMonth) { val day7Timestamp = 7 * 24 * 60 * 60 * 1000L //套餐超出7天不能退款 diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/HomeV2Activity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/HomeV2Activity.kt index 290ffa1..1442426 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/HomeV2Activity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/HomeV2Activity.kt @@ -103,6 +103,9 @@ class HomeV2Activity : BaseActivity(ActivityHomeV2Binding //是否已经触发倒计时自动连接设备 private var isCountdownAutoConnBle = false + //是否检查套餐过期 + private var isCheckPackageExpire = true + private val mFragments = mutableListOf( ActivityV2Fragment.newInstance(this), RouteV2Fragment.newInstance(this), @@ -541,7 +544,7 @@ class HomeV2Activity : BaseActivity(ActivityHomeV2Binding private fun packageUnavailableState() { getPet(false)?.apply { //判断套餐有没有到期 - if (shared == ConstantInt.NoShare && availableOrder == ConstantInt.Type0) { + if (isCheckPackageExpire && shared == ConstantInt.NoShare && availableOrder == ConstantInt.Type0) { Util.checkPackageExpired(this@HomeV2Activity, deviceId) } } @@ -573,7 +576,8 @@ class HomeV2Activity : BaseActivity(ActivityHomeV2Binding /** * 选择宠物弹窗 */ - fun selectPetDialog() { + fun selectPetDialog(checkPackageExpire: Boolean = true) { + isCheckPackageExpire = checkPackageExpire if (mPetList.size == 0) { showToast(R.string.no_bind_pet) return diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/device/set/TrackingDurationSetActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/device/set/TrackingDurationSetActivity.kt index 8c85927..71643bd 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/device/set/TrackingDurationSetActivity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/device/set/TrackingDurationSetActivity.kt @@ -113,7 +113,7 @@ class TrackingDurationSetActivity : private fun setListData() { val durationList = mutableListOf() - val timeList = mutableListOf(1, 3, 5, 10, 15) + val timeList = mutableListOf(3, 5, 10, 15) for (time in timeList) { DataBean().apply { imageId = time diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV2Fragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV2Fragment.kt index 44d7162..6135faf 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV2Fragment.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV2Fragment.kt @@ -66,7 +66,8 @@ class RouteV2Fragment : BaseFragment(FragmentRouteV2Bind //是否选过自定义日期，没有则再次回到这个页面，刷新取24小时的记录 private var isSelectCustomDate = false - private var isFirst = true + + // private var isFirst = true private var mProgress = -1 //充值续费或升级返回类型 @@ -155,6 +156,7 @@ class RouteV2Fragment : BaseFragment(FragmentRouteV2Bind } private fun initState() { + mViewBinding.miHomeRouteAddressView.visibility = View.GONE mHistoryDataMapCommon.clearAllMarker() setSeekBarMax(0) } @@ -264,28 +266,23 @@ class RouteV2Fragment : BaseFragment(FragmentRouteV2Bind //详细位置 address = it -// val timeString = String.format( -// getString(R.string.map_current_update_time), -// DateUtils.getRelativeTimeSpanString(timeStamp * 1000) -// ) val timeString = Utils.formatTime(timeStamp * 1000, Utils.DATE_FORMAT_PATTERN_EN10) //更新位置时间 dayTime = timeString - var delay = 500L - //第一次延时，等待地图动画执行完成 - if (isFirst) { - isFirst = false - delay = 1500 - } +// var delay = 500L +// //第一次延时，等待地图动画执行完成 +// if (isFirst) { +// isFirst = false +// delay = 1500 +// } mViewBinding.root.postDelayed( { -// mHistoryDataMapCommon.showInfoWindow(this) mViewBinding.miHomeRouteAddressView.let { mi -> mi.visibility = View.VISIBLE mi.setShowText(timeString, it) } - }, delay + }, 100 ) } } @@ -389,7 +386,6 @@ class RouteV2Fragment : BaseFragment(FragmentRouteV2Bind getHomeV2Activity()?.getPet()?.apply { initState() - mViewBinding.miHomeRouteAddressView.visibility = View.GONE mDataDetailViewModel.getHistoryByDay( getHomeV2Activity()!!, deviceId, mFromTimestamp / 1000, mToTimestamp / 1000 ) @@ -432,7 +428,9 @@ class RouteV2Fragment : BaseFragment(FragmentRouteV2Bind // mContext, NotificationV2Activity::class.java // ) // ) - ilHomeRoutePetHead.homeDataPetNameSmall, ilHomeRoutePetHead.homeDataPetHeadSmall.root -> getHomeV2Activity()?.selectPetDialog() + ilHomeRoutePetHead.homeDataPetNameSmall, ilHomeRoutePetHead.homeDataPetHeadSmall.root -> getHomeV2Activity()?.selectPetDialog( + false + ) llHomeRouteCalendarFrom -> { getHomeV2Activity()?.getPet()?.let { diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/map/googlemap/HistoryDataGoogleMapFragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/map/googlemap/HistoryDataGoogleMapFragment.kt index c5fcb65..e77bd02 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/fragment/map/googlemap/HistoryDataGoogleMapFragment.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/map/googlemap/HistoryDataGoogleMapFragment.kt @@ -6,6 +6,7 @@ import android.content.pm.PackageManager import android.graphics.BitmapFactory import android.graphics.Typeface import androidx.core.app.ActivityCompat +import androidx.core.view.isVisible import com.abbidot.baselibrary.constant.MMKVKey import com.abbidot.baselibrary.util.AppUtils import com.abbidot.baselibrary.util.LogUtil @@ -92,7 +93,7 @@ class HistoryDataGoogleMapFragment : BaseGoogleMapFragment() { googleMap.apply { setOnCameraMoveListener { mCurLatLng?.let { - setMarkerInfoViewOffset(mMarkerInfoView, it) + if (mMarkerInfoView.isVisible) setMarkerInfoViewOffset(mMarkerInfoView, it) } }