From 69b91f8135e723f57a00d160a07e6dfe07dcc4e6 Mon Sep 17 00:00:00 2001 From: yezhiqiu <123456@qq.com> Date: Wed, 23 Sep 2026 18:12:11 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=BC=80=E5=90=AF=E8=AE=A2?= =?UTF-8?q?=E9=98=85=E4=B8=8D=E8=83=BD=E9=80=80=E6=AC=BEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../tracker/adapter/MyTrackerV2Adapter.kt | 13 +++++++++--- .../adapter/SubscriptionHistoryAdapter.kt | 20 ++++--------------- .../com/abbidot/tracker/ui/DebugActivity.kt | 13 ++++++++++-- .../tracker/ui/activity/HomeV2Activity.kt | 2 +- .../ui/activity/device/MyTrackerV2Activity.kt | 1 - .../subscribe/RefundDetailsActivity.kt | 7 ------- app/src/main/res/layout/activity_debug.xml | 14 ++++++++++--- .../res/layout/item_my_tracker_v2_layout.xml | 2 +- app/src/main/res/values/colors.xml | 3 +++ app/src/main/res/values/strings.xml | 2 +- .../com/abbidot/baselibrary/util/AppUtils.kt | 10 ++++++++++ 12 files changed, 53 insertions(+), 36 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4431e50..bcd9208 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,7 +30,7 @@ android { targetSdkVersion 35 versionCode 2600 // versionName "2.6.0" - versionName "2.6.0-Beta1" + versionName "2.6.0-Beta3" 4 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/abbidot/tracker/adapter/MyTrackerV2Adapter.kt b/app/src/main/java/com/abbidot/tracker/adapter/MyTrackerV2Adapter.kt index f41f2e8..65619d2 100644 --- a/app/src/main/java/com/abbidot/tracker/adapter/MyTrackerV2Adapter.kt +++ b/app/src/main/java/com/abbidot/tracker/adapter/MyTrackerV2Adapter.kt @@ -4,6 +4,7 @@ import android.content.Context import android.content.Intent import android.text.TextUtils import android.view.View +import androidx.core.content.ContextCompat import com.abbidot.baselibrary.list.BaseRecyclerAdapter import com.abbidot.baselibrary.list.RecyclerViewHolder import com.abbidot.tracker.R @@ -105,12 +106,18 @@ class MyTrackerV2Adapter( trackerName.text = item.deviceOutId val battery = "${item.batteryCapacity} " batteryTextView.text = battery - val batteryBg = if (item.batteryCapacity >= 60) + var textColor: Int + val batteryBg = if (item.batteryCapacity >= 60) { + textColor = R.color.green_color4 R.drawable.icon_device_high_battery_bg - else if (item.batteryCapacity >= 20) + } else if (item.batteryCapacity >= 20) { + textColor = R.color.orange_color7 R.drawable.icon_device_middle_battery_bg - else + } else { + textColor = R.color.red_color6 R.drawable.icon_device_low_battery_bg + } + batteryTextView.setTextColor(ContextCompat.getColor(mContext, textColor)) batteryTextView.setBackgroundResource(batteryBg) } if (null == item.pet) { 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 46cd4ac..945fe8e 100644 --- a/app/src/main/java/com/abbidot/tracker/adapter/SubscriptionHistoryAdapter.kt +++ b/app/src/main/java/com/abbidot/tracker/adapter/SubscriptionHistoryAdapter.kt @@ -6,10 +6,8 @@ import android.view.View import android.widget.TextView import androidx.appcompat.widget.AppCompatImageView import androidx.appcompat.widget.LinearLayoutCompat -import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.abbidot.baselibrary.util.LogUtil import com.abbidot.baselibrary.util.Utils import com.abbidot.tracker.R import com.abbidot.tracker.bean.SubscriptionsOrderBean @@ -24,9 +22,7 @@ import com.abbidot.tracker.widget.TypefaceTextView import com.chad.library.adapter.base.BaseMultiItemQuickAdapter import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.hjq.toast.Toaster -import com.qmuiteam.qmui.widget.grouplist.QMUICommonListItemView import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButtonDrawable -import com.stripe.android.core.AppInfo /** *Created by .yzq on 2024/8/19/019. @@ -125,13 +121,8 @@ class SubscriptionHistoryAdapter( else { visibility = View.VISIBLE when (item.orderStatus) { - 1 -> { - if (item.subscriptionStatus == ConstantInt.Type1) { - visibility = View.GONE - } else { - setRefundState(context, item.isRefundable, this) - } - } + 1 -> + setRefundState(context, item.isRefundable, this) 4 -> setText(R.string.txt_waiting) 5 -> setText(R.string.txt_refunding) @@ -183,8 +174,7 @@ class SubscriptionHistoryAdapter( //orderStatus=0 支付取消 1支付成功 2支付失败 3待支付 4申请审核中 5退款中 6退款成功 7退款失败 8审核失败 when (item.orderStatus) { 1 -> { - if (item.subscriptionStatus == ConstantInt.Type1) context.getString(R.string.txt_unavailable) - else if (item.isRefundable == ConstantInt.Type1) context.getString(R.string.txt_available) + if (item.isRefundable == ConstantInt.Type1) context.getString(R.string.txt_available) else context.getString(R.string.txt_unavailable) } @@ -203,10 +193,8 @@ class SubscriptionHistoryAdapter( //orderStatus=0 支付取消 1支付成功 2支付失败 3待支付 4申请审核中 5退款中 6退款成功 7退款失败 8审核失败 when (item.orderStatus) { 1 -> { - if (item.subscriptionStatus == ConstantInt.Type1) null - else if (item.isRefundable == ConstantInt.Type1) + if (item.isRefundable == ConstantInt.Type1) Intent(context, RequestRefundActivity::class.java) -// Intent(context, RefundDetailsActivity::class.java) else null } diff --git a/app/src/main/java/com/abbidot/tracker/ui/DebugActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/DebugActivity.kt index 16d8ab2..60886ef 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/DebugActivity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/DebugActivity.kt @@ -3,6 +3,7 @@ package com.abbidot.tracker.ui import android.view.View import androidx.activity.viewModels import com.abbidot.baselibrary.constant.MMKVKey +import com.abbidot.baselibrary.util.AppUtils import com.abbidot.baselibrary.util.LogUtil import com.abbidot.baselibrary.util.MMKVUtil import com.abbidot.baselibrary.util.Utils @@ -110,6 +111,10 @@ class DebugActivity : BaseActivity(ActivityDebugBinding::i showToast("修改成功,下次刷新位置生效") } } + mViewBinding.liDebugSystemRegion.let { + it.text = "系统地区" + it.detailText = "${AppUtils.getCountry()}-${AppUtils.getDisplayCountry()}" + } } /** @@ -152,10 +157,14 @@ class DebugActivity : BaseActivity(ActivityDebugBinding::i val convertLatLon = LonAndLatUtil.convertFromWGS84ToGCJ02(data.latitude, data.longitude) ViewUtil.instance.addMenuBean( - mMutableList, "longitude", "${data.longitude}(GPS)\n${convertLatLon[1]}" + mMutableList, + "longitude", + "${data.longitude}(GPS)\n${convertLatLon[1]}" ) ViewUtil.instance.addMenuBean( - mMutableList, "latitude", "${data.latitude}(GPS)\n${convertLatLon[0]}" + mMutableList, + "latitude", + "${data.latitude}(GPS)\n${convertLatLon[0]}" ) } else { ViewUtil.instance.addMenuBean( 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 c73faf6..e1e912c 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 @@ -743,7 +743,7 @@ class HomeV2Activity : BaseActivity(ActivityHomeV2Binding } override fun onChangeClick(position: Int) { - if (mPetList.size == 0) return + if (mPetList.isEmpty()) return mChangePetDialog?.dismiss() mSelectPetPosition = position mChangePetListDialogAdapter.setSelectPetPos(mSelectPetPosition) diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/device/MyTrackerV2Activity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/device/MyTrackerV2Activity.kt index a938341..e41fa53 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/device/MyTrackerV2Activity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/device/MyTrackerV2Activity.kt @@ -22,7 +22,6 @@ import com.abbidot.tracker.bean.PetBean import com.abbidot.tracker.constant.ConstantInt import com.abbidot.tracker.constant.ConstantString import com.abbidot.tracker.constant.GetResultCallback -import com.abbidot.tracker.database.MyDatabase import com.abbidot.tracker.databinding.ActivityMyTrackerV2Binding import com.abbidot.tracker.ui.activity.pet.PetProfileActivity import com.abbidot.tracker.util.ViewUtil diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/RefundDetailsActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/RefundDetailsActivity.kt index df752a4..bd92fa7 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/RefundDetailsActivity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/RefundDetailsActivity.kt @@ -1,13 +1,7 @@ package com.abbidot.tracker.ui.activity.subscribe -import android.R.attr.visibility -import android.os.Bundle import android.view.View -import androidx.activity.enableEdgeToEdge -import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat -import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat import com.abbidot.baselibrary.util.Utils import com.abbidot.tracker.R import com.abbidot.tracker.base.BaseActivity @@ -17,7 +11,6 @@ import com.abbidot.tracker.databinding.ActivityRefundDetailsBinding import com.abbidot.tracker.ui.fragment.subscribe.RefundPolicyBottomSheetFragment import com.abbidot.tracker.util.Util import com.abbidot.tracker.util.ViewUtil -import com.qmuiteam.qmui.widget.QMUITopBar class RefundDetailsActivity : BaseActivity(ActivityRefundDetailsBinding::inflate) { diff --git a/app/src/main/res/layout/activity_debug.xml b/app/src/main/res/layout/activity_debug.xml index 98d0347..7e4a8c8 100644 --- a/app/src/main/res/layout/activity_debug.xml +++ b/app/src/main/res/layout/activity_debug.xml @@ -23,7 +23,7 @@ android:id="@+id/switch_only_google_map" android:layout_width="match_parent" android:layout_height="@dimen/dp_38" - android:layout_marginBottom="@dimen/dp_6" + android:layout_marginBottom="@dimen/dp_2" android:background="@drawable/selector_shape6_gray_bg_pressed" app:qmui_accessory_type="switcher" /> @@ -31,15 +31,23 @@ android:id="@+id/switch_google_lat_lon_conversion" android:layout_width="match_parent" android:layout_height="@dimen/dp_38" - android:visibility="gone" - android:layout_marginBottom="@dimen/dp_6" + android:layout_marginBottom="@dimen/dp_2" android:background="@drawable/selector_shape6_gray_bg_pressed" + android:visibility="gone" app:qmui_accessory_type="switcher" /> + + diff --git a/app/src/main/res/layout/item_my_tracker_v2_layout.xml b/app/src/main/res/layout/item_my_tracker_v2_layout.xml index ee8f9e9..56c8400 100644 --- a/app/src/main/res/layout/item_my_tracker_v2_layout.xml +++ b/app/src/main/res/layout/item_my_tracker_v2_layout.xml @@ -23,7 +23,7 @@ android:layout_marginTop="@dimen/dp_8" android:background="@drawable/icon_device_high_battery_bg" android:text="0 " - android:textColor="@color/select_color" + android:textColor="@color/green_color4" android:textSize="@dimen/textSize8" /> #FF996E #FEF6E4 #0099CC + #00B3A6 + #FFB020 + #E5484D \ 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 229365f..c511465 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1028,7 +1028,7 @@ Your refund request has been submitted. Request Submitted Your refund request is being reviewed. - We couldn\'t complete your refund. Please try again or contact support. + We couldn\'t complete your refund. Please contact support. Refund Failed Refund Declined Refund Pending diff --git a/baselibrary/src/main/java/com/abbidot/baselibrary/util/AppUtils.kt b/baselibrary/src/main/java/com/abbidot/baselibrary/util/AppUtils.kt index 2bb8636..5477c2f 100644 --- a/baselibrary/src/main/java/com/abbidot/baselibrary/util/AppUtils.kt +++ b/baselibrary/src/main/java/com/abbidot/baselibrary/util/AppUtils.kt @@ -214,6 +214,16 @@ class AppUtils { return locale.language } + /** + * 获取系统国家地区 + */ + fun getDisplayCountry(loc: Locale? = null): String { + val locale = Locale.getDefault() + //Locale.CHINA + return if (null == loc) locale.getDisplayCountry(locale) + else locale.getDisplayCountry(loc) + } + /** * 判断是否是深色模式 */