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-13 14:09:34 +08:00
parent c5d537fb4d
commit 52e199b901
22 changed files with 54 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/main/res/layout/dialog_home_create_sud_game.xml
View File

@ -61,6 +61,7 @@
android:background="@drawable/bg_live_sud_list_input_home"
android:hint="@string/interactive_game_create_room_name_input"
android:paddingStart="12dp"
android:singleLine="true"
android:paddingTop="9dp"
android:paddingBottom="9dp"
android:textColor="#E6000000"

4
config.gradle
View File

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

3
live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
View File

@ -1124,8 +1124,7 @@ public class LiveAudienceActivity extends LiveActivity {
break;
case GUARD:
if (event.getObject() == null) {
openNewGuardListWindow(mContext instanceof LiveRyAnchorActivity);
} else {
openNewGuardListWindow(mContext instanceof LiveRyAnchorActivity); } else {
openNewBuyGuardWindow(true);
}
break;

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

@ -28,7 +28,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
@ -40,7 +39,6 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.makeramen.roundedimageview.RoundedImageView;
import com.umeng.analytics.MobclickAgent;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.Constants;
import com.yunbao.common.bean.IMLoginModel;
@ -286,7 +284,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
//点击打开活动
tv_chat_active_into.setOnClickListener(v -> {
String url = CommonAppConfig.HOST + "/" + bean.getContent() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + LiveRoomViewHolder.mLiveUid+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
String url = CommonAppConfig.HOST + "/" + bean.getContent() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + LiveRoomViewHolder.mLiveUid + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
Bundle bundle = new Bundle();
bundle.putString("url", url);
LiveHDDialogFragment fragment = new LiveHDDialogFragment();
@ -304,8 +302,8 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
}
SpannableStringBuilder builder = new SpannableStringBuilder();
if (bean.getType() == -3) {
String str1 = "整蠱來了！ ";
String str2 = "向 ";
String str1 = WordUtil.isNewZh() ? "整蠱來了！ " : "Pranks are coming";
String str2 = WordUtil.isNewZh() ? "向 " : "too";
builder.append(str1);
int length = builder.length();
builder.append(bean.getUserNiceName());
@ -314,11 +312,11 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
int length2 = builder.length();
builder.append(bean.getAnchorName());
builder.setSpan(new ForegroundColorSpan(0xFF73FFFF), length2, length2 + bean.getAnchorName().length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
builder.append("發出了 " + bean.getContent());
builder.append(WordUtil.isNewZh() ? "發出了 " : "Sent out " + bean.getContent());
mTextView.setText(builder);
} else if (bean.getType() == -4) {
String str1 = "成功拯救了 ";
String str2 = "免除了 ";
String str1 = WordUtil.isNewZh() ? "成功拯救了 " : "Succeeded in saving";
String str2 = WordUtil.isNewZh() ? "免除了 " : "Exempt from";
int length = builder.length();
builder.append(bean.getMedal());
builder.setSpan(new ForegroundColorSpan(0xFF73FFFF), length, length + bean.getMedal().length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
@ -326,7 +324,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
int length2 = builder.length();
builder.append(bean.getAnchorName());
builder.setSpan(new ForegroundColorSpan(0xFF73FFFF), length2, length2 + bean.getAnchorName().length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
builder.append(str2 + bean.getUserNiceName() + "發起的" + bean.getContent());
builder.append(str2 + bean.getUserNiceName() + (WordUtil.isNewZh() ? "發出了 " : "Sent out ") + bean.getContent());
mTextView.setText(builder);
} else if (bean.getType() == -5) {
mBg.setBackground(null);
@ -343,8 +341,8 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
// mBg.setBackgroundResource(R.drawable.bg_live_chat_item);
new LoadDian9TuUtil().loadDian9TuAssets(mContext, mBg, 1);
}
String str1 = "火力四射，魅力無限！感謝";
String str2 = "為本直播間加成熱度";
String str1 = WordUtil.isNewZh() ? "火力四射，魅力無限！感謝" : "Full of firepower！Unlimited charm!";
String str2 = WordUtil.isNewZh() ? "為本直播間加成熱度":"Thank you for adding popularity to this live room";
SpannableStringBuilder builder = new SpannableStringBuilder();
builder.append(str1);
int length = builder.length();
@ -363,8 +361,8 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
// mBg.setBackgroundResource(R.drawable.bg_live_chat_item);
new LoadDian9TuUtil().loadDian9TuAssets(mContext, mBg, 1);
}
String str1 = "甜蜜不停，愛意不斷！恭喜";
String str2 = "在甜蜜約會中搶購到了";
String str1 = WordUtil.isNewZh() ? "甜蜜不停，愛意不斷！恭喜" : "Sweetness never stops, love never stops!";
String str2 = WordUtil.isNewZh() ? "在甜蜜約會中搶購到了" : "who is on a sweet date for grabbing ";
String str3 = "!";
SpannableStringBuilder builder = new SpannableStringBuilder();
builder.append(str1);
@ -395,11 +393,11 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
new LoadDian9TuUtil().loadDian9TuAssets(mContext, mBg, 1);
mTextView.setText(bean.getContent());
}
} else if (bean.getType() == LiveChatBean.SYSTEM2 ) {
} else if (bean.getType() == LiveChatBean.SYSTEM2) {
mTextView.setTextColor(Color.parseColor("#ffffff"));
new LoadDian9TuUtil().loadDian9TuAssets(mContext, mBg, 1);
mTextView.setText(bean.getContent());
}else if(bean.getType()==TYPE_TO_USER_MSG){
} else if (bean.getType() == TYPE_TO_USER_MSG) {
mTextView.setText(Html.fromHtml("<font color='#FBEABF'>@" + bean.getUserNiceName() + "</font> &nbsp;" + bean.getContent()));
new LoadDian9TuUtil().loadDian9TuAssets(mContext, mBg, 1);
}
@ -537,8 +535,8 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
if (bean == null) {
return;
}
if(bean.getType()==LiveChatBean.TYPE_TO_USER_MSG
&&!CommonAppConfig.getInstance().getUid().equals(bean.getAtUserID())){
if (bean.getType() == LiveChatBean.TYPE_TO_USER_MSG
&& !CommonAppConfig.getInstance().getUid().equals(bean.getAtUserID())) {
return;
}
// Log.i(TAG, "insertItem: " + bean.getContent()+" size = "+(mList.size()+1));

6
live/src/main/java/com/yunbao/live/dialog/LiveNewGuardBuyDialogFragment.java
View File

@ -145,7 +145,6 @@ public class LiveNewGuardBuyDialogFragment extends AbsDialogFragment implements
mBack = mRootView.findViewById(R.id.guard_back);
relativeLayout = mRootView.findViewById(R.id.guard_relativeLayout);
//iconCover.setImageResource(R.drawable.guardian_img_wings);
mBtnBuy.setOnClickListener(this);
submit.setOnClickListener(this);
@ -226,7 +225,7 @@ public class LiveNewGuardBuyDialogFragment extends AbsDialogFragment implements
int guardType = mLiveGuardInfo.getMyGuardType();
if (guardType == Constants.GUARD_TYPE_NONE) {
if (isEmpty) {
iconCover.setImageResource(R.drawable.guardian_img_wings);
iconCover.setImageResource(R.mipmap.guardian_img_wings);
userIconOne.setVisibility(View.GONE);
userIconTwo.setVisibility(View.GONE);
} else {
@ -237,9 +236,6 @@ public class LiveNewGuardBuyDialogFragment extends AbsDialogFragment implements
userIconTwo.setVisibility(View.VISIBLE);
}
// iconCover.setBackgroundResource(R.drawable.guardian_img_wings);
buy1.setVisibility(View.VISIBLE);
buy2.setVisibility(View.GONE);
} else {

2
live/src/main/java/com/yunbao/live/dialog/LiveNewGuardListDialogFragment.java
View File

@ -189,7 +189,7 @@ public class LiveNewGuardListDialogFragment extends AbsDialogFragment implements
userLayout.setVisibility(View.INVISIBLE);
}else {
GuardUserBean bean = list.get(0);
giftSvga.setImageResource(R.drawable.guardian_img_wings_p);
giftSvga.setImageResource(R.mipmap.guardian_img_wings_p);
ImgLoader.display(mContext, bean.getAvatar(), guardIcon);
guardIcon.setVisibility(View.VISIBLE);
userName.setText(bean.getUserNiceName());

10
live/src/main/java/com/yunbao/live/socket/SocketChatUtil.java
View File

@ -11,8 +11,8 @@ import com.yunbao.common.CommonAppContext;
import com.yunbao.common.Constants;
import com.yunbao.common.bean.UserBean;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.live.R;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.live.R;
/**
* Created by cxf on 2018/10/9.
@ -321,7 +321,7 @@ public class SocketChatUtil {
.param("uid", u.getId())
.param("touid", toUid)
.param("toname", toName)
.param("ct", toName +CommonAppContext.sInstance.getBaseContext().getString(R.string.live_kicked));
.param("ct", toName + CommonAppContext.sInstance.getBaseContext().getString(R.string.live_kicked));
msg.create();
V2TIMManager.getInstance().sendGroupTextMessage(msg.mResult.toString(), "g" + mLiveUid, V2TIMMessage.V2TIM_PRIORITY_NORMAL, new V2TIMSendCallback<V2TIMMessage>() {
@Override
@ -364,7 +364,7 @@ public class SocketChatUtil {
.param("uid", u.getId())
.param("touid", toUid)
.param("toname", toName)
.param("ct", toName +CommonAppContext.sInstance.getBaseContext().getString(type == 0 ? R.string.live_shut : R.string.live_shut_2));
.param("ct", toName + (type == 0 ? "被永久禁言(Forbidden forever)" : "被本場禁言(Forbidden by this scene)"));
msg.create();
V2TIMManager.getInstance().sendGroupTextMessage(msg.mResult.toString(), "g" + mLiveUid, V2TIMMessage.V2TIM_PRIORITY_NORMAL, new V2TIMSendCallback<V2TIMMessage>() {
@Override
@ -396,7 +396,7 @@ public class SocketChatUtil {
if (u == null) {
return;
}
String s = action == 1 ?CommonAppContext.sInstance.getBaseContext().getString(R.string.live_set_admin) :CommonAppContext.sInstance.getBaseContext().getString(R.string.live_set_admin_cancel);
String s = action == 1 ? CommonAppContext.sInstance.getBaseContext().getString(R.string.live_set_admin) : CommonAppContext.sInstance.getBaseContext().getString(R.string.live_set_admin_cancel);
final SocketSendBean msg = new SocketSendBean()
.param("_method_", Constants.SOCKET_SET_ADMIN)
.param("action", action)
@ -644,7 +644,7 @@ public class SocketChatUtil {
.param("msgtype", 0)
.param("uid", u.getId())
.param("uname", u.getUserNiceName())
.param("ct",CommonAppContext.sInstance.getBaseContext().getString(R.string.red_pack_22)
.param("ct", CommonAppContext.sInstance.getBaseContext().getString(R.string.red_pack_22)
);
msg.create();
V2TIMManager.getInstance().sendGroupTextMessage(msg.mResult.toString(), "g" + mLiveUid, V2TIMMessage.V2TIM_PRIORITY_NORMAL, new V2TIMSendCallback<V2TIMMessage>() {

21
live/src/main/java/com/yunbao/live/socket/SocketRyChatUtil.java
View File

@ -9,11 +9,11 @@ import com.yunbao.common.Constants;
import com.yunbao.common.bean.IMLoginModel;
import com.yunbao.common.bean.UserBean;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.R;
import com.yunbao.common.http.LiveHttpUtil;
import org.greenrobot.eventbus.EventBus;
@ -134,7 +134,7 @@ public class SocketRyChatUtil {
public void onError(Message message, RongIMClient.ErrorCode errorCode) {
Log.e("tx", "aaa" + errorCode.toString());
if (errorCode.code == 23408) {
ToastUtil.show(WordUtil.isNewZh()?"您已被禁言":"You have been banned");
ToastUtil.show(WordUtil.isNewZh() ? "您已被禁言" : "You have been banned");
} else {
ToastUtil.show(errorCode.code + ":" + errorCode.msg);
}
@ -216,9 +216,10 @@ public class SocketRyChatUtil {
* 发送弹幕消息
*/
public static void sendDanmuMessage(String mLiveUid, String danmuToken) {
sendDanmuMessage(mLiveUid,danmuToken,0);
sendDanmuMessage(mLiveUid, danmuToken, 0);
}
public static void sendDanmuMessage(String mLiveUid, String danmuToken,int fansLevel) {
public static void sendDanmuMessage(String mLiveUid, String danmuToken, int fansLevel) {
UserBean u = CommonAppConfig.getInstance().getUserBean();
if (u == null) {
return;
@ -231,7 +232,7 @@ public class SocketRyChatUtil {
.param("uname", u.getUserNiceName())
.param("uid", u.getId())
.param("uhead", u.getAvatar())
.param("fansLevel",fansLevel)
.param("fansLevel", fansLevel)
.param("ct", danmuToken);
msg.create();
String targetId = "g" + mLiveUid;
@ -257,7 +258,7 @@ public class SocketRyChatUtil {
public void onError(Message message, RongIMClient.ErrorCode errorCode) {
Log.e("tx", "aaa" + errorCode.toString());
if (errorCode.code == 23408) {
ToastUtil.show(WordUtil.isNewZh()?"您已被禁言":"You have been banned");
ToastUtil.show(WordUtil.isNewZh() ? "您已被禁言" : "You have been banned");
} else {
ToastUtil.show(errorCode.code + ":" + errorCode.msg);
}
@ -369,7 +370,7 @@ public class SocketRyChatUtil {
.param("uid", u.getId())
.param("touid", toUid)
.param("toname", toName)
.param("ct", toName + CommonAppContext.sInstance.getBaseContext().getString(R.string.live_kicked));
.param("ct", toName + "被踢出房間(Kicked out of the room)");
msg.create();
String targetId = "g" + mLiveUid;
Conversation.ConversationType conversationType = Conversation.ConversationType.CHATROOM;
@ -419,13 +420,13 @@ public class SocketRyChatUtil {
String ct = "";
switch (type) {
case 0:
ct = CommonAppContext.sInstance.getBaseContext().getString(R.string.live_shut);
ct = "被永久禁言(Forbidden forever)";
break;
case 1:
ct = CommonAppContext.sInstance.getBaseContext().getString(R.string.live_shut_2);
ct = "被本場禁言(Forbidden by this scene)";
break;
case 2:
ct = String.format(CommonAppContext.sInstance.getBaseContext().getString(R.string.live_shut_3), time + "");
ct = String.format("被禁言%s分鐘", time + "") + "(" + String.format("Forbidden by %s min", time + "") + ")";
break;
}

4
live/src/main/java/com/yunbao/live/socket/SocketRyClient.java
View File

@ -399,7 +399,7 @@ public class SocketRyClient {
.setBoxTypeName(map.getString("box_type_name"))
.setDressName(map.getString("dress_name"))
.setGiftNotification(map.getString("gift_notification"))
.setGiftName(map.getString("giftname"))
.setGiftName(WordUtil.isNewZh()?map.getString("giftname"):map.getString("giftname_en"))
.setUserNiceName(map.getString("uname"))
.setGiftIcon(map.getString("gifticon"))
.setAnchorName(map.getString("ancherName"))
@ -413,7 +413,7 @@ public class SocketRyClient {
AllServerNotifyEvent allServerNotifyEvent
= new AllServerNotifyEvent()
.setUserNiceName(mCt.getString("user_nicename"))
.setGiftName(mCt.getString("giftname"))
.setGiftName(WordUtil.isNewZh()?map.getString("giftname"):map.getString("giftname_en"))
.setGiftIcon(mCt.getString("gifticon"))
.setRedPacket(true);
Bus.get().post(new LiveAudienceEvent()

14
live/src/main/java/com/yunbao/live/views/LiveGiftFragment.java
View File

@ -1,5 +1,7 @@
package com.yunbao.live.views;
import static com.yunbao.live.views.LiveRoomViewHolder.bean1;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
@ -17,13 +19,9 @@ import com.alibaba.fastjson.JSON;
import com.umeng.analytics.MobclickAgent;
import com.yunbao.common.bean.LiveGiftBean;
import com.yunbao.common.fragment.BaseFragment;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.live.R;
import com.yunbao.live.adapter.LiveGiftFragmentPagerAdapter;
import com.yunbao.live.event.LiveGiftItemRefreshEvent;
import com.yunbao.live.event.LiveParcelItemRefreshEvent;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList;
import java.util.List;
@ -56,6 +54,12 @@ public class LiveGiftFragment extends BaseFragment {
wishGiftId = bundle.getString("wishGiftId");
mLiveUid = bundle.getString("mLiveUid");
type = bundle.getString("type");
// if (bean1 != null && IMLoginManager.get(getContext()).isNewUserGif() && (TextUtils.equals(type, "熱門") || TextUtils.equals(type, "Hot"))) {
// giftJson.add(0, bean1);
// if (wishGiftId == null) {
// wishGiftId = "" + bean1.getId();
// }
// }
pageCount = giftJson.size() / GIFT_COUNT;
if (giftJson.size() % GIFT_COUNT > 0) {
pageCount++;

BIN
live/src/main/res/drawable/guardian_img_wings.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 165 KiB

BIN
live/src/main/res/drawable/img_guardian_online.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 13 KiB

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

@ -271,7 +271,7 @@
android:layout_marginStart="136dp"
android:layout_marginTop="30dp"
android:scaleType="centerCrop"
android:src="@drawable/guardian_img_wings"
android:src="@mipmap/guardian_img_wings"
android:visibility="invisible"
app:riv_oval="true" />
@ -284,7 +284,7 @@
android:layout_marginTop="25dp"
android:layout_toEndOf="@+id/guard_imageView"
android:scaleType="centerCrop"
android:src="@drawable/guardian_img_wings"
android:src="@mipmap/guardian_img_wings"
android:visibility="invisible"
app:riv_oval="true" />
@ -296,7 +296,7 @@
android:layout_toStartOf="@id/guard_imageView_two"
android:scaleType="centerCrop"
android:src="@drawable/guardian_img_wings"
android:src="@mipmap/guardian_img_wings"
android:visibility="invisible"
app:riv_oval="true" />

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

@ -195,7 +195,7 @@
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:scaleType="centerCrop"
android:src="@drawable/guardian_img_wings"
android:src="@mipmap/guardian_img_wings"
android:visibility="visible"
app:riv_oval="true" />
@ -204,7 +204,7 @@
android:id="@+id/gift_svga"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/guardian_img_wings"
android:src="@mipmap/guardian_img_wings"
android:visibility="visible"
app:autoPlay="true" />

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

@ -137,7 +137,7 @@
android:id="@+id/gift_svga"
android:layout_width="34dp"
android:layout_height="34dp"
android:src="@drawable/img_guardian_online"
android:src="@mipmap/img_guardian_online"
android:visibility="gone"
app:autoPlay="true" />

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 132 KiB

BIN
live/src/main/res/drawable/guardian_img_wings_p.png → live/src/main/res/mipmap-b+en+us/guardian_img_wings_p.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 144 KiB

After

Width:  |  Height:  |  Size: 144 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
live/src/main/res/mipmap-xxxhdpi/guardian_img_wings.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 69 KiB

BIN
live/src/main/res/mipmap-xxxhdpi/guardian_img_wings_p.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 61 KiB

BIN
live/src/main/res/mipmap-xxxhdpi/img_guardian_online.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB