Merge remote-tracking branch 'origin/master'

common/src/main/java/com/yunbao/common/activity/WebViewActivity.java

@@ -23,9 +23,11 @@ import android.widget.ProgressBar;
 import androidx.annotation.RequiresApi;
 
 import com.yunbao.common.CommonAppConfig;
+import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.Constants;
 import com.yunbao.common.R;
 import com.yunbao.common.event.JavascriptInterfaceEvent;
+import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.AndroidBug5497Workaround;
 import com.yunbao.common.utils.Bus;
 import com.yunbao.common.utils.DeviceUtils;
@@ -38,6 +40,8 @@ import com.yunbao.common.utils.WordUtil;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
+import java.util.Locale;
+
 /**
  * Created by cxf on 2018/9/25.
  */
@@ -236,12 +240,12 @@ public class WebViewActivity extends AbsActivity {
             }
         }
         Intent intent = new Intent(context, WebViewActivity.class);
-        intent.putExtra(Constants.URL, url);
+        intent.putExtra(Constants.URL, url+ "&isZh=" + ((IMLoginManager.get(CommonAppContext.sInstance.getBaseContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
         context.startActivity(intent);
     }
 
     public static void forward(Context context, String url) {
-        forward(context, url, true);
+        forward(context, url+ "&isZh=" + ((IMLoginManager.get(CommonAppContext.sInstance.getBaseContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"), true);
     }
 
     @Override

common/src/main/res/layout/view_title.xml

@@ -49,7 +49,7 @@
             android:textColor="@color/textColor"
             android:textSize="13sp"
             android:layout_marginRight="25dp"
-            android:text="充值未到账？"
+            android:text="@string/not_received"
             android:visibility="gone"
             android:textStyle="bold" />
     </RelativeLayout>

common/src/main/res/values-en-rUS/string.xml

@@ -1139,4 +1139,5 @@ Limited ride And limited avatar frame</string>
     <string name="chat_prompt11">Get live notification after opening</string>
     <string name="PK_Ladder_Race">PK Ladder Race</string>
     <string name="party_studio">Confirm whether to go to the other party\'s studio？</string>
+    <string name="not_received">Not received?</string>
 </resources>

common/src/main/res/values-zh-rHK/strings.xml

@@ -1140,4 +1140,5 @@
     <string name="chat_prompt11">開啟後獲得直播通知</string>
     <string name="PK_Ladder_Race">PK天梯赛</string>
     <string name="party_studio">是否確認前往對方直播間？</string>
+    <string name="not_received">充值未到账？</string>
 </resources>

common/src/main/res/values-zh-rTW/strings.xml

@@ -1139,4 +1139,5 @@
     <string name="chat_prompt10">開播通知</string>
     <string name="chat_prompt11">開啟後獲得直播通知</string>
     <string name="PK_Ladder_Race">PK天梯赛</string>
+    <string name="not_received">充值未到账？</string>
 </resources>

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

@@ -1140,4 +1140,5 @@
     <string name="chat_prompt11">開啟後獲得直播通知</string>
     <string name="PK_Ladder_Race">PK天梯赛</string>
     <string name="party_studio">是否確認前往對方直播間？</string>
+    <string name="not_received">充值未到账？</string>
 </resources>

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

@@ -1146,4 +1146,5 @@ Limited ride And limited avatar frame</string>
     <string name="PK_Ladder_Race">PK Ladder Race</string>
     <string name="chat_prompt11">Get live notification after opening</string>
     <string name="party_studio">Confirm whether to go to the other party\'s studio？</string>
+    <string name="not_received">Not received?</string>
 </resources>