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

修复测试反馈问题

Browse Source 
调整小助手、机器人图标
调整PD一号的IM消息
调整PD一号的红包UI
调整翻译
This commit is contained in:
zlzw
2024-05-05 16:13:28 +08:00
parent 8e2acc3417
commit 2093306d36
27 changed files with 190 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
View File

@@ -1712,6 +1712,15 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
liveInputDialogFragment.setArguments(liveInputBundle);
liveInputDialogFragment.show(getSupportFragmentManager(), "LiveInputDialogFragment");
break;
case LIVE_DIALOG_ANCHOR_TIPS:
new DialogUitl.Builder(mContext)
.setContent(event.getObject().toString())
.setConfirmString(WordUtil.isNewZh() ? "確定" : "confirm")
.setCancelable(true)
.setShowCancelButton(false)
.build()
.show();
break;
}
}
@@ -1850,6 +1859,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
.setIcon("https://downs.yaoulive.com/xzs_tab.png")
.setNameColor("#f19ec2")
.setSystemBubble("https://downs.yaoulive.com/xzs_qipao.9.png")
.setIconEn("https://downs.yaoulive.com/Robot_en.png")
.setUserName("")
.setContent(content);
SocketSendBean msg =

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

@@ -465,7 +465,7 @@ public class SudGameActivity extends AbsActivity implements GameMicManager.Meeti
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("貨幣数量不足 ");
} else {
ToastUtil.show("Shortage of money");
ToastUtil.show("Insufficient number of currency");
}
}
@@ -478,7 +478,7 @@ public class SudGameActivity extends AbsActivity implements GameMicManager.Meeti
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("貨幣数量不足 ");
} else {
ToastUtil.show("Shortage of money");
ToastUtil.show("Insufficient number of currency");
}
}

13
live/src/main/java/com/yunbao/live/bean/LiveChatBean.java
View File

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.google.gson.annotations.SerializedName;
import com.yunbao.common.bean.AiAutomaticSpeechModel;
import com.yunbao.common.bean.MsgModel;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.WordUtil;
/**
@@ -28,7 +29,7 @@ public class LiveChatBean {
public static final int XYD_COMPLETE = 207;//心愿单完成通知
public static final int WISH_LIST_PROGRESS = 307;//心愿单进度通知
public static final int BLIND_BOX = 409;//盲盒礼物消息
public static final int TYPE_TO_USER_MSG=500;//指定信息
public static final int TYPE_TO_USER_MSG = 500;//指定信息
private String id;
@@ -47,6 +48,7 @@ public class LiveChatBean {
private String bubble;//气泡
private String medal;//勋章
private String medal_new;
private String medal_new_en;
private String medal_honor;//荣誉勋章
private String hot_num;
private String good_nub;
@@ -63,7 +65,7 @@ public class LiveChatBean {
}
public String getGiftName() {
return WordUtil.isNewZh()?giftName:giftname_en;
return WordUtil.isNewZh() ? giftName : giftname_en;
}
public LiveChatBean setGiftName(String giftName) {
@@ -215,6 +217,9 @@ public class LiveChatBean {
}
public String getMedal_new() {
if (!WordUtil.isNewZh() && !StringUtil.isEmpty(medal_new_en)) {
return medal_new_en;
}
return medal_new;
}
@@ -222,6 +227,10 @@ public class LiveChatBean {
this.medal_new = medal_new;
}
public void setMedal_new_en(String medal_new_en) {
this.medal_new_en = medal_new_en;
}
public String getPrankIcon() {
return prankIcon;
}

7
live/src/main/java/com/yunbao/live/dialog/ReceiveRendPacketPopup.java
View File

@@ -4,6 +4,7 @@ import android.content.Context;
import android.os.Handler;
import android.text.TextUtils;
import android.util.TypedValue;
import android.view.View;
import android.widget.Button;
import android.widget.FrameLayout;
import android.widget.ImageView;
@@ -97,6 +98,12 @@ public class ReceiveRendPacketPopup extends CenterPopupView {
.getString(R.string.together_to_achieve_goal),
redPacketInfoModel.getUserNicename()));
}
if(redPacketInfoModel.getRedPacketType()==2){
((ImageView)findViewById(R.id.value_icon)).setImageResource(R.mipmap.gold_coin);
redPacketValue.setText(redPacketInfoModel.getRedPacketMoney());
findViewById(R.id.red_packet_list).setVisibility(View.INVISIBLE);
findViewById(R.id.tips).setVisibility(View.INVISIBLE);
}
userID = redPacketInfoModel.getUserId();

3
live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java
View File

@@ -489,7 +489,8 @@ public class LiveAudienceEvent extends BaseModel {
UPDATE_FANS_TASK_STATUS(74, "更新粉丝任务状态"),
SUD_GAME_CREATE_ROOM(75, "主播创建sud游戏"),
PK_RANK_START(76, "PK排位赛开始"),
GuardSpecialEffect(77, "PK排位赛开始");
GuardSpecialEffect(77, "PK排位赛开始"),
LIVE_DIALOG_ANCHOR_TIPS(78, "主播公会赛tips");
private int type;
private String name;

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

@@ -99,6 +99,7 @@ public class SocketRyChatUtil {
.param("medal_honor", u.getMedal_no_display_src())
.param("medal", u.getDress().getMedal())
.param("medal_new", u.getDress().getMedal_new())
.param("medal_new_en", u.getDress().getMedal_new_en())
.param("uid", u.getId())
.param("liangname", u.getGoodName())
.param("vip_type", u.getVip().getType())
@@ -180,6 +181,7 @@ public class SocketRyChatUtil {
.param("bubble", u.getDress().getBubble())
.param("medal", u.getDress().getMedal())
.param("medal_new", u.getDress().getMedal_new())
.param("medal_new_en", u.getDress().getMedal_new_en())
.param("guard_type", IMLoginManager.get(CommonAppContext.sInstance.getApplicationContext()).getGuardType())
.param("medal_name", u.getMedalName())
.param("medal_level", u.getMedalLevel())
@@ -308,6 +310,7 @@ public class SocketRyChatUtil {
.param("bubble", u.getDress().getBubble())
.param("medal", u.getDress().getMedal())
.param("medal_new", u.getDress().getMedal_new())
.param("medal_new_en", u.getDress().getMedal_new_en())
.param("medal_name", u.getMedalName())
.param("medal_level", u.getMedalLevel())
.param("guard_type", guard_type + "")
@@ -347,6 +350,7 @@ public class SocketRyChatUtil {
.param("bubble", u.getDress().getBubble())
.param("medal", u.getDress().getMedal())
.param("medal_new", u.getDress().getMedal_new())
.param("medal_new_en", u.getDress().getMedal_new_en())
.param("ct", giftToken)
.param("ancherName", ancherName)
.param("medal_name", u.getMedalName())
@@ -712,6 +716,7 @@ public class SocketRyChatUtil {
.param("bubble", u.getDress().getBubble())
.param("medal", u.getDress().getMedal())
.param("medal_new", u.getDress().getMedal_new())
.param("medal_new_en", u.getDress().getMedal_new_en())
.param("uname", u.getUserNiceName())
.param("uhead", u.getAvatar())
.param("votestotal", votes)
@@ -742,6 +747,7 @@ public class SocketRyChatUtil {
.param("bubble", u.getDress().getBubble())
.param("medal", u.getDress().getMedal())
.param("medal_new", u.getDress().getMedal_new())
.param("medal_new_en", u.getDress().getMedal_new_en())
.param("guard_type", IMLoginManager.get(CommonAppContext.sInstance.getApplicationContext()).getGuardType());
msg.create();

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

@@ -390,7 +390,7 @@ public class SocketRyClient {
receiveGiftBean.setSendtype(map.getIntValue("action"));
receiveGiftBean.setAllServerNotify(true);
mListener.onSys(receiveGiftBean);
} else if (action2 == 61) {//赠送礼物
} else if (action2 == 61) {//赠送礼物 超级头条
sendGiftByNotify(map);
} else if (action2 == 62) {//购买守护
// buyGuardByNotify(map);
@@ -403,7 +403,7 @@ public class SocketRyClient {
buyZuoJiByNotify(map);
} else if (action2 == 66) {//购买贵族
buyVipByNotify(map);
} else if (action2 == 88) {
} else if (action2 == 88) {//盲盒
JSONObject mCt = map.getJSONObject("ct");
String boxType = map.getString("box_type");
String boxTypeName = "";
@@ -446,7 +446,7 @@ public class SocketRyClient {
NewAllServerNotifyGuardEvent notifyGuardEvent = GsonUtils.fromJson(map.toString(), NewAllServerNotifyGuardEvent.class);
Bus.get().post(notifyGuardEvent);
buyGuardInSameRoom(map);
} else if (action2 == 91) {
} else if (action2 == 91) {//通用模板
AllServerNotifyFFGGGDJANEvent notifyFFGGGDJANEvent = GsonUtils.fromJson(map.toString(), AllServerNotifyFFGGGDJANEvent.class);
Bus.get().post(notifyFFGGGDJANEvent);
}
@@ -824,12 +824,9 @@ public class SocketRyClient {
case Constants.SOCKET_LIVE_ANCHOR_PK_DIALOG:
item = map.getJSONObject("ct");
//DialogUitl.showSimpleDialog(mContext,WordUtil.isNewZh()?item.getString("text"):item.getString("text_en"),null);
new DialogUitl.Builder(mContext)
.setContent(WordUtil.isNewZh() ? item.getString("text") : item.getString("text_en"))
.setConfirmString(WordUtil.isNewZh() ? "確定" : "confirm")
.setCancelString(null)
.build()
.show();
Bus.get().post(new LiveAudienceEvent()
.setType(LiveAudienceEvent.LiveAudienceType.LIVE_DIALOG_ANCHOR_TIPS)
.setObject(WordUtil.isNewZh() ? item.getString("text") : item.getString("text_en")));
break;
}
@@ -993,6 +990,7 @@ public class SocketRyClient {
chatBean.setBubble(map.getString("bubble"));
chatBean.setMedal(map.getString("medal"));
chatBean.setMedal_new(map.getString("medal_new"));
chatBean.setMedal_new_en(map.getString("medal_new_en"));
chatBean.setVipType(map.getIntValue("vip_type"));
chatBean.setVipType(map.getIntValue("vip_type"));
chatBean.setMedal_honor(map.getString("medal_honor"));
@@ -1050,6 +1048,7 @@ public class SocketRyClient {
chatBean.setBubble(obj.getString("bubble"));
chatBean.setMedal(obj.getString("medal"));
chatBean.setMedal_new(obj.getString("medal_new"));
chatBean.setMedal_new_en(map.getString("medal_new_en"));
chatBean.setHot_num(obj.getString("hot_num"));
UserBean.DressBean dressBean = new UserBean.DressBean();
dressBean.setAvatar_frame(obj.getString("avatar_frame"));
@@ -1165,6 +1164,7 @@ public class SocketRyClient {
chatBean.setBubble(map.getString("bubble"));
chatBean.setMedal(map.getString("medal"));
chatBean.setMedal_new(map.getString("medal_new"));
chatBean.setMedal_new_en(map.getString("medal_new_en"));
chatBean.setGood_nub(map.getString("good_num"));
chatBean.setType(LiveChatBean.GIFT);
if (map.get("guard_type") != null && !"".equals(map.get("guard_type")) && !"null".equals(map.get("guard_type"))) {
@@ -1212,16 +1212,26 @@ public class SocketRyClient {
chatBean.setBubble(map.getString("bubble"));
chatBean.setMedal(map.getString("medal"));
chatBean.setMedal_new(map.getString("medal_new"));
chatBean.setMedal_new_en(map.getString("medal_new_en"));
chatBean.setGood_nub(map.getString("good_num"));
chatBean.setType(LiveChatBean.GIFT);
if (map.get("guard_type") != null && !"".equals(map.get("guard_type")) && !"null".equals(map.get("guard_type"))) {
chatBean.setGuardType(map.getInteger("guard_type"));
}
if (WordUtil.isNewZh()) {
chatBean.setContent(mContext.getString(R.string.live_send_gift_1) + receiveGiftBean.getGiftCount() + mContext.getString(R.string.live_send_gift_2) + receiveGiftBean.getGiftName());
String special = "";
if (sendBlindGiftEvent.getSpecialGift() == 1) {
if (WordUtil.isNewZh()) {
special = "送出" + receiveGiftBean.getGiftName() + sendBlindGiftEvent.getSpecialGiftName();
} else {
special = "Send " + receiveGiftBean.getGiftName() + sendBlindGiftEvent.getSpecialGiftNameEn();
}
chatBean.setContent(special);
} else {
chatBean.setContent(mContext.getString(R.string.live_send_gift_1) + " " + +receiveGiftBean.getGiftCount() + " " + mContext.getString(R.string.live_send_gift_2) + receiveGiftBean.getGiftnameen());
if (WordUtil.isNewZh()) {
chatBean.setContent(mContext.getString(R.string.live_send_gift_1) + receiveGiftBean.getGiftCount() + mContext.getString(R.string.live_send_gift_2) + receiveGiftBean.getGiftName() + special);
} else {
chatBean.setContent(mContext.getString(R.string.live_send_gift_1) + " " + +receiveGiftBean.getGiftCount() + " " + mContext.getString(R.string.live_send_gift_2) + receiveGiftBean.getGiftnameen() + special);
}
}
//增加粉丝徽章信息
chatBean.setMedalNmae(map.getString("medal_name"));

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

@@ -1637,6 +1637,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
private Runnable timeRunnable = new Runnable() {
@Override
public void run() {
Log.i("红包", "run: 红包倒计时 "+redTimeCountdown);
if (redTimeCountdown > 1) {
timeHandler.postDelayed(timeRunnable, 1000);
redPacketCountdown.setText(String.format(mContext.getString(R.string.red_packet_countdown), TimeUtils.getTime(redTimeCountdown)));
@@ -1662,6 +1663,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
private Runnable anchorTimeRunnable = new Runnable() {
@Override
public void run() {
Log.i("红包", "anchorTimeRunnable run: "+mCountdown);
if (mCountdown > 0) {
mCountdown = mCountdown - 1;
anchorTimeHandler.postDelayed(anchorTimeRunnable, 1000);

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

@@ -99,7 +99,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/hor_recycler"
android:layout_width="wrap_content"
android:layout_height="120dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="5dp"
android:scrollbars="none" />

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

@@ -2,7 +2,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="100dp"
android:layout_height="180dp"
android:minHeight="180dp"
android:layout_height="wrap_content"
android:gravity="center_horizontal|top"
android:paddingTop="10dp"
android:orientation="vertical"

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

@@ -1206,12 +1206,14 @@
</LinearLayout>
</FrameLayout>
<!--全服通知 通用模板-->
<FrameLayout
android:id="@+id/full_service_notice_new"
android:layout_width="match_parent"
android:layout_height="51dp"
android:translationX="500dp"
tools:translationX="0dp"
tools:visibility="visible"
android:visibility="invisible">
<ImageView
android:id="@+id/full_service_notice_new_bg"
@@ -2317,7 +2319,7 @@
android:layout_width="40dp"
android:layout_height="50dp"
android:layout_marginTop="10dp"
android:visibility="gone">
android:visibility="invisible">
<View
android:layout_width="41dp"

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

@@ -70,6 +70,7 @@
android:textSize="12sp" />
<ImageView
android:id="@+id/value_icon"
android:layout_width="16dp"
android:layout_height="14dp"
android:layout_marginStart="15dp"
@@ -145,6 +146,7 @@
</LinearLayout>
<TextView
android:id="@+id/tips"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/red_packet_list"