From 0dfc082f2bdcca064cb2fcb06497ec0ec8c48b1c Mon Sep 17 00:00:00 2001
From: yezhiqiu <983577727@qq.com>
Date: Mon, 20 Apr 2026 15:32:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=97=A0=E4=B8=8A=E6=8A=A5=E7=9A=84=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=97=B6=E9=97=B4=EF=BC=8C=E6=94=B9=E4=B8=BA=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E6=97=B6=E9=97=B4=EF=BC=8C=E6=8C=89=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=89=80=E8=AE=BE=E7=9A=84=E4=B8=8A=E6=8A=A5=E9=97=B4=E9=9A=94?=
 =?UTF-8?q?=E7=9A=842=E5=80=8D=E8=AE=A1=E7=AE=97=E6=97=B6=E9=95=BF=202.?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=86=E5=8F=B2=E8=AE=A2=E5=8D=95=E5=8C=85?=
 =?UTF-8?q?=E6=8B=AC=E8=87=AA=E5=8A=A8=E8=AE=A2=E9=98=85=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetSelector.xml                    |  4 ++--
 .../abbidot/tracker/adapter/MySubscriptionAdapter.kt  |  2 +-
 .../com/abbidot/tracker/retrofit2/INetworkService.kt  | 10 +++++++++-
 .../java/com/abbidot/tracker/retrofit2/NetworkApi.kt  | 11 +++++++++--
 .../ui/activity/device/set/LedLightActivityV0.kt      |  2 +-
 .../activity/subscribe/SubscriptionHistoryActivity.kt |  6 +++---
 .../tracker/ui/fragment/data/RouteV3Fragment.kt       |  2 --
 .../tracker/ui/fragment/device/HomeTrackFragment.kt   |  4 ++--
 .../abbidot/tracker/ui/fragment/map/MapV3Fragment.kt  |  7 ++++---
 app/src/main/java/com/abbidot/tracker/util/Util.kt    | 10 +++++-----
 .../main/java/com/abbidot/tracker/vm/MapViewModel.kt  |  4 ++--
 .../abbidot/tracker/vm/SubscriptionManageViewModel.kt |  7 +++++++
 12 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index ba1914e..704abaf 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-04-01T06:06:01.472811800Z">
+        <DropdownSelection timestamp="2026-04-20T07:03:55.586316Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=3A040DLJH000R0" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=R5CT80BHT3Y" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/src/main/java/com/abbidot/tracker/adapter/MySubscriptionAdapter.kt b/app/src/main/java/com/abbidot/tracker/adapter/MySubscriptionAdapter.kt
index 5b86486..a22a058 100644
--- a/app/src/main/java/com/abbidot/tracker/adapter/MySubscriptionAdapter.kt
+++ b/app/src/main/java/com/abbidot/tracker/adapter/MySubscriptionAdapter.kt
@@ -205,7 +205,7 @@ class MySubscriptionAdapter(
             setOnClickListener {
                 qMUIPopups.dismiss()
                 Intent(mContext, SubscriptionHistoryActivity::class.java).let {
-                    it.putExtra(ConstantString.DeviceId, item.deviceId)
+                    it.putExtra(ConstantString.Id, item.subscriptionId)
                     mMySubscriptionActivity.startActivity(it)
                 }
             }
diff --git a/app/src/main/java/com/abbidot/tracker/retrofit2/INetworkService.kt b/app/src/main/java/com/abbidot/tracker/retrofit2/INetworkService.kt
index 8b41986..f47b3e1 100644
--- a/app/src/main/java/com/abbidot/tracker/retrofit2/INetworkService.kt
+++ b/app/src/main/java/com/abbidot/tracker/retrofit2/INetworkService.kt
@@ -1285,13 +1285,21 @@ interface INetworkService {
         @Query("userId") userId: String, @Query("deviceId") deviceId: String
     ): BaseResponse<MutableList<SubscriptionsOrderBean>>
 
+    /**
+     * 获取设备充值得的历史记录(包括自动续订)
+     */
+    @GET("order$SUBSCRIPTIONS_V3/subscriptions/historyIncludRenew")
+    suspend fun getHistoryIncludeRenew(
+        @Query("subscriptionId") subscriptionId: String
+    ): BaseResponse<MutableList<SubscriptionsOrderBean>>
+
     /**
      * 提交退款申请
      */
     @FormUrlEncoded
     @POST("order$SUBSCRIPTIONS_V3/refund/commit")
     suspend fun commitRefund(
-        @Field("currency_code") currency_code: String,
+        @Field("currency_code") currencyCode: String,
         @Field("orderNum") orderNum: String,
         @Field("chargeId") chargeId: String,
         @Field("amount") amount: Int,
diff --git a/app/src/main/java/com/abbidot/tracker/retrofit2/NetworkApi.kt b/app/src/main/java/com/abbidot/tracker/retrofit2/NetworkApi.kt
index 181b31c..e9c3c66 100644
--- a/app/src/main/java/com/abbidot/tracker/retrofit2/NetworkApi.kt
+++ b/app/src/main/java/com/abbidot/tracker/retrofit2/NetworkApi.kt
@@ -1173,11 +1173,18 @@ object NetworkApi : BaseNetworkApi<INetworkService>(INetworkService.BASE_URL) {
         service.getSubscriptionsHistory(userId, deviceId)
     }
 
+    /**
+     * 获取设备充值得的历史记录(包括自动续订)
+     */
+    suspend fun getHistoryIncludeRenew(subscriptionId: String) = getResult {
+        service.getHistoryIncludeRenew(subscriptionId)
+    }
+
     /**
      * 获取设备充值得的历史记录
      */
     suspend fun commitRefund(
-        currency_code: String,
+        currencyCode: String,
         orderId: String,
         chargeId: String,
         amount: Int,
@@ -1189,7 +1196,7 @@ object NetworkApi : BaseNetworkApi<INetworkService>(INetworkService.BASE_URL) {
         payType: Int
     ) = getResult {
         service.commitRefund(
-            currency_code,
+            currencyCode,
             orderId,
             chargeId,
             amount,
diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/device/set/LedLightActivityV0.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/device/set/LedLightActivityV0.kt
index 677e2b8..caa4cc8 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/activity/device/set/LedLightActivityV0.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/activity/device/set/LedLightActivityV0.kt
@@ -245,7 +245,7 @@ class LedLightActivityV0 : BaseActivity<ActivityLedLightBinding>(ActivityLedLigh
                 setDisabledState(false)
             } else {
                 //是否超时上报
-                val isTimeoutReport = Util.isTimeoutReport(updateTime)
+                val isTimeoutReport = Util.isTimeoutReport(updateTime,gnssInterval)
                 if (powerSwitch == ConstantInt.Type0 || powerSwitch == ConstantInt.Type2 || powerSwitch == ConstantInt.Type3 || inWifiZone == ConstantInt.Type1 || isTimeoutReport) {
                     setDisabledState(true)
                 } else {
diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SubscriptionHistoryActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SubscriptionHistoryActivity.kt
index 66e234f..377f1a5 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SubscriptionHistoryActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SubscriptionHistoryActivity.kt
@@ -23,7 +23,7 @@ class SubscriptionHistoryActivity :
 
     private lateinit var mHistoryAdapter: SubscriptionHistoryAdapter
     private var mSubscriptionsOrderList = mutableListOf<SubscriptionsOrderBean>()
-    private var mDeviceId = ""
+    private var subscriptionId = ""
     private var mRefreshPackage = true
 
     override fun getTopBar() = mViewBinding.ilSubscriptionHistoryTopBar.titleTopBar
@@ -41,7 +41,7 @@ class SubscriptionHistoryActivity :
         }
 
         intent?.extras?.apply {
-            mDeviceId = getString(ConstantString.DeviceId, "")
+            subscriptionId = getString(ConstantString.Id, "")
         }
     }
 
@@ -49,7 +49,7 @@ class SubscriptionHistoryActivity :
         super.onResume()
         if (mRefreshPackage) {
             mRefreshPackage = false
-            mSubscriptionViewModel.getSubscriptionsHistory(mDeviceId)
+            mSubscriptionViewModel.getHistoryIncludeRenew("sub_1TN3ccCUI9XSagUNmhpfpRk4")
         }
     }
 
diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV3Fragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV3Fragment.kt
index c2910b2..8319740 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV3Fragment.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV3Fragment.kt
@@ -537,9 +537,7 @@ class RouteV3Fragment : BaseFragment<FragmentRouteV3Binding>(FragmentRouteV3Bind
                 vsbMapRouteLineV3.visibility = View.VISIBLE
                 ivMapRouteLineV3LastBtn.visibility = View.VISIBLE
                 ivMapRouteLineV3NextBtn.visibility = View.VISIBLE
-                LogUtil.e("显示")
             } else {
-                LogUtil.e("隐藏")
                 vsbMapRouteLineV3.visibility = View.GONE
                 ivMapRouteLineV3LastBtn.visibility = View.GONE
                 ivMapRouteLineV3NextBtn.visibility = View.GONE
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 556c74c..c7a2f21 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
@@ -653,7 +653,7 @@ class HomeTrackFragment :
             }
 
             //是否超时上报
-            val isTimeoutReport = Util.isTimeoutReport(updateTime)
+            val isTimeoutReport = Util.isTimeoutReport(updateTime,gnssInterval)
             mTrackStateList[0].let {
                 it.menuValue =
                     if (isTimeoutReport || lteSignal == ConstantInt.NoSignal || powerSwitch == ConstantInt.Type0 || powerSwitch == ConstantInt.Type2) {
@@ -773,7 +773,7 @@ class HomeTrackFragment :
     private fun setLedControlState(mapDeviceBean: MapDeviceBean) {
         mapDeviceBean.apply {
             //是否超时上报
-            val isTimeoutReport = Util.isTimeoutReport(updateTime)
+//            val isTimeoutReport = Util.isTimeoutReport(updateTime,gnssInterval)
             mTrackStateList[5].let {
                 if (deviceType == ConstantInt.Type1) {
                     it.imageId = R.drawable.icon_light_svg
diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/map/MapV3Fragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/map/MapV3Fragment.kt
index 883c399..7bbd9ca 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/fragment/map/MapV3Fragment.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/map/MapV3Fragment.kt
@@ -747,8 +747,9 @@ class MapV3Fragment : BaseFragment<FragmentMapV3Binding>(FragmentMapV3Binding::i
         mapDeviceBean.apply {
             val share = MMKVUtil.getInt(MMKVKey.Shared)
             //分钟后无上报、没有lte信号或在wifi中隐藏直播按钮
-            isCanLive =
-                !(Util.isTimeoutReport(updateTime) || powerSwitch == ConstantInt.Type0 || powerSwitch == ConstantInt.Type2 || powerSwitch == ConstantInt.Type3 || inWifiZone == ConstantInt.Type1)
+            isCanLive = !(Util.isTimeoutReport(
+                updateTime, gnssInterval
+            ) || powerSwitch == ConstantInt.Type0 || powerSwitch == ConstantInt.Type2 || powerSwitch == ConstantInt.Type3 || inWifiZone == ConstantInt.Type1)
             mViewBinding.homeMapLiveBtn.visibility =
                 if (share != ConstantInt.NoShare || deviceType == ConstantInt.Type1) {
                     View.GONE
@@ -777,7 +778,7 @@ class MapV3Fragment : BaseFragment<FragmentMapV3Binding>(FragmentMapV3Binding::i
     }
 
     /**
-     * 接收添加信用卡返回结果
+     * 接收直播页面宠物弹窗操作
      */
     private val mActivityResultLauncher =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
diff --git a/app/src/main/java/com/abbidot/tracker/util/Util.kt b/app/src/main/java/com/abbidot/tracker/util/Util.kt
index 2d838de..69b628a 100644
--- a/app/src/main/java/com/abbidot/tracker/util/Util.kt
+++ b/app/src/main/java/com/abbidot/tracker/util/Util.kt
@@ -797,14 +797,14 @@ class Util {
         }
 
         /**
-         * 是否是超时上报了
+         * 是否是超时上报了,按用户所设的上报间隔的2倍计算时长
          *
          * @param updateTime 10位时间戳
          */
-        fun isTimeoutReport(updateTime: Long): Boolean {
+        fun isTimeoutReport(updateTime: Long, gnssInterval: Int): Boolean {
             val now = System.currentTimeMillis() / 1000
-            val updateMin = (now - updateTime) / 60
-            return updateMin > ConstantInt.ReportTimeOutTime
+            val updateSecond = now - updateTime
+            return updateSecond > gnssInterval * 2
         }
 
         /***
@@ -834,7 +834,7 @@ class Util {
             var isControl: Boolean
             mapDeviceBean.apply {
                 //是否超时上报
-                val isTimeoutReport = isTimeoutReport(updateTime)
+                val isTimeoutReport = isTimeoutReport(updateTime, gnssInterval)
                 isControl = if (powerSwitch == ConstantInt.Type3) false
                 else if (SRBleUtil.instance.isMacConnect(mac)) true
                 else if (powerSwitch == ConstantInt.Type0 || powerSwitch == ConstantInt.Type2 || inWifiZone == ConstantInt.Type1 || isTimeoutReport) false
diff --git a/app/src/main/java/com/abbidot/tracker/vm/MapViewModel.kt b/app/src/main/java/com/abbidot/tracker/vm/MapViewModel.kt
index 1520286..fa9568b 100644
--- a/app/src/main/java/com/abbidot/tracker/vm/MapViewModel.kt
+++ b/app/src/main/java/com/abbidot/tracker/vm/MapViewModel.kt
@@ -185,7 +185,7 @@ class MapViewModel : ViewModel() {
                 }
             }
             //网络无信号/ 分钟后无上报所有绿点取消显示
-            else if (lteSignal <= ConstantInt.NoSignal || Util.isTimeoutReport(updateTime)) {
+            else if (lteSignal <= ConstantInt.NoSignal || Util.isTimeoutReport(updateTime,gnssInterval)) {
 //                setNoState(context, deviceStateList)
 
                 //警告状态
@@ -307,7 +307,7 @@ class MapViewModel : ViewModel() {
     ) {
         mapDeviceBean.let {
             //是否超时上报
-            val isTimeoutReport = Util.isTimeoutReport(it.updateTime)
+            val isTimeoutReport = Util.isTimeoutReport(it.updateTime,it.gnssInterval)
             deviceStateList[0].apply {
                 menuType = ConstantInt.Open
                 val lteValue =
diff --git a/app/src/main/java/com/abbidot/tracker/vm/SubscriptionManageViewModel.kt b/app/src/main/java/com/abbidot/tracker/vm/SubscriptionManageViewModel.kt
index 9fa69d5..92da497 100644
--- a/app/src/main/java/com/abbidot/tracker/vm/SubscriptionManageViewModel.kt
+++ b/app/src/main/java/com/abbidot/tracker/vm/SubscriptionManageViewModel.kt
@@ -61,6 +61,13 @@ class SubscriptionManageViewModel : ViewModel() {
         }
     }
 
+    fun getHistoryIncludeRenew(subscriptionId: String) {
+        viewModelScope.launch {
+            val result = NetworkApi.getHistoryIncludeRenew(subscriptionId)
+            mSubscriptionsHistoryLiveData.value = result
+        }
+    }
+
     fun commitRefund(
         orderId: String,
         chargeId: String,