ABBIDOT_APP/Abbidot_Android
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.新的支付信息管理UI

Browse Source 
2.运动和睡眠详情7/6的日期格式改成“Jul 6”格式
This commit is contained in:
yezhiqiu
2026-07-15 11:13:53 +08:00
parent 0e8af36c87
commit 6ca8ead5ab
14 changed files with 65 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/abbidot/tracker/ui/activity/data/MoreActivityActivity.kt
View File

@@ -266,7 +266,7 @@ class MoreActivityActivity :
val date = Utils.stringToDate(
a.dayTime,
Utils.DATE_FORMAT_PATTERN_CN,
Utils.DATE_FORMAT_PATTERN_EN5
Utils.DATE_FORMAT_PATTERN_EN2
)
if (a.dayTime == mToday) xAxis.add(getString(R.string.txt_today))
else xAxis.add(date)

2
app/src/main/java/com/abbidot/tracker/ui/activity/data/MoreSleepActivity.kt
View File

@@ -168,7 +168,7 @@ class MoreSleepActivity :
val date = Utils.stringToDate(
a.dayTime,
Utils.DATE_FORMAT_PATTERN_CN,
Utils.DATE_FORMAT_PATTERN_EN5
Utils.DATE_FORMAT_PATTERN_EN2
)
if (a.dayTime == mToday) xAxis.add(getString(R.string.txt_today))
else xAxis.add(date)

2
app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/PaymentMethodActivity.kt
View File

@@ -14,7 +14,6 @@ import com.abbidot.tracker.constant.ConstantInt
import com.abbidot.tracker.constant.ConstantString
import com.abbidot.tracker.constant.GetResultCallback
import com.abbidot.tracker.databinding.ActivityPaymentMethodBinding
import com.abbidot.tracker.deprecated.ui.fragment.vm.LoginCNViewModel
import com.abbidot.tracker.ui.fragment.subscribe.CreditCardPaymentFragment
import com.abbidot.tracker.ui.fragment.subscribe.PaypalPaymentFragment
import com.abbidot.tracker.util.Util
@@ -25,7 +24,6 @@ class PaymentMethodActivity :
BaseActivity<ActivityPaymentMethodBinding>(ActivityPaymentMethodBinding::inflate) {
private val mSubscriptionPayViewModel: SubscriptionPayViewModel by viewModels()
private val mLoginCNViewModel: LoginCNViewModel by viewModels()
var mOrderBean: SubscriptionsOrderBean? = null

44
app/src/main/java/com/abbidot/tracker/ui/fragment/subscribe/PaypalPaymentFragment.kt
View File

@@ -34,30 +34,41 @@ class PaypalPaymentFragment :
mViewBinding.apply {
root.setBackgroundResource(R.color.transparent)
setOnClickListenerViews(btnSureRedirectPaypal)
ilPaypalPaymentNoData.btnSureSubscribePlan1Continue.visibility = View.GONE
if (null == getHostActivity(PaymentMethodActivity::class.java)?.mOrderBean) {
tvPaypalPaymentGoTip.visibility = View.GONE
btnSureRedirectPaypal.visibility = View.GONE
ivSureRedirectPaypalBg.visibility = View.GONE
showPaypalInfo()
} else {
tvNoPaypalPaymentEmail.visibility = View.GONE
getHostActivity(PaymentMethodActivity::class.java)?.let {
if (null == it.mOrderBean) {
tvPaypalPaymentGoTip.visibility = View.GONE
btnSureRedirectPaypal.visibility = View.GONE
ivSureRedirectPaypalBg.visibility = View.GONE
} else {
ilPaypalPaymentNoData.root.visibility = View.GONE
}
if (null == it.mPaymentIDBean) {
root.visibility = View.GONE
} else {
showPaypalInfo()
}
}
}
}
fun showPaypalInfo() {
if (null == getHostActivity(PaymentMethodActivity::class.java)?.mOrderBean) {
return
}
getHostActivity(PaymentMethodActivity::class.java)?.let {
it.mPaymentIDBean?.let { pId ->
mViewBinding.tvPaypalPaymentEmail.text = pId.paypalMethodInfo.email
mViewBinding.tvNoPaypalPaymentEmail.visibility =
if (TextUtils.isEmpty(pId.paypalMethodInfo.email))
View.VISIBLE
else
View.GONE
mViewBinding.apply {
root.visibility = View.VISIBLE
tvPaypalPaymentEmail.text = pId.paypalMethodInfo.email
ilPaypalPaymentNoData.root.visibility =
if (TextUtils.isEmpty(pId.paypalMethodInfo.email)) {
tvPaypalPaymentEmail.visibility = View.GONE
View.VISIBLE
} else {
tvPaypalPaymentEmail.visibility = View.VISIBLE
View.GONE
}
}
}
}
}
@@ -81,7 +92,6 @@ class PaypalPaymentFragment :
deviceId = o.deviceId
}
intent.putExtra(ConstantString.Amount, this)
p.startActivity(intent)
}
}

7
app/src/main/res/layout/activity_add_credit_card_payment.xml
View File

@@ -165,10 +165,10 @@
<androidx.appcompat.widget.AppCompatCheckBox
android:id="@+id/cb_add_card_set_primary_switch"
style="@style/my_checkbox_switch_style"
android:visibility="gone"
android:layout_below="@id/ll_add_card_accepted_cards"
android:layout_alignParentEnd="true"
android:layout_marginTop="@dimen/dp_16" />
android:layout_marginTop="@dimen/dp_16"
android:visibility="gone" />
<com.abbidot.tracker.widget.TypefaceTextView
style="@style/my_TextView_style_v2"
@@ -186,7 +186,8 @@
android:id="@+id/btn_save_new_credit_card"
style="@style/my_match_RoundRect_Button_style"
android:layout_marginHorizontal="@dimen/dp_16"
android:text="@string/txt_save_card"
android:text="@string/txt_ok"
android:textAllCaps="true"
app:qmui_radius="@dimen/dp_64"
app:typeface="@string/roboto_bold_font" />
</androidx.appcompat.widget.LinearLayoutCompat>

6
app/src/main/res/layout/fragment_credit_card_payment.xml
View File

@@ -11,7 +11,7 @@
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_CreditCard_Payment_choose"
style="@style/my_TextView_style_v2"
android:text="@string/txt_choose_card"
android:text="@string/txt_my_card"
android:textSize="@dimen/textSize16"
android:textStyle="bold"
android:visibility="gone" />
@@ -39,8 +39,8 @@
<include
android:id="@+id/il_credit_card_payment_no_data"
android:visibility="gone"
layout="@layout/layout_credit_card_no_data" />
layout="@layout/layout_credit_card_no_data"
android:visibility="gone" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_credit_card_payment_list"

31
app/src/main/res/layout/fragment_paypal_payment.xml
View File

@@ -5,25 +5,32 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingTop="@dimen/dp_50"
android:paddingTop="@dimen/dp_10"
tools:context=".ui.fragment.subscribe.PaypalPaymentFragment">
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_no_paypal_payment_email"
style="@style/my_TextView_style_v2"
android:layout_width="match_parent"
android:layout_centerInParent="true"
android:text="@string/no_data"
android:textColor="@color/section_color_bg1"
android:textSize="@dimen/textSize16"
app:typeface="@string/roboto_regular_font" />
<include
android:id="@+id/il_paypal_payment_no_data"
layout="@layout/layout_credit_card_no_data"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_80" />
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_paypal_payment_email"
style="@style/my_TextView_style_v2"
android:layout_width="match_parent"
android:textSize="@dimen/textSize20"
app:typeface="@string/roboto_regular_font" />
android:gravity="start|center"
android:layout_marginHorizontal="@dimen/dp_16"
android:layout_height="@dimen/dp_56"
android:background="@drawable/shape8_dark_gray_border_white_yellow_bg"
android:drawableStart="@drawable/icon_payment_paypal_svg"
android:drawablePadding="@dimen/dp_6"
android:paddingStart="@dimen/dp_20"
android:text="@string/app_name"
android:textSize="@dimen/textSize16"
app:typeface="@string/roboto_bold_font" />
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_paypal_payment_go_tip"

3
app/src/main/res/layout/item_credit_card_layout.xml
View File

@@ -12,7 +12,8 @@
android:layout_centerVertical="true"
android:drawableStart="@drawable/ico_lay_visa_card"
android:drawablePadding="@dimen/dp_4"
android:text="@string/txt_choose_card"
android:text="@string/app_name"
android:layout_marginStart="@dimen/dp_4"
android:textSize="@dimen/textSize14"
app:typeface="@string/roboto_bold_font" />

2
app/src/main/res/values-de/strings.xml
View File

@@ -652,7 +652,7 @@
<string name="txt_sales_tax">Steuer</string>
<string name="txt_total_tax">Gesamtbetrag inkl. Steuern</string>
<string name="txt_payment_method">Zahlungsmethode</string>
<string name="txt_choose_card">Karte auswählen</string>
<string name="txt_my_card">Meine Karte</string>
<string name="txt_no_card">Keine Karte gefunden</string>
<string name="txt_add_card">Neue Karte hinzufügen</string>
<string name="txt_primary">Primär</string>

2
app/src/main/res/values-fr/strings.xml
View File

@@ -645,7 +645,7 @@
<string name="txt_sales_tax">Taxe</string>
<string name="txt_total_tax">Total TTC</string>
<string name="txt_payment_method">Mode de paiement</string>
<string name="txt_choose_card">Choisir une carte</string>
<string name="txt_my_card">Ma Carte</string>
<string name="txt_no_card">Aucune carte trouvée</string>
<string name="txt_add_card">Ajouter une nouvelle carte</string>
<string name="txt_primary">Principale</string>

2
app/src/main/res/values-zh-rCN/strings.xml
View File

@@ -686,7 +686,7 @@
<string name="txt_sales_tax">税费</string>
<string name="txt_total_tax">含税总计</string>
<string name="txt_payment_method">支付方式</string>
<string name="txt_choose_card">选择卡片</string>
<string name="txt_my_card">我的卡片</string>
<string name="txt_no_card">未找到卡片</string>
<string name="txt_add_card">添加新卡片</string>
<string name="txt_primary">主要支付方式</string>

4
app/src/main/res/values/strings.xml
View File

@@ -746,8 +746,8 @@
<string name="txt_sales_tax">Tax</string>
<string name="txt_total_tax">Total with Tax</string>
<string name="txt_payment_method">Payment Method</string>
<string name="txt_choose_card">Choose Card</string>
<string name="txt_no_card">No Card Found</string>
<string name="txt_my_card">My Card</string>
<string name="txt_no_card">No Payment Method</string>
<string name="txt_add_card">+ Add New Card</string>
<string name="txt_primary">Primary</string>
<string name="txt_make_payment">Make Payment</string>

4
baselibrary/src/main/java/com/abbidot/baselibrary/util/AppUtils.kt
View File

@@ -18,7 +18,7 @@ class AppUtils {
companion object {
private var isDebug: Boolean? = null
private var isDebug: Boolean? = true
/**
* 屏幕密度,系统源码注释不推荐使用
@@ -93,7 +93,7 @@ class AppUtils {
* 是否是国内
*/
fun isChina(type: String = SWITCH_PAGE_TYPE): Boolean {
return false
return true
if (isDebug()) {
if (type == SWITCH_MAP_TYPE && MMKVUtil.getBoolean(MMKVKey.OnlyGoogleMap, false)) {
//只启用谷歌地图

2
baselibrary/src/main/java/com/abbidot/baselibrary/util/Utils.kt
View File

@@ -37,7 +37,7 @@ class Utils {
const val DATE_FORMAT_PATTERN_CN4 = "yyyy-MM-dd HH:mm"
const val DATE_FORMAT_PATTERN_CN5 = "MM-dd HH:mm:ss"
const val DATE_FORMAT_PATTERN_EN1 = "MMM d, yyyy | HH:mm"
const val DATE_FORMAT_PATTERN_EN2 = "d MMM yyyy hh:mm a"
const val DATE_FORMAT_PATTERN_EN2 = "MMM d"
const val DATE_FORMAT_PATTERN_EN3 = "MMM d, yyyy"
const val DATE_FORMAT_PATTERN_EN4 = "MMM d yyyy"
const val DATE_FORMAT_PATTERN_EN5 = "d/M"