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-17 15:00:20 +08:00
parent 14f0de093e
commit bc549d52f6
14 changed files with 54 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/main/java/com/yunbao/common/activity/SudGameActivity.java
View File

@ -100,6 +100,7 @@ public class SudGameActivity extends AbsActivity {
gameConfigModel.ui.lobby_players.custom = true; gameConfigModel.ui.lobby_players.custom = true;
gameConfigModel.ui.join_btn.custom = true; gameConfigModel.ui.join_btn.custom = true;
gameConfigModel.ui.lobby_game_setting.hide = true; // 配置不隐藏ping值
// SudMGP平台64bit游戏ID // SudMGP平台64bit游戏ID
gameViewModel.switchGame((Activity) mContext, mLiveUid, mInteractionID); gameViewModel.switchGame((Activity) mContext, mLiveUid, mInteractionID);

3
common/src/main/java/com/yunbao/common/sud/BaseGameViewModel.java
View File

@ -104,8 +104,9 @@ public abstract class BaseGameViewModel implements SudFSMMGListener {
private void initSdk(Activity activity, long gameId, String code) { private void initSdk(Activity activity, long gameId, String code) {
String appId = getAppId(); String appId = getAppId();
String appKey = getAppKey(); String appKey = getAppKey();
boolean testEnv = isTestEnv();
// 初始化sdk // 初始化sdk
SudMGP.initSDK(activity, appId, appKey, isTestEnv(), new ISudListenerInitSDK() { SudMGP.initSDK(activity, appId, appKey,testEnv, new ISudListenerInitSDK() {
@Override @Override
public void onSuccess() { public void onSuccess() {
loadGame(activity, code, gameId); loadGame(activity, code, gameId);

6
common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java
View File

@ -21,7 +21,6 @@ import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.sud.QuickStartGameViewModel; import com.yunbao.common.sud.QuickStartGameViewModel;
import com.yunbao.common.sud.model.GameConfigModel; import com.yunbao.common.sud.model.GameConfigModel;
import com.yunbao.common.sud.model.GameViewInfoModel;
import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.common.views.weight.ViewClicksAntiShake;
@ -108,6 +107,7 @@ public class LiveSudGamePopup extends BottomPopupView {
GameConfigModel gameConfigModel = gameViewModel.getGameConfigModel(); GameConfigModel gameConfigModel = gameViewModel.getGameConfigModel();
gameConfigModel.ui.ping.hide = true; // 配置不隐藏ping值 gameConfigModel.ui.ping.hide = true; // 配置不隐藏ping值
gameConfigModel.ui.level.hide = true; // 配置不隐藏ping值 gameConfigModel.ui.level.hide = true; // 配置不隐藏ping值
gameConfigModel.ui.lobby_game_setting.hide = true; // 配置不隐藏ping值
// SudMGP平台64bit游戏ID // SudMGP平台64bit游戏ID
gameViewModel.switchGame((Activity) getContext(), mLiveUid, mInteractionID); gameViewModel.switchGame((Activity) getContext(), mLiveUid, mInteractionID);
@ -137,7 +137,7 @@ public class LiveSudGamePopup extends BottomPopupView {
} else { } else {
if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("金豆不够 "); ToastUtil.show("金豆不够 ");
}else { } else {
ToastUtil.show("Insufficient money "); ToastUtil.show("Insufficient money ");
} }
@ -148,7 +148,7 @@ public class LiveSudGamePopup extends BottomPopupView {
public void onError(String error) { public void onError(String error) {
if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("金豆不够 "); ToastUtil.show("金豆不够 ");
}else { } else {
ToastUtil.show("Insufficient money "); ToastUtil.show("Insufficient money ");
} }
} }

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

@ -41,7 +41,7 @@
<TextView <TextView
android:id="@+id/live_open_cancel" android:id="@+id/live_open_cancel"
android:layout_width="120dp" android:layout_width="120dp"
android:layout_height="40dp" android:layout_height="50dp"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:background="@drawable/backgroud_live_open_lfet" android:background="@drawable/backgroud_live_open_lfet"
android:gravity="center" android:gravity="center"
@ -49,7 +49,7 @@
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/back" android:text="@string/back"
android:textColor="#FFC621" android:textColor="#FFC621"
android:textSize="14sp" /> android:textSize="12sp" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
@ -59,7 +59,7 @@
<TextView <TextView
android:id="@+id/live_open_ok" android:id="@+id/live_open_ok"
android:layout_width="120dp" android:layout_width="120dp"
android:layout_height="40dp" android:layout_height="50dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:background="@drawable/backgroud_live_open_right" android:background="@drawable/backgroud_live_open_right"
android:gravity="center" android:gravity="center"

4
config.gradle
View File

@ -9,9 +9,9 @@ ext {
] ]
manifestPlaceholders = [ manifestPlaceholders = [
//正式、 //正式、
// serverHost : "https://napi.yaoulive.com", serverHost : "https://napi.yaoulive.com",
// 测试 // 测试
serverHost : " https://ceshi.yaoulive.com", // serverHost : " https://ceshi.yaoulive.com",

15
live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java
View File

@ -88,6 +88,12 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
private int mPosition; private int mPosition;
private boolean isBottom = false; private boolean isBottom = false;
private int fountSize = 13; private int fountSize = 13;
private String isFans;
public LiveChatAdapter setFans(String fans) {
isFans = fans;
return this;
}
public LiveChatAdapter(Context context) { public LiveChatAdapter(Context context) {
mContext = context; mContext = context;
@ -342,7 +348,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
new LoadDian9TuUtil().loadDian9TuAssets(mContext, mBg, 1); new LoadDian9TuUtil().loadDian9TuAssets(mContext, mBg, 1);
} }
String str1 = WordUtil.isNewZh() ? "火力四射，魅力無限！感謝" : "Full of firepower！Unlimited charm!"; String str1 = WordUtil.isNewZh() ? "火力四射，魅力無限！感謝" : "Full of firepower！Unlimited charm!";
String str2 = WordUtil.isNewZh() ? "為本直播間加成熱度":"Thank you for adding popularity to this live room"; String str2 = WordUtil.isNewZh() ? "為本直播間加成熱度" : "Thank you for adding popularity to this live room";
SpannableStringBuilder builder = new SpannableStringBuilder(); SpannableStringBuilder builder = new SpannableStringBuilder();
builder.append(str1); builder.append(str1);
int length = builder.length(); int length = builder.length();
@ -427,7 +433,12 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
bean.setHeart(position); bean.setHeart(position);
ImgLoader.display(mContext, bean.getId(), clipImage2); ImgLoader.display(mContext, bean.getId(), clipImage2);
attentionLayout.setVisibility(View.VISIBLE); attentionLayout.setVisibility(View.VISIBLE);
btnAttention.setVisibility(bean.isAttention() ? View.GONE : View.VISIBLE); if (TextUtils.isEmpty(isFans)) {
btnAttention.setVisibility(bean.isAttention() ? View.GONE : View.VISIBLE);
} else {
btnAttention.setVisibility(TextUtils.equals(isFans, "1") ? View.GONE : View.VISIBLE);
}
// btnAttention.setOnClickListener(new View.OnClickListener() { // btnAttention.setOnClickListener(new View.OnClickListener() {
// @Override // @Override
// public void onClick(View v) { // public void onClick(View v) {

5
live/src/main/java/com/yunbao/live/utils/LiveTextRender.java
View File

@ -43,6 +43,7 @@ import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.manager.NewLevelManager; import com.yunbao.common.manager.NewLevelManager;
import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.R; import com.yunbao.live.R;
import com.yunbao.live.bean.LiveChatBean; import com.yunbao.live.bean.LiveChatBean;
@ -92,7 +93,7 @@ public class LiveTextRender {
int userNiceNameSize = bean.getUserNiceName().length(); int userNiceNameSize = bean.getUserNiceName().length();
int giftNameIndex = -1; int giftNameIndex = -1;
int giftNameSize = -1; int giftNameSize = -1;
if (!TextUtils.isEmpty(chatMsg)&&!TextUtils.isEmpty(bean.getGiftName())&&chatMsg.contains(bean.getGiftName())) { if (!TextUtils.isEmpty(chatMsg) && !TextUtils.isEmpty(bean.getGiftName()) && chatMsg.contains(bean.getGiftName())) {
giftNameIndex = chatMsg.indexOf(bean.getGiftName()); giftNameIndex = chatMsg.indexOf(bean.getGiftName());
giftNameSize = bean.getGiftName().length(); giftNameSize = bean.getGiftName().length();
@ -795,7 +796,7 @@ public class LiveTextRender {
public SpannableStringBuilder renderGiftInfo2(String giftName) { public SpannableStringBuilder renderGiftInfo2(String giftName) {
SpannableStringBuilder builder = new SpannableStringBuilder(); SpannableStringBuilder builder = new SpannableStringBuilder();
String s1 = CommonAppContext.sInstance.getBaseContext().getString(R.string.live_send_gift_1); String s1 = WordUtil.isNewZh() ? "送" : "sent";
String content = s1 + " " + giftName; String content = s1 + " " + giftName;
int index1 = s1.length(); int index1 = s1.length();
builder.append(content); builder.append(content);

11
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -717,7 +717,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
RequestOptions options = new RequestOptions().skipMemoryCache(true);//配置 RequestOptions options = new RequestOptions().skipMemoryCache(true);//配置
Glide.with(mContext).asGif() Glide.with(mContext).asGif()
.apply(options)//应用配置 .apply(options)//应用配置
.load(WordUtil.isNewZh()?R.mipmap.drpkend:R.mipmap.drpkend_en) .load(WordUtil.isNewZh() ? R.mipmap.drpkend : R.mipmap.drpkend_en)
.listener(new RequestListener<GifDrawable>() { .listener(new RequestListener<GifDrawable>() {
@Override @Override
public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<GifDrawable> target, boolean isFirstResource) { public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<GifDrawable> target, boolean isFirstResource) {
@ -1185,6 +1185,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
LiveRoomViewHolder.follow(); LiveRoomViewHolder.follow();
mLiveChatAdapter.removetItem(bean); mLiveChatAdapter.removetItem(bean);
} else if (bean.getType() == -2) { } else if (bean.getType() == -2) {
if (!bean.isAttention()) { if (!bean.isAttention()) {
LiveRoomViewHolder.follow(); LiveRoomViewHolder.follow();
} }
@ -2732,10 +2733,16 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
if (attention == 0) { if (attention == 0) {
mBtnFollow.setVisibility(View.VISIBLE); mBtnFollow.setVisibility(View.VISIBLE);
mViewMedal.setVisibility(View.GONE); mViewMedal.setVisibility(View.GONE);
if (mLiveChatAdapter != null) {
mLiveChatAdapter.setFans("0");
}
} else { } else {
if (mBtnFollow.getVisibility() == View.VISIBLE) { if (mBtnFollow.getVisibility() == View.VISIBLE) {
mBtnFollow.setVisibility(View.GONE); mBtnFollow.setVisibility(View.GONE);
mViewMedal.setVisibility(View.VISIBLE); mViewMedal.setVisibility(View.VISIBLE);
if (mLiveChatAdapter != null) {
mLiveChatAdapter.setFans("1");
}
} }
} }
} }
@ -3193,6 +3200,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
* 关注主播 * 关注主播
*/ */
public static void follow() { public static void follow() {
EventBus.getDefault().post("stop_svga_new_user_follow"); EventBus.getDefault().post("stop_svga_new_user_follow");
LiveHttpUtil.setFrontTask("attent", new HttpCallback() { LiveHttpUtil.setFrontTask("attent", new HttpCallback() {
@ -4036,6 +4044,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
public void setFansGroup(String isFans) { public void setFansGroup(String isFans) {
this.isFans = isFans.equals("1"); this.isFans = isFans.equals("1");
} }

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

@ -206,12 +206,13 @@
<TextView <TextView
android:id="@+id/automatic_chat" android:id="@+id/automatic_chat"
android:layout_weight="0.5"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginTop="3dp" android:layout_marginTop="3dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="3dp" android:layout_marginBottom="3dp"
android:layout_weight="0.5"
android:clickable="false" android:clickable="false"
android:enabled="false" android:enabled="false"
android:gravity="start" android:gravity="start"
@ -220,13 +221,12 @@
android:textSize="12sp" /> android:textSize="12sp" />
<ImageView <ImageView
android:layout_weight="0"
android:id="@+id/btn_attention" android:id="@+id/btn_attention"
android:layout_width="54dp" android:layout_width="54dp"
android:layout_height="26dp" android:layout_height="26dp"
android:layout_gravity="end|center_vertical" android:layout_gravity="end|center_vertical"
android:layout_marginStart="10dp"
android:layout_marginEnd="11dp" android:layout_marginEnd="11dp"
android:layout_weight="0"
android:clickable="false" android:clickable="false"
android:src="@mipmap/btn_attention" /> android:src="@mipmap/btn_attention" />

8
live/src/main/res/layout/view_hight_nobility.xml
View File

@ -19,15 +19,19 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="14dp" android:layout_marginTop="14dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/site_wide_news_hint1" android:text="@string/site_wide_news_hint1"
android:textColor="#FFAAAAAA" android:textColor="#FFAAAAAA"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/site_wide_news_hint2" android:text="@string/site_wide_news_hint2"
android:textColor="#FFAAAAAA" android:textColor="#FFAAAAAA"
android:textSize="14sp" /> android:textSize="14sp" />
@ -37,8 +41,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="22dp" android:layout_marginTop="22dp"
android:layout_marginBottom="15dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_marginBottom="15dp"
android:gravity="center_horizontal"> android:gravity="center_horizontal">
<TextView <TextView

4
main/src/main/java/com/yunbao/main/activity/BindUserActivity.java
View File

@ -273,9 +273,9 @@ public class BindUserActivity extends AbsActivity {
} else if (i == R.id.btn_register) { } else if (i == R.id.btn_register) {
register(); register();
} else if (i == R.id.btn_tip2) { } else if (i == R.id.btn_tip2) {
WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY1,false); WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY1+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"),false);
} else if (i == R.id.btn_tip3) { } else if (i == R.id.btn_tip3) {
WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY2,false); WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY2+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"),false);
} else if (i == R.id.btn_goto_updata) { } else if (i == R.id.btn_goto_updata) {
lt_now_bind.setVisibility(View.GONE); lt_now_bind.setVisibility(View.GONE);
lt_first_bind.setVisibility(View.VISIBLE); lt_first_bind.setVisibility(View.VISIBLE);

4
main/src/main/java/com/yunbao/main/activity/EntryActivity.java
View File

@ -209,14 +209,14 @@ public class EntryActivity extends AppCompatActivity {
btn_tip1.setOnClickListener(new View.OnClickListener() { btn_tip1.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
WebViewActivity.forward(EntryActivity.this, HtmlConfig.LOGIN_PRIVCAY,false); WebViewActivity.forward(EntryActivity.this, HtmlConfig.LOGIN_PRIVCAY+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"),false);
} }
}); });
btn_tip.setOnClickListener(new View.OnClickListener() { btn_tip.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
WebViewActivity.forward(EntryActivity.this, HtmlConfig.LOGIN_PRIVCAY1,false); WebViewActivity.forward(EntryActivity.this, HtmlConfig.LOGIN_PRIVCAY1+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"),false);
} }
}); });

3
main/src/main/java/com/yunbao/main/activity/LoginActivity.java
View File

@ -50,6 +50,7 @@ import com.yunbao.common.manager.NoviceInstructorManager;
import com.yunbao.common.manager.imrongcloud.RongcloudIMManager; import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.common.http.LiveHttpUtil; import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.utils.LiveRoomCheckLivePresenter; import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
@ -239,7 +240,7 @@ public class LoginActivity extends AbsActivity {
//登录即代表同意服务和隐私条款 //登录即代表同意服务和隐私条款
private void forwardTip() { private void forwardTip() {
WebViewActivity.forward(mContext, HtmlConfig.LOGIN_PRIVCAY,false); WebViewActivity.forward(mContext, HtmlConfig.LOGIN_PRIVCAY+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"),false);
} }

4
main/src/main/java/com/yunbao/main/activity/RegisterActivity.java
View File

@ -282,9 +282,9 @@ public class RegisterActivity extends AbsActivity {
} else if (i == R.id.btn_register) { } else if (i == R.id.btn_register) {
register(); register();
} else if (i == R.id.btn_tip2) { } else if (i == R.id.btn_tip2) {
WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY1,false); WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY1+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"),false);
} else if (i == R.id.btn_tip3) { } else if (i == R.id.btn_tip3) {
WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY2,false); WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY2+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"),false);
} }
} }