From 4a37e579f400e7105d48627900ca45d858347180 Mon Sep 17 00:00:00 2001 From: yezhiqiu <123456@qq.com> Date: Wed, 2 Sep 2026 17:13:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=97=E9=A4=90=E5=90=8D=E7=A7=B0=E5=92=8C?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E9=80=82=E9=85=8D=E5=A4=9A=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../tracker/adapter/ChoosePlanAdapter.kt | 19 ------------------- .../adapter/SubscriptionPlanDetailAdapter.kt | 14 +------------- .../tracker/retrofit2/INetworkService.kt | 16 ++++++++-------- .../abbidot/tracker/retrofit2/NetworkApi.kt | 8 ++++---- .../com/abbidot/tracker/ui/DebugActivity.kt | 10 +++++----- .../subscribe/SureSubscriptionPlanActivity.kt | 4 ++-- .../tracker/vm/SubscriptionManageViewModel.kt | 6 ++++-- .../res/layout/item_choose_plan_layout.xml | 2 +- app/src/main/res/values/strings.xml | 13 +++---------- .../com/abbidot/baselibrary/util/AppUtils.kt | 2 +- 11 files changed, 30 insertions(+), 66 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c0d7984..3ca1ec3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,7 +30,7 @@ android { targetSdkVersion 35 versionCode 2500 // versionName "2.5.0" - versionName "2.5.0-Beta4" + versionName "2.5.0-Beta5" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/abbidot/tracker/adapter/ChoosePlanAdapter.kt b/app/src/main/java/com/abbidot/tracker/adapter/ChoosePlanAdapter.kt index 0391988..afd8e38 100644 --- a/app/src/main/java/com/abbidot/tracker/adapter/ChoosePlanAdapter.kt +++ b/app/src/main/java/com/abbidot/tracker/adapter/ChoosePlanAdapter.kt @@ -87,29 +87,10 @@ class ChoosePlanAdapter( getTextView(R.id.tv_choose_plan_item_power).let { it.visibility = if (TextUtils.isEmpty(item.description)) View.GONE else { -// var str = getManyLanguageLimitDec(item.listTitleCode) -// if (TextUtils.isEmpty(str)) { -// for (i in 0 until item.list!!.size) { -// val packageDec = item.list!![i] -// str += "${i + 1}.${packageDec.title}" -// if (i != item.list!!.size - 1) { -// str += "\n" -// } -// } -// } it.text = item.description View.VISIBLE } } } } - - private fun getManyLanguageLimitDec(nameCode: Int): String { - return when (nameCode) { - ConstantInt.Type1 -> mContext.getString(R.string.txt_package_permission1) - ConstantInt.Type2 -> mContext.getString(R.string.txt_package_permission2) - ConstantInt.Type3 -> mContext.getString(R.string.txt_package_permission3) - else -> "" - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/abbidot/tracker/adapter/SubscriptionPlanDetailAdapter.kt b/app/src/main/java/com/abbidot/tracker/adapter/SubscriptionPlanDetailAdapter.kt index 5414ecf..0369e71 100644 --- a/app/src/main/java/com/abbidot/tracker/adapter/SubscriptionPlanDetailAdapter.kt +++ b/app/src/main/java/com/abbidot/tracker/adapter/SubscriptionPlanDetailAdapter.kt @@ -25,19 +25,7 @@ class SubscriptionPlanDetailAdapter( checkBox.setOnClickListener { checkBox.isChecked = !checkBox.isChecked } - val titleName = when (item.titleCode) { - ConstantInt.Type1 -> mContext.getString(R.string.txt_real_time_tracking) - ConstantInt.Type2 -> mContext.getString(R.string.txt_activity_logs) - ConstantInt.Type3 -> mContext.getString(R.string.txt_notifications_emergencies) - ConstantInt.Type4 -> mContext.getString(R.string.txt_customized_led) - 5 -> mContext.getString(R.string.txt_bluetooth_radar) - 6 -> mContext.getString(R.string.txt_geofencing) - 7 -> mContext.getString(R.string.txt_route_records) - 8 -> mContext.getString(R.string.txt_family_sharing) - 9 -> mContext.getString(R.string.txt_customer_support) - else -> item.title - } - holder.setText(R.id.tv_subscribe_plan_detail_name, titleName) + holder.setText(R.id.tv_subscribe_plan_detail_name, item.title) checkBox.isChecked = item.status == ConstantInt.Open } } \ No newline at end of file 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 164cea9..6e807e6 100644 --- a/app/src/main/java/com/abbidot/tracker/retrofit2/INetworkService.kt +++ b/app/src/main/java/com/abbidot/tracker/retrofit2/INetworkService.kt @@ -128,7 +128,8 @@ interface INetworkService { @FormUrlEncoded @POST("user/login") suspend fun login( - @Field("email") email: String, @Field("password") password: String, + @Field("email") email: String, + @Field("password") password: String, @Field("languageCode") languageCode: String ): BaseResponse @@ -662,8 +663,7 @@ interface INetworkService { */ @GET("pet/bindPetList") suspend fun getHomeBindPetList( - @Query("userId") userId: String, - @Query("languageCode") languageCode: String + @Query("userId") userId: String, @Query("languageCode") languageCode: String ): BaseResponse> /** @@ -1150,8 +1150,7 @@ interface INetworkService { @FormUrlEncoded @POST("pay$STRIPE_VERSION_NUMBER/savePaymentMethodInfo") suspend fun savePaymentMethodInfo( - @Field("userId") orderId: String, - @Field("paymentMethodID") paymentMethodID: String + @Field("userId") orderId: String, @Field("paymentMethodID") paymentMethodID: String ): BaseResponse /** @@ -1181,14 +1180,14 @@ interface INetworkService { * 获取套餐计划类型 */ @GET("order$SUBSCRIPTIONS_V3/subscriptions/plan/types") - suspend fun getPackageType(): BaseResponse> + suspend fun getPackageType(@Query("userId") userId: String): BaseResponse> /** * 获取套餐列表 */ @GET("order$SUBSCRIPTIONS_V3/plan/list") suspend fun getPackageList( - @Query("planTypeName") planTypeName: String + @Query("planTypeName") planTypeName: String, @Query("userId") userId: String ): BaseResponse> /** @@ -1445,7 +1444,8 @@ interface INetworkService { @FormUrlEncoded @POST("user/login") suspend fun accountPasswordLogin( - @Field("phone") phone: String, @Field("password") password: String, + @Field("phone") phone: String, + @Field("password") password: String, @Field("languageCode") languageCode: String ): BaseResponse 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 d96b86b..1c1d32f 100644 --- a/app/src/main/java/com/abbidot/tracker/retrofit2/NetworkApi.kt +++ b/app/src/main/java/com/abbidot/tracker/retrofit2/NetworkApi.kt @@ -1100,15 +1100,15 @@ object NetworkApi : BaseNetworkApi(INetworkService.BASE_URL) { /** * 获取套餐计划类型 */ - suspend fun getPackageType() = getResult { - service.getPackageType() + suspend fun getPackageType(userId: String) = getResult { + service.getPackageType(userId) } /** * 获取套餐列表 */ - suspend fun getPackageList(planTypeName: String) = getResult { - service.getPackageList(planTypeName) + suspend fun getPackageList(planTypeName: String, userId: String) = getResult { + service.getPackageList(planTypeName, userId) } /** 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 d8e3105..16d8ab2 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/DebugActivity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/DebugActivity.kt @@ -38,7 +38,7 @@ class DebugActivity : BaseActivity(ActivityDebugBinding::i //宠物数据 private var mPetList: MutableList? = null - private lateinit var mMutableList: MutableList + private val mMutableList = mutableListOf() private lateinit var mAdapter: HowWorkAdapter private var mCommonListDialog: CommonListDialog? = null private lateinit var mChangePetListDialogAdapter: ChangePetListDialogAdapter @@ -56,7 +56,6 @@ class DebugActivity : BaseActivity(ActivityDebugBinding::i mPetSelectPosition = intent.getIntExtra(ConstantString.Index, 0) setTopBarTitle("Debug") - mMutableList = mutableListOf() mAdapter = HowWorkAdapter(mContext, mMutableList) ViewUtil.instance.setRecyclerViewVerticalLinearLayout( @@ -119,7 +118,8 @@ class DebugActivity : BaseActivity(ActivityDebugBinding::i private fun setPetData() { val pet = mPetList!![mPetSelectPosition] mViewBinding.debugPetName.text = pet.petName - ViewUtil.instance.setPetTypeHead(mContext, + ViewUtil.instance.setPetTypeHead( + mContext, mViewBinding.debugPetHead.appHeadImage, pet.imgurl, pet.petType ) @@ -152,10 +152,10 @@ class DebugActivity : BaseActivity(ActivityDebugBinding::i val convertLatLon = LonAndLatUtil.convertFromWGS84ToGCJ02(data.latitude, data.longitude) ViewUtil.instance.addMenuBean( - mMutableList, "longitude", convertLatLon[1].toString() + mMutableList, "longitude", "${data.longitude}(GPS)\n${convertLatLon[1]}" ) ViewUtil.instance.addMenuBean( - mMutableList, "latitude", convertLatLon[0].toString() + mMutableList, "latitude", "${data.latitude}(GPS)\n${convertLatLon[0]}" ) } else { ViewUtil.instance.addMenuBean( diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SureSubscriptionPlanActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SureSubscriptionPlanActivity.kt index f1838dd..ef88a32 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SureSubscriptionPlanActivity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SureSubscriptionPlanActivity.kt @@ -569,8 +569,8 @@ class SureSubscriptionPlanActivity : mealDesc = mViewBinding.ilSubscribePlanDetail.tvSureSubscribePlanMoney.text.toString() + mViewBinding.ilSubscribePlanDetail.tvSureSubscribePlanPer.text.toString() } -// totalAmountWithTax = Utils.formatDecimal(mTotalWithTaxMoney, 2).toDouble() - totalAmountWithTax = 0.01 + totalAmountWithTax = Utils.formatDecimal(mTotalWithTaxMoney, 2).toDouble() +// totalAmountWithTax = 0.01 if (AppUtils.isChina()) { if (null == mRechargePayOptionsCn) { 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 92da497..3b520ec 100644 --- a/app/src/main/java/com/abbidot/tracker/vm/SubscriptionManageViewModel.kt +++ b/app/src/main/java/com/abbidot/tracker/vm/SubscriptionManageViewModel.kt @@ -41,14 +41,16 @@ class SubscriptionManageViewModel : ViewModel() { fun getPackageType() { viewModelScope.launch { - val result = NetworkApi.getPackageType() + val useId = MMKVUtil.getString(MMKVKey.UserId) + val result = NetworkApi.getPackageType(useId) mPackageTypeLiveData.value = result } } fun getPackageList(planTypeName: String) { viewModelScope.launch { - val result = NetworkApi.getPackageList(planTypeName) + val useId = MMKVUtil.getString(MMKVKey.UserId) + val result = NetworkApi.getPackageList(planTypeName, useId) mPackageListLiveData.value = result } } diff --git a/app/src/main/res/layout/item_choose_plan_layout.xml b/app/src/main/res/layout/item_choose_plan_layout.xml index c326727..42c590c 100644 --- a/app/src/main/res/layout/item_choose_plan_layout.xml +++ b/app/src/main/res/layout/item_choose_plan_layout.xml @@ -120,7 +120,7 @@ android:layout_alignBaseline="@id/tv_choose_plan_item_money" android:layout_alignParentEnd="true" android:layout_marginEnd="@dimen/dp_18" - android:text="@string/txt_billed_annually" + android:text="@string/app_name" android:textColor="@color/select_color" android:textSize="@dimen/textSize10" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d23cb54..76505fa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -151,9 +151,7 @@ Initial setup may take %s minutes 1. Move outdoors with device\n2. Wait for LTE & GPS connection\n3. Blue flashing = LTE & GPS active 1. Move outdoors with device\n2. Wait for LTE & GPS connection\n3. Green flashing = LTE & GPS active - 1.Flexible short-term protection\n2.Standard customer support - 1.1 device replacement included\n2.Dedicated customer support\n3.Annual protection coverage - 1.VIP priority support\n2.Fast replacement service (1 included)\n3.Enhanced protection\n4.Hassle-free pet protection + %s min %s Min Yes @@ -624,7 +622,7 @@ Refunded /year on /month on - Replacement Guarantee + Annual Care Annual Care: LED Light Settings @@ -723,12 +721,7 @@ Add Wi-Fi zone to prolong care time Add Already at minimum size - 3 Months Flex Plan - 1 Year Plus Plan - 2 Years Protection+ Plan - Billed quarterly - Billed annually - Billed every 2 years + Login with My Card Edit Payment Method 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 d79017b..4ce5581 100644 --- a/baselibrary/src/main/java/com/abbidot/baselibrary/util/AppUtils.kt +++ b/baselibrary/src/main/java/com/abbidot/baselibrary/util/AppUtils.kt @@ -94,7 +94,7 @@ class AppUtils { * 是否是国内 */ fun isChina(type: String = SWITCH_PAGE_TYPE): Boolean { - return true + return false if (isDebug()) { if (type == SWITCH_MAP_TYPE && MMKVUtil.getBoolean(MMKVKey.OnlyGoogleMap, false)) { //只启用谷歌地图