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 000000000..15c8ed111 Binary files /dev/null and b/live/src/main/res/drawable/live_tags_hot_en.png differ diff --git a/live/src/main/res/drawable/live_tags_hour_list_en.png b/live/src/main/res/drawable/live_tags_hour_list_en.png new file mode 100644 index 000000000..6e134060c Binary files /dev/null and b/live/src/main/res/drawable/live_tags_hour_list_en.png differ 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名 + 未上榜 + 日榜 + 周榜 + 观众 + 观众 + 粉丝