From 5ac14912bb44970646d2e4cf2b0f1316346d928e Mon Sep 17 00:00:00 2001 From: yezhiqiu <123456@qq.com> Date: Wed, 1 Jul 2026 10:17:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B7=B7=E6=B7=86=E5=89=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 6 ++--- .../tracker/adapter/ChoosePlanAdapter.kt | 24 +++++++++---------- .../com/abbidot/tracker/bean/PackageBean.kt | 1 + 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0ed240e..db10f08 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,9 +28,9 @@ android { applicationId "com.abbidot.tracker" minSdkVersion 23 targetSdkVersion 35 - versionCode 2213 -// versionName "2.2.13" - versionName "2.2.13-Beta1" + versionCode 2214 +// versionName "2.2.14" + versionName "2.2.14-Beta1" 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 131c593..0391988 100644 --- a/app/src/main/java/com/abbidot/tracker/adapter/ChoosePlanAdapter.kt +++ b/app/src/main/java/com/abbidot/tracker/adapter/ChoosePlanAdapter.kt @@ -85,19 +85,19 @@ class ChoosePlanAdapter( } getTextView(R.id.tv_choose_plan_item_power).let { - it.visibility = if (item.list.isNullOrEmpty()) View.GONE + 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 = str +// 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 } } diff --git a/app/src/main/java/com/abbidot/tracker/bean/PackageBean.kt b/app/src/main/java/com/abbidot/tracker/bean/PackageBean.kt index af11f96..6462ecf 100644 --- a/app/src/main/java/com/abbidot/tracker/bean/PackageBean.kt +++ b/app/src/main/java/com/abbidot/tracker/bean/PackageBean.kt @@ -28,5 +28,6 @@ data class PackageBean( var bottomBgColor: String, var listTitleCode: Int, var planNameCode: Int, + var description: String, var list: MutableList? ) : Parcelable