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-09 16:27:54 +08:00
parent 45ad8a9810
commit 7b62409bf1
29 changed files with 299 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
live/src/main/java/com/yunbao/live/activity/LiveActivity.java
View File

@@ -1289,9 +1289,9 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
//粉絲團粉絲團
//不是粉絲
if (LiveAudienceActivity.is_fans != null && LiveAudienceActivity.is_fans.equals("2")) {
bundle.putString(Constants.URL, CommonAppConfig.HOST + "/h5/live/joinFansClub.html" + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + uid);
bundle.putString(Constants.URL, CommonAppConfig.HOST + "/h5/live/joinFansClub.html" + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + uid+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0));
} else {
bundle.putString(Constants.URL, CommonAppConfig.HOST + "/h5/live/fansClub.html" + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + uid);
bundle.putString(Constants.URL, CommonAppConfig.HOST + "/h5/live/fansClub.html" + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + uid+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0));
}
bundle.putString("liveUid", mLiveUid);
bundle.putString("anchorName", mAncherName);

124
live/src/main/java/com/yunbao/live/adapter/LivePrankRecyclerAdapter.java
View File

@@ -8,10 +8,14 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.yunbao.common.bean.PrankGiftBean;
import com.yunbao.common.bean.PrankTurntableBean;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
@@ -19,9 +23,7 @@ import com.yunbao.live.R;
import java.util.ArrayList;
import java.util.List;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import java.util.Locale;
public class LivePrankRecyclerAdapter extends RecyclerView.Adapter<LivePrankRecyclerAdapter.PrankRecyclerViewHolder> {
public static final int TYPE_TURNTABLE = 0;
@@ -88,7 +90,7 @@ public class LivePrankRecyclerAdapter extends RecyclerView.Adapter<LivePrankRecy
}
public boolean getViewTypeOfList() {
return viewType==TYPE_TURNTABLE;
return viewType == TYPE_TURNTABLE;
}
public static abstract class PrankRecyclerViewHolder extends RecyclerView.ViewHolder {
@@ -145,33 +147,63 @@ public class LivePrankRecyclerAdapter extends RecyclerView.Adapter<LivePrankRecy
probability = itemView.findViewById(R.id.prank_turntable_probability);
context = itemView.findViewById(R.id.prank_turntable_val);
context.setOnClickListener(v -> {
DialogUitl.showSimpleInputDialog(mContext, "填寫整蠱內容", DialogUitl.INPUT_TYPE_TEXT, 10, new DialogUitl.SimpleCallback() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
if(WordUtil.isSpecialChar(content)){
ToastUtil.show("整蠱內容不能包含特殊字符");
return;
}
if (content.length() >= 2 && content.length() <= 10) {
context.setText(content);
onItemClickListener.onItemClick(content, ((PrankTurntableBean)list.get((Integer) itemView.getTag())).getId());
((PrankTurntableBean)list.get((Integer) itemView.getTag())).setContext(content);
dialog.dismiss();
} /*else if (content.length() == 0) {
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
DialogUitl.showSimpleInputDialog(mContext, "填寫整蠱內容", DialogUitl.INPUT_TYPE_TEXT, 10, new DialogUitl.SimpleCallback() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
if (WordUtil.isSpecialChar(content)) {
ToastUtil.show("整蠱內容不能包含特殊字符");
return;
}
if (content.length() >= 2 && content.length() <= 10) {
context.setText(content);
onItemClickListener.onItemClick(content, ((PrankTurntableBean) list.get((Integer) itemView.getTag())).getId());
((PrankTurntableBean) list.get((Integer) itemView.getTag())).setContext(content);
dialog.dismiss();
} /*else if (content.length() == 0) {
context.setText("");
onItemClickListener.onItemClick(content, ((PrankTurntableBean)list.get((Integer) itemView.getTag())).getId());
dialog.dismiss();
} */else {
ToastUtil.show("最少2個字，最多10個字");
} */ else {
ToastUtil.show("最少2個字，最多10個字");
}
}
}
});
});
} else {
DialogUitl.showSimpleInputDialog(mContext, "Fill in the content of the prank", DialogUitl.INPUT_TYPE_TEXT, 10, new DialogUitl.SimpleCallback() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
if (WordUtil.isSpecialChar(content)) {
ToastUtil.show("The prank content cannot contain special characters");
return;
}
if (content.length() >= 2 && content.length() <= 10) {
context.setText(content);
onItemClickListener.onItemClick(content, ((PrankTurntableBean) list.get((Integer) itemView.getTag())).getId());
((PrankTurntableBean) list.get((Integer) itemView.getTag())).setContext(content);
dialog.dismiss();
} /*else if (content.length() == 0) {
context.setText("");
onItemClickListener.onItemClick(content, ((PrankTurntableBean)list.get((Integer) itemView.getTag())).getId());
dialog.dismiss();
} */ else {
ToastUtil.show("Fill in a minimum of 2 words and a maximum of 10 words");
}
}
});
}
});
}
public void setDate(PrankTurntableBean bean, int position) {
title.setText("轉盤" + getChineseNum(bean.getId()) + "號位");
probability.setText(getProbability(bean.getId()));
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
title.setText("轉盤" + getChineseNum(bean.getId()) + "號位");
} else {
title.setText("Turntable" + getChineseNum(bean.getId()));
}
probability.setText(getProbability(bean.getId(), mContext));
context.setText(bean.getContext());
itemView.setTag(position);
}
@@ -194,21 +226,39 @@ public class LivePrankRecyclerAdapter extends RecyclerView.Adapter<LivePrankRecy
return "";
}
private String getProbability(int id) {
switch (id) {
case 1:
return "抽取幾率：40%";
case 2:
return "抽取幾率：30%";
case 3:
return "抽取幾率：15%";
case 4:
return "抽取幾率：10%";
case 5:
return "抽取幾率：4%";
default:
return "抽取幾率：1%";
private String getProbability(int id, Context mContext) {
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
switch (id) {
case 1:
return "抽取幾率：40%";
case 2:
return "抽取幾率：30%";
case 3:
return "抽取幾率：15%";
case 4:
return "抽取幾率：10%";
case 5:
return "抽取幾率：4%";
default:
return "抽取幾率：1%";
}
} else {
switch (id) {
case 1:
return "Extraction probability：40%";
case 2:
return "Extraction probability：30%";
case 3:
return "Extraction probability：15%";
case 4:
return "Extraction probability：10%";
case 5:
return "Extraction probability：4%";
default:
return "Extraction probability：1%";
}
}
}
}
}

2
live/src/main/java/com/yunbao/live/adapter/LiveReadyClassAdapter.java
View File

@@ -16,9 +16,11 @@ import com.yunbao.common.bean.LiveClassBean;
import com.yunbao.common.custom.MyRadioButton;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.live.R;
import java.util.List;
import java.util.Locale;
/**
* Created by cxf on 2018/10/7.

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

@@ -1,7 +1,6 @@
package com.yunbao.live.dialog;
import android.app.Dialog;
import android.graphics.Color;
import android.os.Bundle;
import android.view.Gravity;
import android.view.View;
@@ -15,7 +14,6 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.tabs.TabLayout;
import com.yunbao.common.bean.LiveGiftBean;
import com.yunbao.common.bean.PrankGiftBean;
import com.yunbao.common.bean.PrankHttpTurntableBean;
import com.yunbao.common.bean.PrankTurntableBean;
@@ -23,6 +21,7 @@ import com.yunbao.common.dialog.AbsDialogFragment;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.StringUtil;
@@ -32,6 +31,7 @@ import com.yunbao.live.adapter.LivePrankRecyclerAdapter;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
public class LivePrankDialogFragment extends AbsDialogFragment implements View.OnClickListener {
private TabLayout mTabLayout;
@@ -138,10 +138,17 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
mPrankBtn.setOnClickListener(view -> {
if ((int) view.getTag() == 1) {
if (giftBeans != null && giftBeans.size() >= 20) {
ToastUtil.show("可添加禮物數量達到上限");
if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("可添加禮物數量達到上限");
}else {
ToastUtil.show("The maximum number of gifts that can be added has been ");
}
return;
}
GiftPopDialog dialog = new GiftPopDialog(mContext, new GiftPopDialog.ActionListener() {
GiftPopDialog dialog = new GiftPopDialog(mContext, new GiftPopDialog.ActionListener() {
@Override
public void onSelectGift(PrankGiftBean bean) {
@@ -167,8 +174,14 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
private void initTab() {
TabLayout.Tab turntable = mTabLayout.newTab();
TabLayout.Tab gift = mTabLayout.newTab();
turntable.setText("轉盤整蠱");
gift.setText("禮物整蠱");
if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
turntable.setText("轉盤整蠱");
gift.setText("禮物整蠱");
}else {
turntable.setText("Turntable prank");
gift.setText("Gift prank");
}
turntable.setTag(0);
gift.setTag(1);
mTabLayout.addTab(turntable);
@@ -185,14 +198,24 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
mGiftNotDate.setVisibility(View.GONE);
recyclerAdapter.setViewType(LivePrankRecyclerAdapter.TYPE_TURNTABLE);
mPrankBtn.setBackgroundResource(R.drawable.bg_live_prank_turntable_save);
mPrankBtn.setText("保存設置");
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
mPrankBtn.setText("保存設置");
} else {
mPrankBtn.setText("Save Settings");
}
mPrankBtn.setTag(0);
recyclerAdapter.clearList();
initTurntableData();
} else {
mTurntableConfigLayout.setVisibility(View.GONE);
mPrankBtn.setBackgroundResource(R.drawable.bg_live_prank_gift_set);
mPrankBtn.setText("添加禮物");
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
mPrankBtn.setText("添加禮物");
} else {
mPrankBtn.setText("Add gift");
}
mPrankBtn.setTag(1);
recyclerAdapter.clearList();
mGiftNotDate.setVisibility(View.VISIBLE);
@@ -217,7 +240,7 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
@Override
public void onSuccess(PrankHttpTurntableBean data) {
setDate(data);
mCoinTextView.setText(data.getCoin()+"");
mCoinTextView.setText(data.getCoin() + "");
}
@Override
@@ -260,7 +283,7 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
ToastUtil.show(R.string.net_error);
}
});
}
@@ -296,8 +319,13 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
}
private void setPrankConfig() {
if(StringUtil.isEmpty(bean.getTurntable1(),bean.getTurntable2(), bean.getTurntable3(),bean.getTurntable4(),bean.getTurntable5(),bean.getTurntable6())){
ToastUtil.show("保存失败:所有转盘位置必填" );
if (StringUtil.isEmpty(bean.getTurntable1(), bean.getTurntable2(), bean.getTurntable3(), bean.getTurntable4(), bean.getTurntable5(), bean.getTurntable6())) {
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("保存失败:所有转盘位置必填");
} else {
ToastUtil.show("Save failed: all turntable positions must be filled in");
}
return;
}
LiveNetManager.get(mContext).setAnchorPrankTurntable(
@@ -313,12 +341,21 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
new HttpCallback<Object>() {
@Override
public void onSuccess(Object data) {
ToastUtil.show("保存成功");
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("保存成功");
} else {
ToastUtil.show("Save success");
}
}
@Override
public void onError(String error) {
ToastUtil.show("保存失败:" + error);
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("保存失败:" + error);
} else {
ToastUtil.show("Save failed" + error);
}
}
}
);
@@ -335,23 +372,44 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O
mTurntableConfigImageView.setImageResource(R.mipmap.special_icon_off);
}
} else if (id == R.id.switch2_btn) {
DialogUitl.showSimpleInputDialog(mContext, "請輸入數量", DialogUitl.INPUT_TYPE_NUMBER, new DialogUitl.SimpleCallback() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
try {
int coin = Integer.parseInt(content);
if (coin < 1000) {
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
DialogUitl.showSimpleInputDialog(mContext, "請輸入數量", DialogUitl.INPUT_TYPE_NUMBER, new DialogUitl.SimpleCallback() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
try {
int coin = Integer.parseInt(content);
if (coin < 1000) {
ToastUtil.show("最少1000鑽石");
return;
}
setCoin(Long.parseLong(content));
dialog.dismiss();
} catch (Exception e) {
e.printStackTrace();
ToastUtil.show("最少1000鑽石");
return;
}
setCoin(Long.parseLong(content));
dialog.dismiss();
} catch (Exception e) {
e.printStackTrace();
ToastUtil.show("最少1000鑽石");
}
}
});
});
} else {
DialogUitl.showSimpleInputDialog(mContext, "Please enter the quantity", DialogUitl.INPUT_TYPE_NUMBER, new DialogUitl.SimpleCallback() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
try {
int coin = Integer.parseInt(content);
if (coin < 1000) {
ToastUtil.show("Minimum requirement of 1000 diamonds");
return;
}
setCoin(Long.parseLong(content));
dialog.dismiss();
} catch (Exception e) {
e.printStackTrace();
ToastUtil.show("Minimum requirement of 1000 diamonds");
}
}
});
}
}
}
}

2
live/src/main/res/layout/item_anchor_call_me_gift.xml
View File

@@ -24,7 +24,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/select"
android:layout_width="92dp"
android:layout_width="110dp"
android:layout_height="28dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="16dp"

3
live/src/main/res/layout/item_live_prank_turntable_config.xml
View File

@@ -29,11 +29,12 @@
<TextView
android:id="@+id/prank_turntable_val"
android:layout_width="match_parent"
android:singleLine="true"
android:layout_height="43dp"
android:layout_marginTop="8dp"
android:background="@drawable/bg_prank_coin"
android:ems="10"
android:hint="填寫整蠱內容，最少2個字，最多10個字"
android:hint="@string/diamonds_every_time_requirement_of_hint"
android:gravity="start|center"
android:paddingStart="12dp"
android:paddingEnd="12dp"

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

@@ -7,11 +7,11 @@
<LinearLayout
android:id="@+id/turntable_layout"
android:layout_marginTop="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="visible"
android:orientation="vertical">
android:layout_marginTop="10dp"
android:orientation="vertical"
android:visibility="visible">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/turntable_config_layout"
@@ -23,17 +23,19 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="轉盤整蠱開關"
android:text="@string/prank_switch"
android:textColor="#A992FF"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/switch1_desc_text"
android:layout_width="wrap_content"
android:layout_width="330dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="關閉後所有用戶將無法看到轉盤內容"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/see_the_contents_of"
android:textColor="#B3B3B3"
android:textSize="10sp"
app:layout_constraintStart_toStartOf="parent"
@@ -57,10 +59,12 @@
<TextView
android:id="@+id/switch2_title_text"
android:layout_width="wrap_content"
android:layout_width="290dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="轉盤每次消耗鑽石"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/diamonds_every_time"
android:textColor="#A992FF"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -70,7 +74,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="最少1,000鑽石起步"
android:text="@string/diamonds_every_time_requirement_of"
android:textColor="#B3B3B3"
android:textSize="10sp"
app:layout_constraintStart_toStartOf="parent"
@@ -106,7 +110,7 @@
android:layout_width="match_parent"
android:layout_height="250dp"
android:gravity="center"
android:visibility="gone"
android:text="您目前還未設置整蠱內容"
android:textColor="#BFBFBF"
android:text="您目前還未設置整蠱內容" />
android:visibility="gone" />
</LinearLayout>

BIN
live/src/main/res/mipmap-b+en+us/btn_attention.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
live/src/main/res/mipmap-b+en+us/ic_live_float_call_me.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
live/src/main/res/mipmap-b+en+us/ic_live_user_mailbox.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 75 KiB

BIN
live/src/main/res/mipmap-b+en+us/icon_cange.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
live/src/main/res/mipmap-b+en+us/report_add.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

2
live/src/main/res/values-en/strings.xml
View File

@@ -79,7 +79,7 @@
<string name="live_anchor_edit_call_me_not_gift_toash">No gift selected</string>
<string name="live_anchor_edit_call_me_letter_title">Letter Content</string>
<string name="live_anchor_edit_call_me_letter_content">The most romantic thing I can think of is to grow old with you, to collect all the laughs along the way, and to talk about them later in a rocking chair.</string>
<string name="live_ready_anchor_call_me">Contact details</string>
<string name="live_ready_anchor_call_me">Contact</string>
<string name="live_anchor_say_title">Editors Goddess says</string>
<string name="live_anchor_say_edit_hint">Please enter the words the goddess wants to say, limited to 16 words.</string>
<string name="live_anchor_say_select_style">Select Style</string>