From 4e466a786813af21b7f11e5f20ef6fa6f82249af Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Wed, 31 Aug 2022 16:12:42 +0800 Subject: [PATCH] =?UTF-8?q?update:=E6=9B=B4=E6=96=B0i18N?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yunbao/common/utils/WordUtil.java | 8 +++++++ common/src/main/res/values-en/strings.xml | 22 +++++++++--------- common/src/main/res/values/strings.xml | 6 ++--- .../yunbao/live/views/LiveRoomViewHolder.java | 13 +++++------ .../main/res/drawable/live_tags_hot_en.png | Bin 0 -> 7805 bytes .../res/drawable/live_tags_hour_list_en.png | Bin 0 -> 9013 bytes live/src/main/res/layout/dialog_live_gift.xml | 2 +- .../main/res/layout/view_live_audience.xml | 4 ++-- live/src/main/res/values-en/strings.xml | 7 ++++++ live/src/main/res/values/strings.xml | 7 ++++++ 10 files changed, 45 insertions(+), 24 deletions(-) create mode 100644 live/src/main/res/drawable/live_tags_hot_en.png create mode 100644 live/src/main/res/drawable/live_tags_hour_list_en.png diff --git a/common/src/main/java/com/yunbao/common/utils/WordUtil.java b/common/src/main/java/com/yunbao/common/utils/WordUtil.java index cfe6c9075..5977b54ac 100644 --- a/common/src/main/java/com/yunbao/common/utils/WordUtil.java +++ b/common/src/main/java/com/yunbao/common/utils/WordUtil.java @@ -4,6 +4,8 @@ import android.content.res.Resources; import com.yunbao.common.CommonAppContext; +import java.util.Locale; + /** * Created by cxf on 2017/10/10. * 获取string.xml中的字 @@ -20,4 +22,10 @@ public class WordUtil { public static String getString(int res) { return sResources.getString(res); } + + public static boolean isZh() { + Locale locale = sResources.getConfiguration().locale; + String language = locale.getLanguage(); + return language.endsWith("zh"); + } } diff --git a/common/src/main/res/values-en/strings.xml b/common/src/main/res/values-en/strings.xml index 02c23c943..2125c90dd 100644 --- a/common/src/main/res/values-en/strings.xml +++ b/common/src/main/res/values-en/strings.xml @@ -285,7 +285,7 @@ Tricky MultiplayerPK LianmaiVoice - ZhouXingbang + Start LeaveTemporarily ResumeLive Flash lamp @@ -371,7 +371,7 @@ Please select a channel Focus on the anchor Are you sure to report? - Interaction between wheat and wheat + Interaction End Lian Mai Allowed even wheat Ban Lian Mai @@ -860,13 +860,13 @@ Limited ride And limited avatar frame anchor More Wonderful live - recommended for you - fun games - value added benefits - fan club - activity center - basic tools - effects settings - shield gift effect - shield mount effect + More + Fun Games + Value-added benefits + Fan Club + Activity + Basic tools + Effect settings + Shield gift effect + Shield car effect diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 2eaaa3ab5..749000e2d 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -875,11 +875,11 @@ 精彩直播 為您推薦 趣味游戏 - 增值权益 + 增值權益 粉絲團 活動中心 - 基础工具 + 基礎工具 特效設置 屏蔽禮物特效 - 屏蔽坐騎特效 + 屏蔽座駕特效 diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 118f9d3da..156eacdb2 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -136,7 +136,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis LinearLayout gif_view; RelativeLayout chat_view; private ImageView mAvatar; - private ImageView UserMore; + private ImageView userMore; private RoundedImageView userGuard; private ImageView mLevelAnchor; public static TextView mName; @@ -666,7 +666,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis mVotes = (TextView) findViewById(R.id.votes); mTvMedalRank = (TextView) findViewById(R.id.medal_rank_num); mGuardNum = (TextView) findViewById(R.id.guard_num); - UserMore = (ImageView) findViewById(R.id.user_more); + userMore = (ImageView) findViewById(R.id.user_more); userGuard = (RoundedImageView) findViewById(R.id.user_guard); gift_svga = (SVGAImageView) findViewById(R.id.gift_svga); tv_avatarOther_name = (TextView) findViewById(R.id.tv_avatarOther_name); @@ -758,7 +758,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis findViewById(R.id.btn_votes).setOnClickListener(this); findViewById(R.id.btn_medal_rank).setOnClickListener(this); findViewById(R.id.btn_noble).setOnClickListener(this); - UserMore.setOnClickListener(this); + userMore.setOnClickListener(this); userGuard.setOnClickListener(this); findViewById(R.id.btn_guard).setOnClickListener(this); @@ -1100,10 +1100,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis mHourRank.setLayoutParams(textParams); mHotText.setGravity(Gravity.CENTER); mHourRank.setGravity(Gravity.CENTER); - setHourRankData(info.get(0).getRank()); - hotPic.setImageResource(R.drawable.live_tags_hot); - hourPic.setImageResource(R.drawable.live_tags_hour_list); + hotPic.setImageResource(WordUtil.isZh()?R.drawable.live_tags_hot:R.drawable.live_tags_hot_en); + hourPic.setImageResource(WordUtil.isZh()?R.drawable.live_tags_hour_list:R.drawable.live_tags_hour_list_en); hotPic.setLayoutParams(params); hourPic.setLayoutParams(params); flipper.addView(hotView); @@ -1156,7 +1155,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis if (rank == 0) { mHourRank.setText(R.string.no_rank_data); } else { - mHourRank.setText("第"+formatBigNum.formatBigNum(rank + "")+"名"); + mHourRank.setText(String.format(WordUtil.getString(R.string.hour_rank),formatBigNum.formatBigNum(rank + ""))); } } } diff --git a/live/src/main/res/drawable/live_tags_hot_en.png b/live/src/main/res/drawable/live_tags_hot_en.png new file mode 100644 index 0000000000000000000000000000000000000000..15c8ed111dc7fbc3071f594175bbcb8312311617 GIT binary patch literal 7805 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 b9D)A_)2U9heSx#000000NkvXXu0mjf5J3K( literal 0 HcmV?d00001 diff --git a/live/src/main/res/layout/dialog_live_gift.xml b/live/src/main/res/layout/dialog_live_gift.xml index 9258f09d8..916515558 100644 --- a/live/src/main/res/layout/dialog_live_gift.xml +++ b/live/src/main/res/layout/dialog_live_gift.xml @@ -56,7 +56,7 @@ android:paddingLeft="20dp" android:paddingRight="5dp" android:layout_toRightOf="@id/btn_fans" - android:text="貴族" + android:text="@string/noble" android:textColor="@color/white" android:textSize="14sp"/> + android:src="@mipmap/live_icon_newpeople_en" + android:visibility="visible" /> diff --git a/live/src/main/res/values-en/strings.xml b/live/src/main/res/values-en/strings.xml index 214a6519a..4b3c198dc 100644 --- a/live/src/main/res/values-en/strings.xml +++ b/live/src/main/res/values-en/strings.xml @@ -3,4 +3,11 @@ No one is on the list at the moment anchor are waiting at your guard! Not on the list + No.%s + Not listed + Day + Weekly + Viewers + Guard + Fans \ No newline at end of file diff --git a/live/src/main/res/values/strings.xml b/live/src/main/res/values/strings.xml index fd879df16..e9cb69fef 100644 --- a/live/src/main/res/values/strings.xml +++ b/live/src/main/res/values/strings.xml @@ -4,4 +4,11 @@ 暫時無人上榜,快來成為第一位上榜的人吧! 主播正在等待您的守護! 未上榜 + 第%s名 + 未上榜 + 日榜 + 周榜 + 观众 + 观众 + 粉丝