yutou/pdlivexp
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Share/src/main/java/com/yunbao/share/ui/SharePopDialog.java
View File

@ -19,8 +19,8 @@ import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.share.bean.ShareBuilder;
import com.yunbao.share.adapters.ShareAppAdapter;
import com.yunbao.share.bean.ShareBuilder;
import java.util.ArrayList;
import java.util.List;
@ -64,7 +64,7 @@ public class SharePopDialog extends AbsDialogPopupWindow {
}
public SharePopDialog setShareLink(String link) {
this.shareLink = link;
this.shareLink = link + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
return this;
}
@ -113,6 +113,7 @@ public class SharePopDialog extends AbsDialogPopupWindow {
url = shareLink;
}
}
url = url + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
link.setText(url);
info.setText(String.format(getContext().getString(R.string.dialog_share_info), StringUtil.isEmpty(anchorName) ? "" : anchorName));
ImgLoader.display(getContext(), anchorAvatar, avatar);
@ -139,7 +140,7 @@ public class SharePopDialog extends AbsDialogPopupWindow {
url = ShareBuilder.createLiveShareLink(uid, anchorId, anchorName, anchorAvatar);
}
ClipboardManager cm = (ClipboardManager) getContext().getSystemService(CLIPBOARD_SERVICE);
ClipData clipData = ClipData.newPlainText("text",info.getText().toString()+"\n"+url);
ClipData clipData = ClipData.newPlainText("text", info.getText().toString() + "\n" + url + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0));
cm.setPrimaryClip(clipData);
ToastUtil.show(getContext().getString(com.yunbao.common.R.string.copy_success));
}

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>

36
live/src/main/java/com/yunbao/live/dialog/GiftPopDialog.java
View File

@ -9,6 +9,11 @@ import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.viewpager.widget.ViewPager;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@ -17,6 +22,7 @@ import com.yunbao.common.bean.LiveGiftBean;
import com.yunbao.common.bean.PrankGiftBean;
import com.yunbao.common.dialog.AbsDialogPopupWindow;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
@ -26,16 +32,10 @@ import com.yunbao.live.adapter.GiftTopAdapter;
import com.yunbao.live.adapter.LiveGiftPagerAdapter;
import com.yunbao.live.adapter.LiveGiftPagerAdapter.ActionListener;
import com.yunbao.live.bean.GiftTopBean;
import com.yunbao.common.http.LiveHttpUtil;
import java.util.ArrayList;
import java.util.List;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.viewpager.widget.ViewPager;
public class GiftPopDialog extends AbsDialogPopupWindow implements ActionListener, View.OnClickListener {
private Context mContext;
@ -217,7 +217,7 @@ public class GiftPopDialog extends AbsDialogPopupWindow implements ActionListene
for (int i = 0; i < list.size(); i++) {
JSONObject data = list.getJSONObject(i);
GiftTopBean giftTopBean = new GiftTopBean();
giftTopBean.setName(data.getString("name"));
giftTopBean.setName(WordUtil.isNewZh()?data.getString("name"):data.getString("en_name"));
name.add(giftTopBean);
}
@ -265,17 +265,17 @@ public class GiftPopDialog extends AbsDialogPopupWindow implements ActionListene
public void onClick(View view) {
int id = view.getId();
if (id == R.id.btn_send) {
DialogUitl.showSimpleInputDialog(mContext, "輸入數量", DialogUitl.INPUT_TYPE_NUMBER, new DialogUitl.SimpleCallback() {
DialogUitl.showSimpleInputDialog(mContext, WordUtil.isNewZh() ?"輸入數量":"Input quantity", DialogUitl.INPUT_TYPE_NUMBER, new DialogUitl.SimpleCallback() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
try {
prangNum = Integer.parseInt(content);
if (prangNum <= 0) {
ToastUtil.show("數量不能為0或負數");
ToastUtil.show(WordUtil.isNewZh() ?"數量不能為0或負數":"The quantity cannot be zero or negative");
return;
}
if (prangNum > 999) {
ToastUtil.show("數量不能大於999");
ToastUtil.show(WordUtil.isNewZh() ?"數量不能大於999":"The number cannot be greater than 999");
return;
}
mBtnSend.setText(content);
@ -285,12 +285,12 @@ public class GiftPopDialog extends AbsDialogPopupWindow implements ActionListene
dialog.dismiss();
} catch (Exception e) {
e.printStackTrace();
ToastUtil.show("輸入錯誤");
ToastUtil.show(WordUtil.isNewZh() ? "輸入錯誤":"Input error");
}
}
});
} else if (id == R.id.btn_context) {
DialogUitl.showSimpleInputDialog(mContext, "輸入整蠱內容...", new DialogUitl.SimpleCallback() {
DialogUitl.showSimpleInputDialog(mContext, WordUtil.isNewZh() ? "輸入整蠱內容..." : "Enter the prank content...", new DialogUitl.SimpleCallback() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
prangContext = content;
@ -307,29 +307,29 @@ public class GiftPopDialog extends AbsDialogPopupWindow implements ActionListene
});
} else if (id == R.id.gift_btn) {
if (bean == null) {
ToastUtil.show("整蠱禮物不能為空");
ToastUtil.show(WordUtil.isNewZh() ? "整蠱禮物不能為空":"A trick gift can't be empty");
return;
}
if (StringUtil.isEmpty(prangContext) || prangNum == 0) {
ToastUtil.show("整蠱內容或數量不能為空");
ToastUtil.show(WordUtil.isNewZh() ?"整蠱內容或數量不能為空":"The content or number of pranks cannot be empty");
return;
}
if (prangNum >= 999) {
ToastUtil.show("整蠱數量不能過大");
ToastUtil.show(WordUtil.isNewZh() ?"整蠱數量不能過大":"The number of pranks should not be too large");
return;
}
if (WordUtil.isSpecialChar(prangContext)) {
ToastUtil.show("整蠱內容不能包含特殊字符");
ToastUtil.show(WordUtil.isNewZh() ?"整蠱內容不能包含特殊字符":"The prank content must not contain special characters");
return;
}
if (prangContext.length() > 6) {
ToastUtil.show("整蠱內容過長");
ToastUtil.show(WordUtil.isNewZh() ?"整蠱內容過長":"The prank is too long");
return;
}
if (giftBeans != null) {
for (PrankGiftBean giftBean : giftBeans) {
if (giftBean.getGiftId().equals(bean.getId() + "")) {
ToastUtil.show("整蠱禮物已存在");
ToastUtil.show(WordUtil.isNewZh() ?"整蠱禮物已存在":"Prank gifts already exist");
return;
}
}

5
live/src/main/java/com/yunbao/live/dialog/LivePrankDialogFragment.java
View File

@ -96,6 +96,11 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
mPrankRecyclerView.setAdapter(recyclerAdapter);
mCoinTextView.setOnClickListener(this);
mTurntableConfigImageView.setOnClickListener(this);
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
mPrankBtn.setText("保存設置");
} else {
mPrankBtn.setText("Save Settings");
}
recyclerAdapter.setOnItemClickListener(new OnItemClickListener<String>() {
@Override
public void onItemClick(String bean, int position) {

6
live/src/main/res/layout/dialog_live_gift_wall.xml
View File

@ -103,7 +103,7 @@
android:padding="2dp"
android:text="@string/lit_icon"
android:textColor="#3E68FF"
android:textSize="14sp"
android:textSize="13sp"
android:textStyle="italic|bold" />
<View
@ -129,7 +129,7 @@
android:padding="2dp"
android:text="@string/unlit_icon"
android:textColor="#3E68FF"
android:textSize="14sp"
android:textSize="13sp"
android:textStyle="italic" />
<View
@ -154,7 +154,7 @@
android:padding="2dp"
android:text="@string/all_service_champion"
android:textColor="#3E68FF"
android:textSize="14sp"
android:textSize="13sp"
android:textStyle="italic" />
<View

1
live/src/main/res/layout/dialog_live_prank.xml
View File

@ -31,7 +31,6 @@
android:layout_marginEnd="16dp"
android:background="@drawable/bg_live_prank_turntable_save"
android:gravity="center"
android:text="保存設置"
android:textColor="#FFF"
android:textSize="10sp"
app:layout_constraintEnd_toEndOf="parent"

6
live/src/main/res/layout/dialog_live_select_gift_wrap.xml
View File

@ -45,7 +45,7 @@
android:layout_height="24dp"
android:layout_marginStart="8dp"
android:gravity="center"
android:text="選擇整蠱禮物"
android:text="@string/choose_a_prank_gift"
android:textColor="#808080"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent"
@ -142,7 +142,7 @@
android:layout_marginBottom="10dp"
android:background="@drawable/bg_prank_gift_item"
android:gravity="center"
android:text="输入数量"
android:text="@string/choose_a_prank_gift_hint2"
android:textColor="#8C8C8C"
android:textSize="14sp" />
@ -159,7 +159,7 @@
android:gravity="start|center"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:text="輸入整蠱內容..."
android:text="@string/choose_a_prank_gift_hint"
android:textColor="#8C8C8C"
android:textSize="14sp" />

1
live/src/main/res/layout/item_live_gift.xml
View File

@ -82,6 +82,7 @@
android:layout_gravity="bottom"
android:layout_marginBottom="23dp"
android:gravity="center"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="12sp" />

62
live/src/main/res/layout/item_live_task.xml
View File

@ -7,34 +7,44 @@
android:layout_marginBottom="10dp"
android:background="@drawable/background_151515">
<TextView
android:id="@+id/item_task_title"
android:layout_width="350dp"
<LinearLayout
android:id="@+id/item_task_title_lay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="11dp"
android:ellipsize="end"
android:singleLine="true"
android:textColor="#FFFFFF"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/item_task_complete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:background="@drawable/background_6cbe53"
android:paddingStart="14dp"
android:paddingTop="4dp"
android:orientation="horizontal"
android:paddingEnd="14dp"
android:paddingBottom="4dp"
android:textColor="#FFFFFF"
android:textSize="10sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/item_task_title" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/item_task_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="20dp"
android:layout_weight="1"
android:ellipsize="end"
android:singleLine="true"
android:textColor="#FFFFFF"
android:textSize="14sp" />
<TextView
android:id="@+id/item_task_complete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:background="@drawable/background_6cbe53"
android:paddingStart="14dp"
android:paddingTop="4dp"
android:paddingEnd="4dp"
android:paddingBottom="4dp"
android:textColor="#FFFFFF"
android:textSize="10sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/item_task_title" />
</LinearLayout>
<LinearLayout
android:id="@+id/item_task_layout"
@ -47,7 +57,7 @@
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/item_task_title">
app:layout_constraintTop_toBottomOf="@+id/item_task_title_lay">
<ImageView
android:id="@+id/item_task_hot_img"
@ -71,7 +81,7 @@
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintStart_toEndOf="@+id/item_task_layout"
app:layout_constraintTop_toBottomOf="@+id/item_task_title">
app:layout_constraintTop_toBottomOf="@+id/item_task_title_lay">
<ImageView
android:id="@+id/item_task_xp_img"

4
live/src/main/res/layout/item_random_pk_info.xml
View File

@ -130,7 +130,9 @@
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_width="100dp"
android:singleLine="true"
android:ellipsize="end"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/random_pk_info_switch"

6
live/src/main/res/layout/view_live_prank_turntable.xml
View File

@ -30,7 +30,7 @@
<TextView
android:id="@+id/switch1_desc_text"
android:layout_width="330dp"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:ellipsize="end"
@ -59,7 +59,7 @@
<TextView
android:id="@+id/switch2_title_text"
android:layout_width="290dp"
android:layout_width="270dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:ellipsize="end"
@ -110,7 +110,7 @@
android:layout_width="match_parent"
android:layout_height="250dp"
android:gravity="center"
android:text="您目前還未設置整蠱內容"
android:text="@string/prank_content_yet_hint"
android:textColor="#BFBFBF"
android:visibility="gone" />
</LinearLayout>