diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml
index 7c70e1247..32c917fe3 100644
--- a/common/src/main/res/values-en-rUS/string.xml
+++ b/common/src/main/res/values-en-rUS/string.xml
@@ -1137,4 +1137,6 @@ Limited ride And limited avatar frame
New activity, system message
Broadcast notice
Get live notification after opening
+ PK Ladder Race
+ Confirm whether to go to the other party\'s studio?
diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml
index 6cd79c545..3eacbccf5 100644
--- a/common/src/main/res/values-zh-rHK/strings.xml
+++ b/common/src/main/res/values-zh-rHK/strings.xml
@@ -1132,4 +1132,6 @@
新活動、系統消息
開播通知
開啟後獲得直播通知
+ PK天梯赛
+ 是否確認前往對方直播間?
diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml
index 6cd79c545..c45652227 100644
--- a/common/src/main/res/values-zh-rTW/strings.xml
+++ b/common/src/main/res/values-zh-rTW/strings.xml
@@ -1132,4 +1132,5 @@
新活動、系統消息
開播通知
開啟後獲得直播通知
+ PK天梯赛
diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml
index 6cd79c545..3eacbccf5 100644
--- a/common/src/main/res/values-zh/strings.xml
+++ b/common/src/main/res/values-zh/strings.xml
@@ -1132,4 +1132,6 @@
新活動、系統消息
開播通知
開啟後獲得直播通知
+ PK天梯赛
+ 是否確認前往對方直播間?
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 7c70e1247..0861562ec 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -1136,5 +1136,7 @@ Limited ride And limited avatar frame
System notification
New activity, system message
Broadcast notice
+ PK Ladder Race
Get live notification after opening
+ Confirm whether to go to the other party\'s studio?
diff --git a/config.gradle b/config.gradle
index 367862767..82f2a343d 100644
--- a/config.gradle
+++ b/config.gradle
@@ -9,9 +9,9 @@ ext {
]
manifestPlaceholders = [
//正式、
-// serverHost : "https://napi.yaoulive.com",
+ serverHost : "https://napi.yaoulive.com",
//测试
- serverHost : "https://ceshi.yaoulive.com",
+// serverHost : "https://ceshi.yaoulive.com",
//腾讯地图
txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB",
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java
index e91e38c26..44a868bb7 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java
@@ -589,7 +589,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
private void gotoLive(String live_id) {
- DialogUitl.showSimpleDialog(mContext, "是否確認前往對方直播間?", new DialogUitl.SimpleCallback() {
+ DialogUitl.showSimpleDialog(mContext, mContext.getString(R.string.party_studio), new DialogUitl.SimpleCallback() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
LiveUserDialogFragment.this.dismiss();
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 e47000d43..35fc45d1f 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -2054,7 +2054,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
mPkRankText.setLayoutParams(textParams);
mPkRankText.setGravity(Gravity.START);
ImgLoader.display(mContext, bean.getVsImgUrl(), titleIcon);
- titleText.setText("PK天梯赛");
+ titleText.setText(R.string.PK_Ladder_Race);
titleText.setLayoutParams(textParams);
titleIcon.setLayoutParams(params);
mPkRankIcon.setLayoutParams(params);
diff --git a/main/src/main/res/layout/view_main_encourage.xml b/main/src/main/res/layout/view_main_encourage.xml
index e661f061a..387eb2bb5 100644
--- a/main/src/main/res/layout/view_main_encourage.xml
+++ b/main/src/main/res/layout/view_main_encourage.xml
@@ -8,7 +8,7 @@
android:id="@+id/rootView"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"/>
+ android:orientation="vertical" />