diff --git a/common/src/main/java/com/yunbao/common/dialog/GiftWallDialog.java b/common/src/main/java/com/yunbao/common/dialog/GiftWallDialog.java index 99a75fe4a..099fff9ee 100644 --- a/common/src/main/java/com/yunbao/common/dialog/GiftWallDialog.java +++ b/common/src/main/java/com/yunbao/common/dialog/GiftWallDialog.java @@ -23,6 +23,7 @@ import com.yunbao.common.fragment.GiftWallMainTab1Fragment; import com.yunbao.common.fragment.GiftWallMainTab2Fragment; import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.ScreenDimenUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.CustomEllipsizeTextView; import com.yunbao.common.views.weight.ViewClicksAntiShake; @@ -118,12 +119,16 @@ public class GiftWallDialog extends AbsDialogPopupWindow { mIvBg.setImageResource(R.mipmap.bg_gift_wall_main_root2); mIvTabsLayout.setBackgroundResource(R.mipmap.icon_gift_wall_main_switch_full); - mTvTab1.setTextColor(Color.parseColor("#FFFFFF")); + mTvTab1.setTextColor(Color.parseColor("#FDF5EE")); mTvTab1.setTextSize(14); mTvTab1.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL)); mTvTab2.setTextColor(Color.parseColor("#FFC593")); - mTvTab2.setTextSize(16); + if(WordUtil.isNewZh()) { + mTvTab2.setTextSize(16); + }else{ + mTvTab2.setTextSize(14.5f); + } mTvTab2.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD)); mViewPager.setCurrentItem(1,false); }); diff --git a/common/src/main/res/layout/dialog_gift_wall.xml b/common/src/main/res/layout/dialog_gift_wall.xml index 2329b37d1..aa15d6414 100644 --- a/common/src/main/res/layout/dialog_gift_wall.xml +++ b/common/src/main/res/layout/dialog_gift_wall.xml @@ -77,7 +77,7 @@