From 0dfe37c18c99ee1ddebbe89f01d7cae2677052b8 Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Wed, 7 Jun 2023 10:15:44 +0800 Subject: [PATCH] =?UTF-8?q?[Modify]=E5=A4=9A=E8=AF=AD=E8=A8=80=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yizhuan/erban/ui/gift/dialog/GiftInfoVm.java | 6 ++++++ .../erban/ui/setting/AreaSelectActivity.kt | 9 +++++++++ app/src/main/res/drawable-xhdpi/icon_diamonds.png | Bin 0 -> 728 bytes app/src/main/res/layout/activity_splash.xml | 10 ++++++---- app/src/main/res/layout/list_item_dialog_gift.xml | 1 + app/src/main/res/values-ar/strings.xml | 2 +- app/src/main/res/values-en/strings.xml | 2 +- app/src/main/res/values-in/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values-zh/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 12 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/icon_diamonds.png diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftInfoVm.java b/app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftInfoVm.java index 2a46ac761..f9cb99ba9 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftInfoVm.java +++ b/app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftInfoVm.java @@ -3,6 +3,7 @@ package com.yizhuan.erban.ui.gift.dialog; import android.content.Context; import android.graphics.drawable.Drawable; +import androidx.core.content.ContextCompat; import androidx.databinding.ObservableBoolean; import androidx.databinding.ObservableField; @@ -34,6 +35,8 @@ public class GiftInfoVm extends BaseItem { public Drawable radishDrawableSelected = null; + public Drawable diamondDrawable = null; + /** * 是否显示新 */ @@ -69,14 +72,17 @@ public class GiftInfoVm extends BaseItem { if (data.getConsumeType() == GiftInfo.CONSUME_TYPE_GOLD) { radishDrawable = null; radishDrawableSelected = null; + diamondDrawable = ContextCompat.getDrawable(context, R.drawable.icon_diamonds); goldText.set(context.getResources().getString(R.string.how_much_gold, data.getGoldPrice())); } else if (data.getConsumeType() == GiftInfo.CONSUME_TYPE_FREE_GIFT) { radishDrawable = null; radishDrawableSelected = null; + diamondDrawable = null; goldText.set(context.getResources().getString(R.string.free_gift)); } else { radishDrawable = context.getResources().getDrawable(R.drawable.icon_radish_transparent); radishDrawableSelected = context.getResources().getDrawable(R.drawable.icon_radish_transparent_selected); + diamondDrawable = null; goldText.set(String.valueOf(data.getGoldPrice())); } this.isKnap.set(isKnap); diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/AreaSelectActivity.kt b/app/src/main/java/com/yizhuan/erban/ui/setting/AreaSelectActivity.kt index 746eed198..e38be1584 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/AreaSelectActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/ui/setting/AreaSelectActivity.kt @@ -11,6 +11,8 @@ import com.yizhuan.erban.databinding.ActivityAreaSelectBinding import com.yizhuan.erban.event.AreaChangeEvent import com.yizhuan.erban.ui.setting.adapter.PartitionAdapter import com.yizhuan.erban.ui.setting.viewmodel.SetViewModel +import com.yizhuan.xchat_android_library.common.SpConstants +import com.yizhuan.xchat_android_library.common.util.SPUtils import org.greenrobot.eventbus.EventBus /** @@ -21,6 +23,7 @@ class AreaSelectActivity : BaseViewBindingActivity() private val setViewModel: SetViewModel by viewModels() private val mPartitionAdapter by lazy { PartitionAdapter() } + private var mPosition = 0 companion object { @JvmStatic @@ -47,9 +50,15 @@ class AreaSelectActivity : BaseViewBindingActivity() setViewModel.changePartitionLiveData.observe(this) { EventBus.getDefault().post(AreaChangeEvent()) + if(mPartitionAdapter.getItem(mPosition)?.desc == "华语区"){ + SPUtils.putString(SpConstants.AREA_SELECT, "华语区") + }else { + SPUtils.putString(SpConstants.AREA_SELECT, "其它地区") + } } mPartitionAdapter.setOnItemClickListener { _, _, position -> + mPosition = position mPartitionAdapter.getItem(position)?.id?.let { setViewModel.changePartition(it) } mPartitionAdapter.setSelectPosition(position) mPartitionAdapter.notifyDataSetChanged() diff --git a/app/src/main/res/drawable-xhdpi/icon_diamonds.png b/app/src/main/res/drawable-xhdpi/icon_diamonds.png new file mode 100644 index 0000000000000000000000000000000000000000..06c2565dc1b11862f12efbfbcaa8bc5686768ddf GIT binary patch literal 728 zcmV;}0w?{6P)9C?U%~ik#`=QT{G;gq8M5m$s_q}S>4SS{h{RjirxLX?faGD`;FfFt>gN} z@A+%k`G(*4AIA8W-1lC$i%cuj3)D<3+;a1ftv^rrX>4 z|JC^a&-ee8<^P%C|DxXio8A7)^Zj|^{jA>o+V}kD_WZ)|{8!lgspk8l+WWHV`JLGL zP0aaQ$N7}s_<`H_i_!On)b(c3^?%9rh~4yg%=DGv^QqzTZ^-hz?D0^&@jn^V9RKw|k+vqT@=uE)pJHO{czUO1k`~#0000ebW%=J03;U+1OEK_`S|kh z>*wFx+t}31$;HCKzO%BPm5+>ueQ{}MQa(B?CUZm|0002fNklCOUzp`l3J)Ms9b*2wgW{oggD) zElX1aSq26XPd^I_t&CVLOB*vIYpdu;1_t>YvtV7<=AyLxrp7qEs1PooPHFAbWEa=U zJbU|c8x0LFHIVs|&V|MG720+Q=3xQGDiBwQIhQ$A7i8O68yYAtDZvu0000< KMNUMnLSTZD)Sd + android:layout_height="1px" /> diff --git a/app/src/main/res/layout/list_item_dialog_gift.xml b/app/src/main/res/layout/list_item_dialog_gift.xml index 94284ba04..b2b5c48fe 100644 --- a/app/src/main/res/layout/list_item_dialog_gift.xml +++ b/app/src/main/res/layout/list_item_dialog_gift.xml @@ -56,6 +56,7 @@ android:layout_below="@id/gift_name" android:layout_centerHorizontal="true" android:drawableStart="@{item.isSelect?item.radishDrawableSelected:item.radishDrawable}" + android:drawableEnd="@{item.diamondDrawable}" android:drawablePadding="2dp" android:text="@{item.goldText}" android:textColor="@{item.isSelect ? @color/color_ffb606_transparent_65 : @color/white_transparent_50}" diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index d58227ee2..399b08817 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -716,7 +716,7 @@ أنت على وشك شراء "%1$s (%2$s يوم)" أنت على وشك تجديد "%1$s (%2$s يوم)" هدية & # 160 ؛ & # 160 ؛%1$s & # 160 ؛ & # 160 ؛ "%$s (%3$s يوم)" - %d ماسات + %d %d جزر مركز المهام لانهاء diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 49d4a175a..6718ba75a 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -706,7 +706,7 @@ You are about to purchase "%1$s(%2$s days)" You are about to renew "%1$s(%2$s days)" Gift   %1$s   "%2$s (%3$s days)" - %d diamonds + %d %d carrots Task center To complete diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 4693101f0..ac8223233 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -725,7 +725,7 @@ Anda akan membeli "%1$s(%2$s hari)" Anda akan memperpanjang "%1$s(%2$s hari)" Hadiah   %1$s   "%2$s (%3$s hari)" - %d berlian + %d %d wortel Pusat tugas Menyelesaikan diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 783577690..4cf217673 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -726,7 +726,7 @@ "%1$s(%2$s gün)" satın almak üzeresiniz "%1$s(%2$s gün)" süresini yenilemek üzeresiniz Hediye   %1$s   "%2$s (%3$s gün)" - %d elmas + %d %d havuç görev merkezi bitirmek için diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index a8e043537..264ddceed 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -724,7 +724,7 @@ 您將要購買「%1$s(%2$s天)」 您將要續費「%1$s(%2$s天)」 贈送  %1$s  「%2$s(%3$s天)」 - %d鉆石 + %d %d蘿蔔 任務中心 去完成 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index a8e043537..264ddceed 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -724,7 +724,7 @@ 您將要購買「%1$s(%2$s天)」 您將要續費「%1$s(%2$s天)」 贈送  %1$s  「%2$s(%3$s天)」 - %d鉆石 + %d %d蘿蔔 任務中心 去完成 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6f860c18f..3eb76e60a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -706,7 +706,7 @@ You are about to purchase "%1$s(%2$s days)" You are about to renew "%1$s(%2$s days)" Gift   %1$s   "%2$s (%3$s days)" - %d diamonds + %d %d carrots Task center To complete