yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改中英文

Browse Source
This commit is contained in:
18401019693
2023-10-12 14:26:10 +08:00
parent 7bedf93dd5
commit e081f1e058
18 changed files with 119 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/src/main/java/com/yunbao/common/activity/WebViewActivity.java
View File

@@ -7,6 +7,7 @@ import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.os.Handler;
import android.provider.MediaStore;
import android.text.TextUtils;
import android.view.View;
@@ -25,7 +26,6 @@ import androidx.annotation.RequiresApi;
import com.alibaba.fastjson.JSON;
import com.lxj.xpopup.XPopup;
import com.umeng.analytics.MobclickAgent;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.CommonAppContext;
import com.yunbao.common.Constants;
@@ -113,7 +113,13 @@ public class WebViewActivity extends AbsActivity {
@Override
public void onPageFinished(WebView view, String url) {
setTitle(view.getTitle());
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
setTitle(view.getTitle());
}
}, 500);
if (url.contains("for")) {
mWebView.loadUrl("javascript:goAnchorTab()");
}
@@ -256,7 +262,7 @@ public class WebViewActivity extends AbsActivity {
mIsLive = isLive;
if (Constants.LoginKefu) {
if (addArgs) {
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
}
}
Intent intent = new Intent(context, WebViewActivity.class);
@@ -264,7 +270,7 @@ public class WebViewActivity extends AbsActivity {
context.startActivity(intent);
}
public static void forward(Context context, String url,boolean isLive) {
public static void forward(Context context, String url, boolean isLive) {
forward(context, url, true, isLive);
}
@@ -437,6 +443,7 @@ public class WebViewActivity extends AbsActivity {
}
@Override
protected void onPause() {
super.onPause();

6
common/src/main/res/layout/dialog_live_new_wish_list.xml
View File

@@ -10,7 +10,7 @@
android:id="@+id/wish_list_top"
android:layout_width="match_parent"
android:layout_height="160dp"
android:background="@drawable/wish_list_day_zh"
android:background="@drawable/wish_list_lunar_en"
android:scaleType="fitCenter" />
<com.google.android.material.tabs.TabLayout
@@ -36,12 +36,14 @@
<TextView
android:id="@+id/replacement_wish"
android:layout_width="140dp"
android:layout_width="100dp"
android:layout_height="31dp"
android:layout_alignParentEnd="true"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:singleLine="true"
android:ellipsize="end"
android:layout_marginBottom="8dp"
android:background="@drawable/background_wish_replacement"
android:gravity="center"

15
common/src/main/res/layout/replacement_hint_custom_popup.xml
View File

@@ -1,21 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="280dp"
android:layout_height="194dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:cardCornerRadius="18dp"
app:cardElevation="18dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:orientation="vertical"
android:paddingBottom="10dp">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="55dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="30dp">
<TextView
@@ -72,6 +74,11 @@
android:textColor="@color/white"
android:textSize="14sp" />
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="10dp" />
</LinearLayout>

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

@@ -1262,7 +1262,7 @@ Limited ride And limited avatar frame</string>
<string name="has_been_lit">Has been lit %s</string>
<string name="codex">Illustrated book</string>
<string name="unlit_icon">Not lit up</string>
<string name="all_service_champion">Platform naming</string>
<string name="all_service_champion">Platform title</string>
<string name="unlit_icon_hint">Not yet lit</string>
<string name="lit_icon_hint">No more gifts yet</string>
<string name="instant_light">Light up</string>
@@ -1360,5 +1360,8 @@ Limited ride And limited avatar frame</string>
<string name="diamonds_every_time_requirement_of">Minimum requirement of 1000 diamonds</string>
<string name="diamonds_every_time_requirement_of_hint">Fill in the content of the prank，Fill in a minimum of 2 words and a maximum of 10 words</string>
<string name="prank_content_yet_hint">You have not set up the prank content yet</string>
<string name="choose_a_prank_gift">Choose a prank gift</string>
<string name="choose_a_prank_gift_hint">Enter the prank content...</string>
<string name="choose_a_prank_gift_hint2">Input quantity</string>
</resources>

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

@@ -1357,4 +1357,7 @@
<string name="diamonds_every_time_requirement_of">最少1,000鑽石起步</string>
<string name="diamonds_every_time_requirement_of_hint">填寫整蠱內容，最少2個字，最多10個字</string>
<string name="prank_content_yet_hint">您目前還未設置整蠱內容</string>
<string name="choose_a_prank_gift">選擇整蠱禮物</string>
<string name="choose_a_prank_gift_hint">輸入整蠱內容...</string>
<string name="choose_a_prank_gift_hint2">输入数量</string>
</resources>

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

@@ -1356,4 +1356,7 @@
<string name="diamonds_every_time_requirement_of">最少1,000鑽石起步</string>
<string name="diamonds_every_time_requirement_of_hint">填寫整蠱內容，最少2個字，最多10個字</string>
<string name="prank_content_yet_hint">您目前還未設置整蠱內容</string>
<string name="choose_a_prank_gift">選擇整蠱禮物</string>
<string name="choose_a_prank_gift_hint">輸入整蠱內容...</string>
<string name="choose_a_prank_gift_hint2">输入数量</string>
</resources>

3
common/src/main/res/values-zh/strings.xml
View File

@@ -1356,5 +1356,8 @@
<string name="diamonds_every_time_requirement_of">最少1,000鑽石起步</string>
<string name="diamonds_every_time_requirement_of_hint">填寫整蠱內容，最少2個字，最多10個字</string>
<string name="prank_content_yet_hint">您目前還未設置整蠱內容</string>
<string name="choose_a_prank_gift">選擇整蠱禮物</string>
<string name="choose_a_prank_gift_hint">輸入整蠱內容...</string>
<string name="choose_a_prank_gift_hint2">输入数量</string>
</resources>

5
common/src/main/res/values/strings.xml
View File

@@ -1262,7 +1262,7 @@ Limited ride And limited avatar frame</string>
<string name="gift_wall">Gift wall</string>
<string name="has_been_lit">Has been lit %s</string>
<string name="unlit_icon">Not lit up</string>
<string name="all_service_champion">Platform naming</string>
<string name="all_service_champion">Platform title</string>
<string name="unlit_icon_hint">Not yet lit</string>
<string name="unlit_icon_hint2">The current event has not sent any gifts</string>
<string name="lit_icon_hint">No more gifts yet</string>
@@ -1363,4 +1363,7 @@ Limited ride And limited avatar frame</string>
<string name="diamonds_every_time_requirement_of">Minimum requirement of 1000 diamonds</string>
<string name="diamonds_every_time_requirement_of_hint">Fill in the content of the prank，Fill in a minimum of 2 words and a maximum of 10 words</string>
<string name="prank_content_yet_hint">You have not set up the prank content yet</string>
<string name="choose_a_prank_gift">Choose a prank gift</string>
<string name="choose_a_prank_gift_hint">Enter the prank content...</string>
<string name="choose_a_prank_gift_hint2">Input quantity</string>
</resources>