修改界面的中英文

common/src/main/res/values-en/strings.xml

@@ -168,6 +168,9 @@
     <string name="guard_buy_2">Open guard</string>
     <string name="guard_buy_3">Renewal Guardian</string>
     <string name="guard_my">My</string>
+    <string name="theguardianof">Become the guardian of %s</string>
+    <string name="favoriteanchor">Open a guard for your favorite anchor</string>
+    <string name="guardiandate">The guardian date expires at: %s</string>
     <string name="get">GET</string>
     <string name="only_one">Only one can be given away~</string>
     <string name="guard_guard">Guard</string>
@@ -896,13 +899,13 @@ Limited ride And limited avatar frame</string>
 
     <string name="onlookers">onlookers</string>
     <string name="open_noble">The live broadcast studio was opened</string>
-    <string name="baron">baron</string>
+    <string name="baron">Baron</string>
-    <string name="viscount">viscount</string>
+    <string name="viscount">Viscount</string>
-    <string name="marquis">The marquis DE</string>
+    <string name="marquis">Marquis</string>
-    <string name="duke">The duke</string>
+    <string name="duke">Duke</string>
-    <string name="king">The king</string>
+    <string name="king">King</string>
-    <string name="emperor">The emperor</string>
+    <string name="emperor">Emperor</string>
-    <string name="better_emperor">Super huang</string>
+    <string name="better_emperor">Super king</string>
     <string name="login_wait">Please wait...</string>
     <string name="slide_settings">The slide set</string>
     <string name="up_slide_settings">Slide up and down to switch the broadcast room</string>
@@ -917,16 +920,26 @@ Limited ride And limited avatar frame</string>
     <string name="star_change">%sStar challenge</string>
     <string name="star_success">Congratulations %s, completed %s %s star challenge, go to meet the host face!</string>
     <string name="star">star</string>
+    <string name="favorite_host_fan">Join your favorite host fan club</string>
     <string name="small_window_settings">Small window play Settings</string>
     <string name="small_window">Small window to play</string>
     <string name="app_window">Minimize Play</string>
+    <string name="Continue_to_guard">Continue to guard</string>
+    <string name="Join_a_fan_club">Join Fan club</string>
+    <string name="daemon_list">Daemon list</string>
+    <string name="guard_tip_day1">You are the weekly guardian of the current anchor</string>
+    <string name="guard_tip_day2">You are the monthly guardian of the current anchor</string>
+    <string name="guard_tip_day3">You are the annual guardian of the current anchor</string>
     <string name="app_window_hint">Show when exiting the live room</string>
     <string name="system_window">ALL Minimize Play</string>
+    <string name="waiting_for_you">Anchor is waiting for you to become the guardian of TA, \n escort for TA!</string>
+    <string name="guard_for_your">Open a guard for your favorite anchor</string>
     <string name="system_window_hint">Show on other apps and pages \n Need to open the display</string>
     <string name="to_open_the">Go to open</string>
     <string name="do_you_like">Don\'t like the small window play?\n You can turn it off in [Personal Center] - [Settings]</string>
     <string name="to_set_up">Go to Settings</string>
     <string name="know_the">Got it</string>
+    <string name="enjoy_a_lot">Open noble, enjoy a lot of privileges!</string>
     <string name="individual_set">Personal Settings</string>
     <string name="reward">Rewards</string>
     <string name="change_the_password">Change password</string>

common/src/main/res/values/strings.xml

@@ -701,6 +701,13 @@
     <string name="mesg">消息中心</string>
     <string name="owning_guild">所屬公會</string>
     <string name="live_ktgz">開通貴族</string>
+    <string name="guard_for_your">快為您喜歡的主播開通守護吧</string>
+    <string name="daemon_list">守護列表</string>
+    <string name="waiting_for_you">主播正在等待您成為TA的守護，\n為TA保駕護航！</string>
+    <string name="favorite_host_fan">快加入您喜歡的主播粉絲團吧</string>
+    <string name="Join_a_fan_club">加入粉絲團</string>
+    <string name="Continue_to_guard">繼續守護</string>
+
     <string name="chat_charge_tip">確認支付</string>
     <string name="chat_charge_tip2">確認支付（¥%1$s）</string>
     <string name="chat_charge_pay_type">支付方式</string>
@@ -730,6 +737,16 @@
     <string name="live_zslk1">恢復直播</string>
     <string name="live_set_wishlist_num">請輸入數字</string>
     <string name="guard_tip_day">您是當前主播的周守護\n守護日期截止到</string>
+    <string name="guard_tip_day1">您是當前主播的周守護</string>
+    <string name="guard_tip_day2">您是當前主播的月守護</string>
+    <string name="guard_tip_day3">您是當前主播的年守護</string>
+    <string name="guardiandate">守護日期截止到：%s</string>
+
+    <string name="favoriteanchor">快为您喜欢的主播开通守护吧</string>
+    <string name="theguardianof">成爲%s的守護</string>
+
+
+
     <string name="wallet_gold_name">我的%1$s:</string>
     <string name="charge_explain">充值説明</string>
     <string name="register_tip_1">注冊即代表同意</string>
@@ -1067,6 +1084,7 @@
     <string name="come_to">歡迎來到PD LIVE。</string>
     <string name="sign_up_for">註冊PD LIVE</string>
     <string name="register_and_log_in">註冊並登錄</string>
+    <string name="enjoy_a_lot">開通貴族，尊享超多特權！</string>
 
 
 

live/src/main/java/com/yunbao/live/dialog/LiveNewGuardBuyDialogFragment.java

@@ -82,7 +82,7 @@ public class LiveNewGuardBuyDialogFragment extends AbsDialogFragment implements
 
     private LiveNewGuardBuyItemsAdapter buyItemsAdapter;
     private GuardRightAdapter mGuardRightAdapter;
-    private boolean isEmpty,showBuyView;
+    private boolean isEmpty, showBuyView;
     private ImageView mBack;
     private RelativeLayout relativeLayout;
 
@@ -169,13 +169,13 @@ public class LiveNewGuardBuyDialogFragment extends AbsDialogFragment implements
             mAncherName = bundle.getString(Constants.LIVE_ANCHER_NAME);
             mAncherIcon = bundle.getString(Constants.LIVE_ANCHER_ICON);
             mUserIcon = bundle.getString(Constants.USER_ICON);
-            showBuyView = bundle.getBoolean("showBuyView",true);
+            showBuyView = bundle.getBoolean("showBuyView", true);
             String coinName = WordUtil.getString(R.string.diamond);
             mCoinName = coinName;
-            isEmpty=bundle.getBoolean("guard",true);
+            isEmpty = bundle.getBoolean("guard", true);
             // mCoinNameTextView.setText(WordUtil.getString(R.string.guard_my) + coinName + ":");
-            mCoinNameTextView.setText("快为您喜欢的主播开通守护吧");
+            mCoinNameTextView.setText(R.string.favoriteanchor);
-            anchorName.setText(String.format("成爲%s的守護", mAncherName));
+            anchorName.setText(String.format(mContext.getString(R.string.theguardianof), mAncherName));
         }
         LiveHttpUtil.getGuardBuyList(new HttpCallback() {
             @Override
@@ -211,11 +211,11 @@ public class LiveNewGuardBuyDialogFragment extends AbsDialogFragment implements
     private void initView() {
         int guardType = mLiveGuardInfo.getMyGuardType();
         if (guardType == Constants.GUARD_TYPE_NONE) {
-            if(isEmpty){
+            if (isEmpty) {
                 iconCover.setImageResource(R.drawable.guardian_img_wings);
                 userIconOne.setVisibility(View.GONE);
                 userIconTwo.setVisibility(View.GONE);
-            }else{
+            } else {
                 mBack.setVisibility(View.VISIBLE);
                 ImgLoader.display(mContext, mAncherIcon, userIconOne);
                 ImgLoader.display(mContext, mUserIcon, userIconTwo);
@@ -240,19 +240,19 @@ public class LiveNewGuardBuyDialogFragment extends AbsDialogFragment implements
             String title = "";
             switch (guardType) {
                 case Constants.GUARD_TYPE_DAY:
-                    title = "您是當前主播的周守護";
+                    title = mContext.getString(R.string.guard_tip_day1);
                     break;
                 case Constants.GUARD_TYPE_MONTH:
-                    title = "您是當前主播的月守護";
+                    title = mContext.getString(R.string.guard_tip_day2);
                     break;
                 case Constants.GUARD_TYPE_YEAR:
-                    title = "您是當前主播的年守護";
+                    title = mContext.getString(R.string.guard_tip_day3);
                     break;
             }
             anchorName.setText(title);
-            guard_tips.setText("守護日期截止到："+ mLiveGuardInfo.getMyGuardEndTime());
+            guard_tips.setText(String.format(mContext.getString(R.string.guardiandate), mLiveGuardInfo.getMyGuardEndTime()));
         }
-        if(!showBuyView){
+        if (!showBuyView) {
             relativeLayout.setVisibility(View.GONE);
         }
 
@@ -267,7 +267,7 @@ public class LiveNewGuardBuyDialogFragment extends AbsDialogFragment implements
                 bean.setChecked(false);
             }
             for (int i : guardBuyBean.getPrivilege()) {
-                if(i<mRightList.size()) {
+                if (i < mRightList.size()) {
                     mRightList.get(i).setChecked(true);
                 }
             }
@@ -286,13 +286,14 @@ public class LiveNewGuardBuyDialogFragment extends AbsDialogFragment implements
         } else if (i == R.id.guard_buy) {
             forwardMyCoin();
 
-        }else if (i==R.id.guard_back){
+        } else if (i == R.id.guard_back) {
             gotoBack();
         }
     }
-    private void gotoBack(){
+
+    private void gotoBack() {
         dismiss();
-        ((LiveActivity)mContext).openNewGuardListWindow(mContext instanceof LiveRyAnchorActivity);
+        ((LiveActivity) mContext).openNewGuardListWindow(mContext instanceof LiveRyAnchorActivity);
     }
 
     /**

live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java

@@ -25,6 +25,7 @@ import com.blankj.utilcode.util.GsonUtils;
 import com.google.gson.reflect.TypeToken;
 import com.yunbao.common.Constants;
 import com.yunbao.common.adapter.RefreshAdapter;
+import com.yunbao.common.bean.LiveUserGiftBean;
 import com.yunbao.common.bean.LiveUserRankBean;
 import com.yunbao.common.bean.UserBean;
 import com.yunbao.common.bean.UserRankModel;
@@ -38,7 +39,6 @@ import com.yunbao.live.activity.LiveActivity;
 import com.yunbao.live.activity.LiveRyAnchorActivity;
 import com.yunbao.live.adapter.UserMoreInfoAdapter;
 import com.yunbao.live.bean.LiveGuardInfo;
-import com.yunbao.common.bean.LiveUserGiftBean;
 import com.yunbao.live.http.LiveHttpUtil;
 
 import java.util.ArrayList;
@@ -68,7 +68,7 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
     private RelativeLayout bottom_msg;//底部信息的布局，在榜单列表下不需要显示底部信息
     private String Tips = "1";
     private String type = "guanzhong";
-    private boolean isOnly, noble,showBuyView;
+    private boolean isOnly, noble, showBuyView;
     ImageView no_more;
     private List<String> outRankHide = new ArrayList<>();
 
@@ -115,7 +115,7 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
         stream = bundle.getString(Constants.STREAM);
         isOnly = bundle.getBoolean("only", false);
         noble = bundle.getBoolean("noble", false);
-        showBuyView = bundle.getBoolean("showBuyView",true);
+        showBuyView = bundle.getBoolean("showBuyView", true);
         String outRankHideString = bundle.getString("outRankHide");
         outRankHide = GsonUtils.fromJson(outRankHideString, new TypeToken<List<String>>() {
         }.getType());
@@ -373,27 +373,27 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
         LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) mRefreshView.getLayoutParams();
         params.bottomMargin = DpUtil.dp2px(65);
         if (Tips.equals("1")) {
-            tags.setText("開通貴族，尊享超多特權！");
+            tags.setText(R.string.enjoy_a_lot);
             btn.setBackgroundResource(R.mipmap.btn_openvip);
-            btn.setText("開通貴族");
+            btn.setText(R.string.live_ktgz);
             setTextColor(audience_btn, guard_btn, fans_btn, weekRank, dayRank);
             gz_view.setVisibility(View.GONE);
             userMoreInfoAdapter.type = "1";
             type = "guanzhong";
         } else if (Tips.equals("2")) {
-            tags.setText("快為您喜歡的主播開通守護吧");
+            tags.setText(R.string.guard_for_your);
             btn.setBackgroundResource(R.mipmap.btn_openprotection);
-            btn.setText("守護列表");
+            btn.setText(R.string.daemon_list);
             setTextColor(guard_btn, audience_btn, fans_btn, dayRank, weekRank);
             gz_view.setVisibility(View.GONE);
             userMoreInfoAdapter.type = "2";
             no_more.setImageResource(R.mipmap.ic_guard_not);
-            noMoreText.setText("主播正在等待您成為TA的守護，\n為TA保駕護航！");
+            noMoreText.setText(R.string.waiting_for_you);
             noMoreText.setVisibility(View.VISIBLE);
             type = "guard";
         } else if (Tips.equals("3")) {
-            tags.setText("快加入您喜歡的主播粉絲團吧");
+            tags.setText(R.string.favorite_host_fan);
-            btn.setText("加入粉絲團");
+            btn.setText(R.string.Join_a_fan_club);
             btn.setBackgroundResource(R.mipmap.btn_joinfans);
             setTextColor(fans_btn, audience_btn, guard_btn, dayRank, weekRank);
             gz_view.setVisibility(View.GONE);
@@ -421,7 +421,7 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
             setTextColor(weekRank, audience_btn, guard_btn, fans_btn, gz_view, dayRank);
             noMoreText.setVisibility(View.VISIBLE);
         }
-        if(!showBuyView){
+        if (!showBuyView) {
             bottom_msg.setVisibility(View.GONE);
             params.bottomMargin = DpUtil.dp2px(0);
         }

live/src/main/res/layout/dialog_new_guard_buy.xml

@@ -171,8 +171,10 @@
 
                 <TextView
                     android:id="@+id/guard_btn_buy"
-                    android:layout_width="90dp"
+                    android:layout_width="110dp"
                     android:layout_height="30dp"
+                    android:maxLines="1"
+                    android:ellipsize="end"
                     android:layout_alignParentEnd="true"
                     android:layout_centerVertical="true"
                     android:layout_marginEnd="15dp"
@@ -214,7 +216,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="14dp"
-                        android:text="充值"
+                        android:text="@string/charge"
                         android:textColor="#F7B500"
                         android:textSize="12sp" />
 
@@ -231,7 +233,7 @@
                     android:layout_height="35dp"
                     android:layout_marginTop="2dp"
                     android:background="@drawable/bg_new_guard_but"
-                    android:text="繼續守護"
+                    android:text="@string/Continue_to_guard"
                     android:textColor="#FFFFFF"
                     android:textSize="16sp" />
             </LinearLayout>

live/src/main/res/layout/dialog_new_guard_list.xml

@@ -146,7 +146,7 @@
 
                 <TextView
                     android:id="@+id/guard_btn_buy"
-                    android:layout_width="90dp"
+                    android:layout_width="110dp"
                     android:layout_height="30dp"
                     android:layout_alignParentEnd="true"
                     android:layout_centerVertical="true"

live/src/main/res/layout/dialog_user_more_list.xml

@@ -156,7 +156,7 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginLeft="20dp"
-            android:text="開通貴族，尊享超多特權！"
+            android:text="@string/enjoy_a_lot"
             android:textColor="#ffc2dff0"
             android:textSize="12sp" />
 
@@ -170,7 +170,7 @@
             android:layout_marginRight="20dp"
             android:background="@mipmap/btn_openvip"
             android:gravity="center"
-            android:text="開通貴族"
+            android:text="@string/live_ktgz"
             android:textSize="13sp" />
 
     </RelativeLayout>