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

主播开播优化

Browse Source
This commit is contained in:
Martin 2024-08-22 10:45:11 +08:00
parent 67b79cd306
commit 0d1e2c4e6b
41 changed files with 1210 additions and 973 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/src/main/java/com/yunbao/common/views/LiveClarityCustomPopup.java
View File

@ -33,11 +33,16 @@ public class LiveClarityCustomPopup extends BottomPopupView implements View.OnCl
private TextView titleSDText, titleHDText, titleFHDText, mTips;
private int banSelect;
private boolean isUser = false;
private SelectPositionListener selectPositionListener;
public int getSelectClarity() {
return selectClarity;
}
public void setSelectPositionListener(SelectPositionListener selectPositionListener) {
this.selectPositionListener = selectPositionListener;
}
/**
* @param banSelect 禁止选项，{@link #BAN_720} 禁止高清和超高清。 {@link #BAN_1080} 禁止超高清
* @param isUser 是否为观众，true 观众，false 主播
@ -227,6 +232,13 @@ public class LiveClarityCustomPopup extends BottomPopupView implements View.OnCl
iconFhd.setVisibility(VISIBLE);
break;
}
if(selectPositionListener!=null){
selectPositionListener.onSelect(selectClarity);
}
}
public interface SelectPositionListener{
void onSelect(int position);
}
private Handler netHandler = new Handler();

23
common/src/main/res/drawable/bg_gift_progressbar.xml Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!--设置ProgressBar背景色-->
<item android:id="@android:id/background">
<shape>
<!--设置ProgressBar进度条圆角半径-->
<corners android:radius="1dp" />
<solid android:color="#A5A193" />
</shape>
</item>
<!--设置ProgressBar进度条颜色-->
<item android:id="@android:id/progress">
<scale android:scaleWidth="100%">
<shape>
<corners android:radius="1dp" />
<gradient
android:endColor="#FFC949"
android:startColor="#FFC949" />
</shape>
</scale>
</item>
</layer-list>

73
common/src/main/res/layout/dialog_live_interaction.xml
View File

@ -8,8 +8,8 @@
<LinearLayout
android:id="@+id/interactionLayout"
android:layout_width="match_parent"
android:orientation="vertical"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
@ -41,9 +41,10 @@
android:src="@mipmap/icon_interaction_zg" />
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:gravity="center"
android:text="@string/live_zg"
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
@ -63,9 +64,10 @@
android:src="@mipmap/icon_interaction_wish" />
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:gravity="center"
android:text="@string/live_wishlist"
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
@ -74,8 +76,8 @@
<LinearLayout
android:id="@+id/live_tool_mic"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
android:visibility="visible">
@ -86,9 +88,10 @@
android:src="@mipmap/icon_interaction_mic" />
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:gravity="center"
android:text="@string/live_mic"
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
@ -97,8 +100,8 @@
<LinearLayout
android:id="@+id/live_tool_game"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
@ -108,9 +111,10 @@
android:src="@mipmap/icon_interaction_game" />
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:gravity="center"
android:text="@string/interactive_game"
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
@ -126,8 +130,8 @@
<LinearLayout
android:id="@+id/live_tool_anchor_say"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
@ -137,9 +141,10 @@
android:src="@mipmap/icon_interaction_anchor_say" />
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:gravity="center"
android:text="@string/live_fun_anchor_say"
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
@ -148,8 +153,8 @@
<LinearLayout
android:id="@+id/live_tool_qa"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
@ -159,17 +164,19 @@
android:src="@mipmap/icon_interaction_qa" />
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:gravity="center"
android:text="@string/dialog_live_function_qa"
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
</LinearLayout>
<View
android:layout_width="0dp"
android:layout_weight="2"
android:layout_height="match_parent"/>
android:layout_height="match_parent"
android:layout_weight="2" />
</LinearLayout>
</LinearLayout>
@ -177,8 +184,8 @@
<LinearLayout
android:id="@+id/equityLayout"
android:layout_width="match_parent"
android:orientation="vertical"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
@ -209,9 +216,10 @@
android:src="@mipmap/icon_interaction_live_data" />
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:gravity="center"
android:text="@string/broadcast_data"
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
@ -231,9 +239,10 @@
android:src="@mipmap/icon_interaction_robot" />
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:gravity="center"
android:text="@string/robot_setup"
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
@ -241,9 +250,10 @@
<View
android:layout_width="0dp"
android:layout_weight="2"
android:layout_height="match_parent"/>
android:layout_height="match_parent"
android:layout_weight="2" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -252,18 +262,19 @@
android:text="@string/live_interaction_tools"
android:textColor="@color/white"
android:textSize="14sp" />
<LinearLayout
android:layout_marginTop="14dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="14dp"
android:layout_marginBottom="20dp"
android:paddingEnd="16dp">
<LinearLayout
android:id="@+id/live_tool_beauty"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
@ -273,9 +284,10 @@
android:src="@mipmap/icon_interaction_beauty" />
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:gravity="center"
android:text="@string/live_beauty"
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
@ -284,8 +296,8 @@
<LinearLayout
android:id="@+id/live_tool_camera"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
@ -295,9 +307,10 @@
android:src="@mipmap/icon_interaction_camera" />
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:gravity="center"
android:text="@string/live_camera"
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
@ -306,8 +319,8 @@
<LinearLayout
android:id="@+id/live_tool_leave"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
@ -319,17 +332,19 @@
<TextView
android:id="@+id/live_tool_leave_text"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:gravity="center"
android:text="@string/live_zslk"
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
</LinearLayout>
<View
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"/>
android:layout_height="match_parent"
android:layout_weight="1" />
</LinearLayout>
</LinearLayout>

BIN
common/src/main/res/mipmap-xxhdpi/icon_live_close_3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

6
common/src/main/res/values-en-rUS/strings.xml
View File

@ -290,7 +290,7 @@
<string name="live_camera">Flip</string>
<string name="live_camera_s">Mirroring</string>
<string name="live_zg">Trickster</string>
<string name="live_dr">MultiplayerPK</string>
<string name="live_dr">Multi PK</string>
<string name="live_mic">Voice connection</string>
<string name="live_wks">billboard</string>
<string name="live_zslk">leave temporarily</string>
@ -1105,7 +1105,7 @@ Limited ride And limited avatar frame</string>
<string name="lunar_wish">Month Wishes</string>
<string name="seasonal_wish">Seasonal Wishes</string>
<string name="wish_number">Wish%s</string>
<string name="aristocrat">aristocrat</string>
<string name="aristocrat">noble</string>
<string name="aristocrat_determine">sure</string>
<string name="replacement_wish_day">Reset Your: Day</string>
<string name="replacement_wish_zhou">Reset Wish: Week</string>
@ -1488,5 +1488,5 @@ Limited ride And limited avatar frame</string>
<string name="live_data_tip">* Non-real-time calculation of data</string>
<string name="live_data_msg2">Historical data can be viewed in the anchor center</string>
<string name="live_data_msg1">This live data statistics</string>
<string name="live_data_msg1">This live information</string>
</resources>

2
common/src/main/res/values-zh/strings.xml
View File

@ -1617,6 +1617,6 @@
<string name="live_data_history_gain">收益</string>
<string name="live_data_tip">* 人數及新增相關數據非实时计算</string>
<string name="live_data_msg2">歷史數據可在主播中心查看</string>
<string name="live_data_msg1">本場直播數據統計</string>
<string name="live_data_msg1">本場直播信息</string>
</resources>

6
common/src/main/res/values/strings.xml
View File

@ -233,7 +233,7 @@
<string name="must_hint">A maximum of 10 entries can be set</string>
<string name="live_camera">Flip</string>
<string name="live_zg">Trickster</string>
<string name="live_dr">MultiplayerPK</string>
<string name="live_dr">Multi PK</string>
<string name="live_mic">Voice connection</string>
<string name="live_wks">billboard</string>
<string name="live_zslk">leave temporarily</string>
@ -929,7 +929,7 @@ Limited ride And limited avatar frame</string>
<string name="lunar_wish">Month Wishes</string>
<string name="seasonal_wish">Seasonal Wishes</string>
<string name="wish_number">Wish%s</string>
<string name="aristocrat">aristocrat</string>
<string name="aristocrat">noble</string>
<string name="aristocrat_determine">sure</string>
<string name="replacement_wish_day">Reset Your: Day</string>
<string name="replacement_wish_zhou">Reset Wish: Week</string>
@ -1426,5 +1426,5 @@ Limited ride And limited avatar frame</string>
<string name="live_data_tip">* Non-real-time calculation of data</string>
<string name="live_data_msg2">Historical data can be viewed in the anchor center</string>
<string name="live_data_msg1">This live data statistics</string>
<string name="live_data_msg1">This live information</string>
</resources>

4
config.gradle
View File

@ -4,8 +4,8 @@ ext {
buildToolsVersion: "29.0.2",
minSdkVersion : 23,
targetSdkVersion : 34,
versionCode : 550,
versionName : "6.8.0",
versionCode : 560,
versionName : "6.8.2",
namespace : "com.pandoralive.shayu"
]
manifestPlaceholders = [

9
live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java
View File

@ -921,6 +921,9 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
//初始化天梯数据
mLiveRoomViewHolder.initRankPKInfo(mLiveUid,"");
//初始化心愿单数据
mLiveRoomViewHolder.initWishListView();
mLiveRoomViewHolder.initWishData();
}
mLiveSwLinkMicPkPresenter.setmLiveRoomViewHolder(mLiveRoomViewHolder);
}
@ -1793,7 +1796,11 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
.build()
.show();
break;
case WISH_LIST_PROGRESS:
if(mLiveRoomViewHolder!=null){
mLiveRoomViewHolder.wishListProgress(event.getWishListProgress(), event.getUname(), event.getLiveType());
}
break;
}
}

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

@ -32,6 +32,7 @@ import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
@ -41,6 +42,10 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.makeramen.roundedimageview.RoundedImageView;
import com.opensource.svgaplayer.SVGADrawable;
import com.opensource.svgaplayer.SVGAImageView;
import com.opensource.svgaplayer.SVGAParser;
import com.opensource.svgaplayer.SVGAVideoEntity;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.Constants;
import com.yunbao.common.bean.IMLoginModel;
@ -51,6 +56,7 @@ import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.SpUtil;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.WordUtil;
@ -64,6 +70,8 @@ import com.yunbao.live.utils.LiveTextRender;
import com.yunbao.live.utils.LoadDian9TuUtil;
import com.yunbao.live.views.LiveRoomViewHolder;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@ -225,6 +233,10 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
TextView prank_open_live_msg;
TextView prank_to_setting;
RoundedImageView msg_avatar;
SVGAImageView avatar_gift_svga;
RelativeLayout avatarLayout;
public Vh(View itemView) {
super(itemView);
mBg = (LinearLayout) itemView.findViewById(R.id.bg);
@ -255,6 +267,9 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
prank_open_live_msg = itemView.findViewById(R.id.prank_open_live_msg);
prank_to_setting = itemView.findViewById(R.id.prank_to_setting);
msg_avatar = itemView.findViewById(R.id.msg_avatar);
avatar_gift_svga = itemView.findViewById(R.id.avatar_gift_svga);
avatarLayout = itemView.findViewById(R.id.avatarLayout);
}
void setData(final LiveChatBean bean, int position) {
@ -262,9 +277,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
@Override
public boolean onLongClick(View v) {
if (!TextUtils.isEmpty(bean.getId()) && !TextUtils.isEmpty(bean.getUserNiceName())) {
Bus.get().post(new LiveAudienceEvent()
.setType(LiveAudienceEvent.LiveAudienceType.INPUT_DIALOG)
.setOlineUserlistModel(new OlineUserlistModel().setId(bean.getId()).setUserNicename(bean.getUserNiceName())));
Bus.get().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.INPUT_DIALOG).setOlineUserlistModel(new OlineUserlistModel().setId(bean.getId()).setUserNicename(bean.getUserNiceName())));
}
Log.e("eqwewqeweq", bean.toString());
return true;
@ -552,6 +565,37 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
mTextView.setText(Html.fromHtml(stringBuffer.toString()));
new LoadDian9TuUtil().loadDian9TuAssets(mContext, mBg, 1);
} else {
/*avatar_gift_svga.setImageDrawable(null);
ImgLoader.display2(mContext, bean.getAvatar(), msg_avatar);
avatarLayout.setVisibility(View.VISIBLE);
msg_avatar.setVisibility(View.VISIBLE);
if (!StringUtil.isEmpty(bean.getU_gift_svga())) {
avatar_gift_svga.setVisibility(View.VISIBLE);
if (bean.getU_gift_svga().contains("svga")) {
try {
new SVGAParser(mContext).parse(new URL(bean.getU_gift_svga()), new SVGAParser.ParseCompletion() {
@Override
public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem);
avatar_gift_svga.setImageDrawable(drawable);
SVGAViewUtils.playEndClear(avatar_gift_svga, false);
}
@Override
public void onError() {
}
});
} catch (MalformedURLException e) {
e.printStackTrace();
}
} else {
ImgLoader.display2(mContext, bean.getU_gift_svga(), avatar_gift_svga);
}
} else {
avatar_gift_svga.setVisibility(View.GONE);
avatarLayout.setVisibility(View.GONE);
msg_avatar.setVisibility(View.GONE);
}*/
if (bean.getBubble() != null && !bean.getBubble().equals("")) {
//加载.9图聊天气泡
new LoadDian9TuUtil().loadDian9Tu(mContext, mBg, bean.getBubble(), 1);
@ -577,8 +621,7 @@ 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));
@ -599,14 +642,10 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
if (isBottom || mRecyclerViewScrolledDy == 0) {
scrollToBottom();
} else {
Bus.get().post(new LiveAudienceEvent()
.setType(LiveAudienceEvent.LiveAudienceType.NEW_MESSAGE_REMINDER));
Bus.get().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.NEW_MESSAGE_REMINDER));
if (bean.getType() != LiveChatBean.TYPE_TO_USER_MSG &&
bean.getAtUserID() != null
&& bean.getAtUserID().contains(String.valueOf(model.getId()))) {
Bus.get().post(new LiveAudienceEvent()
.setType(LiveAudienceEvent.LiveAudienceType.AT_MESSAGE));
if (bean.getType() != LiveChatBean.TYPE_TO_USER_MSG && bean.getAtUserID() != null && bean.getAtUserID().contains(String.valueOf(model.getId()))) {
Bus.get().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.AT_MESSAGE));
mPosition = size;
}
}
@ -675,8 +714,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
notifyDataSetChanged();
}
public class ListAdapter extends
RecyclerView.Adapter<ListAdapter.ViewHolder> {
public class ListAdapter extends RecyclerView.Adapter<ListAdapter.ViewHolder> {
private LayoutInflater mInflater;
private List<String> mDatas;
@ -707,8 +745,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
*/
@Override
public ListAdapter.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
View view = mInflater.inflate(R.layout.item_chat_active,
viewGroup, false);
View view = mInflater.inflate(R.layout.item_chat_active, viewGroup, false);
ListAdapter.ViewHolder viewHolder = new ListAdapter.ViewHolder(view);
return viewHolder;

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

@ -60,6 +60,8 @@ public class LiveChatBean {
private String giftName;
private String giftname_en;
private String toUid;
private String avatar; //头像
private String u_gift_svga; //
public int getNORMAL() {
return NORMAL;
@ -82,6 +84,22 @@ public class LiveChatBean {
return this;
}
public String getAvatar() {
return avatar;
}
public void setAvatar(String avatar) {
this.avatar = avatar;
}
public String getU_gift_svga() {
return u_gift_svga;
}
public void setU_gift_svga(String u_gift_svga) {
this.u_gift_svga = u_gift_svga;
}
public String getToUid() {
return toUid;
}

12
live/src/main/java/com/yunbao/live/bean/LiveWishlistBean.java
View File

@ -26,6 +26,8 @@ public class LiveWishlistBean {
private String wishlist_num;
private String wishlist_progress;
private String wishlist_name;
private int price;
@JSONField(name = "id")
public String getId() {
@ -107,6 +109,12 @@ public class LiveWishlistBean {
this.wishlist_name = wishlist_name;
}
@JSONField(name = "price")
public int getPrice() {
return price;
}
@JSONField(name = "price")
public void setPrice(int price) {
this.price = price;
}
}

2
live/src/main/java/com/yunbao/live/presenter/LiveSwLinkMicPkPresenter.java
View File

@ -1726,7 +1726,7 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
if (livePushSwViewHolder.timeTitle.getVisibility() == View.GONE && isShowTimeTitle) {
mHandler.removeMessages(WHAT_PK_TIME2);
RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) livePushSwViewHolder.timeTitle.getLayoutParams();
layoutParams.topMargin = DpUtil.dp2px(123);
layoutParams.topMargin = DpUtil.dp2px(165);
livePushSwViewHolder.timeTitle.setLayoutParams(layoutParams);
livePushSwViewHolder.timeTitle.setVisibility(View.VISIBLE);
String pkTime = StringUtil.getDurationText(time * 1000);

2
live/src/main/java/com/yunbao/live/socket/SocketSwChatUtil.java
View File

@ -95,6 +95,8 @@ public class SocketSwChatUtil {
.param("isAnchor", isAnchor ? 1 : 0)
.param("level", u.getLevel())
.param("uname", u.getUserNiceName())
.param("u_avatar", u.getAvatar())
.param("u_gift_svga", u.getDress().getAvatar_frame())
.param("bubble", u.getDress().getBubble())
.param("medal_honor", u.getMedal_no_display_src())
.param("medal", u.getDress().getMedal())

2
live/src/main/java/com/yunbao/live/socket/SocketSwClient.java
View File

@ -946,6 +946,8 @@ public class SocketSwClient {
LiveChatBean chatBean = new LiveChatBean();
chatBean.setId(map.getString("uid"));
chatBean.setUserNiceName(map.getString("uname"));
chatBean.setAvatar(map.getString("u_avatar"));
chatBean.setU_gift_svga(map.getString("u_gift_svga"));
chatBean.setLevel(map.getIntValue("level"));
chatBean.setAnchor(map.getIntValue("isAnchor") == 1);
chatBean.setManager(map.getIntValue("usertype") == Constants.SOCKET_USER_TYPE_ADMIN);

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

@ -307,7 +307,7 @@ public class LiveEndViewHolder extends AbsViewHolder implements View.OnClickList
@Override
public void onClick(View v) {
String url = CommonAppConfig.HOST + "/h5/Grade/index.html?" + "token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&for";
WebViewActivity.forward(mContext, url,false);
WebViewActivity.forward(mContext, url,true);
}
});
findViewById(R.id.go_anchor_center).setOnClickListener(new View.OnClickListener() {

25
live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java
View File

@ -116,6 +116,8 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
private boolean selector = true;
private String mLiveUid;
private ViewFlipper liveOpenVf;
private ImageView btn_live_clarity;
private int select;
public LiveNewReadySwViewHolder(Context context, ViewGroup parentView, int liveSdk) {
super(context, parentView, liveSdk);
@ -138,6 +140,7 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
mRootView = (ConstraintLayout) findViewById(R.id.traceroute_rootview);
selectorProtocol = (ImageView) findViewById(R.id.selector_protocol);
anchorAgreement = (TextView) findViewById(R.id.anchor_agreement);
btn_live_clarity = findViewById(R.id.btn_live_clarity);
mRootView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@ -245,8 +248,24 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
LiveClarityCustomPopup liveClarityCustomPopup =
new LiveClarityCustomPopup(mContext,
IMLoginManager.get(mContext).getSelectClarity(),
IMLoginManager.get(mContext).getClarity() ? 0 : LiveClarityCustomPopup.BAN_1080, false);
select);
liveClarityCustomPopup.setSelectPositionListener(new LiveClarityCustomPopup.SelectPositionListener() {
@Override
public void onSelect(int position) {
select = position;
switch (position) {
case 0:
btn_live_clarity.setImageResource(R.mipmap.icon_sd);
break;
case 1:
btn_live_clarity.setImageResource(R.mipmap.icon_hd);
break;
case 2:
btn_live_clarity.setImageResource(R.mipmap.icon_fhd);
break;
}
}
});
new XPopup.Builder(mContext)
.setPopupCallback(new XPopupCallback() {
@Override
@ -571,6 +590,7 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
openAnchorSayDialog();
}
}
private void setSelectClarity(int selectClarity) {
this.selectClarity = selectClarity;
IMLoginManager.get(mContext).setSelectClarity(selectClarity);
@ -590,6 +610,7 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
//重新发布一下流
Bus.get().post(new LivePushRyEvent());
}
/**
* 新娱美颜
*/

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

@ -32,6 +32,7 @@ import android.widget.Button;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.ViewFlipper;
@ -60,6 +61,7 @@ import com.google.gson.JsonElement;
import com.google.gson.reflect.TypeToken;
import com.google.gson.Gson;
import com.lxj.xpopup.XPopup;
import com.lzy.okgo.model.Progress;
import com.makeramen.roundedimageview.RoundedImageView;
import com.ms.banner.Banner;
import com.ms.banner.BannerConfig;
@ -164,6 +166,7 @@ import com.yunbao.live.activity.LiveSwAnchorActivity;
import com.yunbao.live.activity.ZhuangBanActivity;
import com.yunbao.live.adapter.ComboAdapter;
import com.yunbao.live.adapter.LiveChatAdapter;
import com.yunbao.live.adapter.LiveNewWishListAdapter;
import com.yunbao.live.adapter.LiveRoomFastMessageRecyclerViewAdapter;
import com.yunbao.live.adapter.LiveUserAdapter;
import com.yunbao.live.adapter.PrankAdapter;
@ -284,7 +287,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
public TextView room_hot;
public String touid, gotoroom;
public static TextView fans;
public LinearLayout fans_btn, wishListLayout, wishListLayout2, liveWksLayout;
public LinearLayout fans_btn;
public static View d_pk_view;
public static int isAttention = 0;//是否关注 0=没关注,
public static String mNameText;
@ -340,6 +343,19 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
static RoundedImageView mic_ico1;
static RoundedImageView mic_ico2;
private SVGAImageView mic_gift_svga2;
private SVGAImageView mic_gift_svga1;
private SVGAImageView mic_gift_svga;
private ImageView userVoice2;
private ImageView userVoice1;
private ImageView userVoice;
private TextView userName2;
private TextView userName1;
private TextView userName;
private GifImageView dr_pk_end_gif;
private SVGAImageView gift_svga;
@ -376,7 +392,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
private List<WishlistItemModel> wishlist = new ArrayList<>();
private TextView mHourRank, mHotText;
private LinearLayout msg; //默认悬浮窗布局
private LinearLayout mAnchorLayout, hourRankLayout, liveRankPk2;
private LinearLayout mAnchorLayout, liveRankPk2;
private ImageView mGoodNumberIcon;
private View msg2; //悬浮窗来私信的布局
private ConstraintLayout msgLayout; //悬浮窗
@ -395,7 +411,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
//接口整合新加参数
private GuardUserModel guardUserModel;
private static ViewFlipper flipper, wksAndGiftWall;
private static ViewFlipper flipper;
private TextView mRandomPkTimer;
//全服通知
@ -444,6 +460,17 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
public static SVGAVideoEntity drawableTitleEn;
public static SVGAVideoEntity drawableBg;
private LinearLayout giftLayout;
private TextView gift_number;
private TextView gift_total;
private ProgressBar gift_progressbar;
private LinearLayout wishlistLayout;
private ImageView wish_icon;
private TextView wish_number;
private TextView wish_total;
private ProgressBar wish_progressbar;
public LiveRoomViewHolder setGuardType(int guardType) {
this.guardType = guardType;
return this;
@ -661,14 +688,88 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
mic_view.setVisibility(View.VISIBLE);
mic_ids.add(bean.getId());
ImgLoader.display2(Contexts, bean.getAvatar(), mic_ico);
userName.setText(bean.getUserNicename());
mic_gift_svga.setImageDrawable(null);
if (bean.getDressAvatar() != null) {
if (bean.getDressAvatar().contains("svga")) {
try {
new SVGAParser(mContext).parse(new URL(bean.getDressAvatar()), new SVGAParser.ParseCompletion() {
@Override
public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem);
mic_gift_svga.setImageDrawable(drawable);
SVGAViewUtils.playEndClear(mic_gift_svga, false);
}
@Override
public void onError() {
}
});
} catch (MalformedURLException e) {
e.printStackTrace();
}
} else {
ImgLoader.display2(mContext, bean.getDressAvatar(), mic_gift_svga);
}
}
} else if (i == 2) {
mic_view1.setVisibility(View.VISIBLE);
mic_ids.add(bean.getId());
ImgLoader.display2(Contexts, bean.getAvatar(), mic_ico1);
userName1.setText(bean.getUserNicename());
mic_gift_svga1.setImageDrawable(null);
if (bean.getDressAvatar() != null) {
if (bean.getDressAvatar().contains("svga")) {
try {
new SVGAParser(mContext).parse(new URL(bean.getDressAvatar()), new SVGAParser.ParseCompletion() {
@Override
public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem);
mic_gift_svga1.setImageDrawable(drawable);
SVGAViewUtils.playEndClear(mic_gift_svga1, false);
}
@Override
public void onError() {
}
});
} catch (MalformedURLException e) {
e.printStackTrace();
}
} else {
ImgLoader.display2(mContext, bean.getDressAvatar(), mic_gift_svga1);
}
}
} else if (i == 3) {
mic_view2.setVisibility(View.VISIBLE);
mic_ids.add(bean.getId());
ImgLoader.display2(Contexts, bean.getAvatar(), mic_ico2);
userName2.setText(bean.getUserNicename());
mic_gift_svga2.setImageDrawable(null);
if (bean.getDressAvatar() != null) {
if (bean.getDressAvatar().contains("svga")) {
try {
new SVGAParser(mContext).parse(new URL(bean.getDressAvatar()), new SVGAParser.ParseCompletion() {
@Override
public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem);
mic_gift_svga2.setImageDrawable(drawable);
SVGAViewUtils.playEndClear(mic_gift_svga2, false);
}
@Override
public void onError() {
}
});
} catch (MalformedURLException e) {
e.printStackTrace();
}
} else {
ImgLoader.display2(mContext, bean.getDressAvatar(), mic_gift_svga2);
}
}
}
}
mic_view.setOnClickListener(new View.OnClickListener() {
@ -1275,12 +1376,24 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
mic_view1 = (RelativeLayout) findViewById(R.id.mic_view1);
mic_view2 = (RelativeLayout) findViewById(R.id.mic_view2);
flipper = (ViewFlipper) findViewById(R.id.hour_rank_list);
wksAndGiftWall = (ViewFlipper) findViewById(R.id.live_wks_and_gift_wall);
mic_ico = (ImageView) findViewById(R.id.mic_ico);
newMessage = (ImageView) findViewById(R.id.new_message);
atMessage = (ImageView) findViewById(R.id.at_message);
mic_ico1 = (RoundedImageView) findViewById(R.id.mic_ico1);
mic_ico2 = (RoundedImageView) findViewById(R.id.mic_ico2);
mic_gift_svga2 = findViewById(R.id.mic_gift_svga2);
mic_gift_svga1 = findViewById(R.id.mic_gift_svga1);
mic_gift_svga = findViewById(R.id.mic_gift_svga);
userVoice2 = findViewById(R.id.userVoice2);
userVoice1 = findViewById(R.id.userVoice1);
userVoice = findViewById(R.id.userVoice);
userName2 = findViewById(R.id.userName2);
userName1 = findViewById(R.id.userName1);
userName = findViewById(R.id.userName);
ViewClicksAntiShake.clicksAntiShake(newMessage, () -> {
chatScrollToBottom();
newMessage.setVisibility(View.GONE);
@ -1358,11 +1471,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
room_hot = (TextView) findViewById(R.id.room_hot);
fans = (TextView) findViewById(R.id.fans);
fans_btn = (LinearLayout) findViewById(R.id.fans_btn);
wishListLayout = (LinearLayout) findViewById(R.id.wish_list_layout);
wishListLayout2 = (LinearLayout) findViewById(R.id.wish_list_layout2);
liveWksLayout = (LinearLayout) findViewById(R.id.live_wks_layout2);
mAnchorLayout = (LinearLayout) findViewById(R.id.group_1);
hourRankLayout = (LinearLayout) findViewById(R.id.hour_rank_layout2);
liveRankPk2 = (LinearLayout) findViewById(R.id.live_rank_pk2);
mGoodNumberIcon = (ImageView) findViewById(R.id.good_nub_ico);
pkRankLayout = (FrameLayout) findViewById(R.id.live_rank_pk);
@ -1454,9 +1563,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
((LiveActivity) mContext).sendChatMessage("Hi~", null, null);
} else if (bean.getType() == -5) {
String url = CommonAppConfig.HOST + "/h5/activity/Turntable/index.html";
url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token="
+ CommonAppConfig.getInstance().getToken() +
"&active_id=6";
url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&active_id=6";
Log.i("tag", url);
Bundle bundle1 = new Bundle();
bundle1.putString("url", url);
@ -1644,7 +1751,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
findViewById(R.id.ft_hot_add).setOnClickListener(this);
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.open_sidebar), () -> Bus.get().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.SIDEBAR)));
//点击心愿单
ViewClicksAntiShake.clicksAntiShake(wishListLayout, () -> Bus.get().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.WISH_LIST)));
//ViewClicksAntiShake.clicksAntiShake(wishListLayout, () -> Bus.get().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.WISH_LIST)));
mBanner1.setOutlineProvider(new ViewOutlineProvider() {
@Override
@ -1725,7 +1832,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
reloadIM();
// initStarChallengeStatus();
new LoadDian9TuUtil().loadDian9TuAssets2(mContext, wishListLayout2, "rectangle_new.png", 1);
pa_pao_layout = (FrameLayout) findViewById(R.id.pa_pao_layout);
combo_layout = (LinearLayout) findViewById(R.id.combo_layout);
combo_number = (TextView) findViewById(R.id.combo_number);
@ -1835,8 +1941,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
//点击图片转盘整蛊(跳转转盘整蛊)
prank_group_turntable_icon.setOnClickListener(v -> {
Bus.get().post(new LiveAudienceEvent()
.setType(LiveAudienceEvent.LiveAudienceType.WE_CHEAT));
Bus.get().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.WE_CHEAT));
});
recycler_prank.setLayoutManager(new LinearLayoutManager(mContext));
@ -2115,7 +2220,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
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)));
redPacketCountdown.setText(TimeUtils.getTime(redTimeCountdown));
redTimeCountdown = redTimeCountdown - 1;
} else {
redTimeCountdown = 0;
@ -2217,7 +2322,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
redPacketCountdown.setVisibility(View.VISIBLE);
mCountdown = redPacketModel.getCountdown();
redTimeCountdown = mCountdown - 180;
redPacketCountdown.setText(String.format(mContext.getString(R.string.red_packet_countdown), TimeUtils.getTime(redTimeCountdown)));
redPacketCountdown.setText(TimeUtils.getTime(redTimeCountdown));
timeHandler.post(timeRunnable);
} else {
redTimeCountdown = 0;
@ -2636,37 +2741,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
});*/
}
//获取心愿单列表
private void loadWishlistData() {
LiveHttpUtil.getWishList(mLiveUid, new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0 && info.length > 0) {
try {
JSONObject obj = JSON.parseObject(info[0]);
String giftJson = obj.getString("wishlist");
List<LiveWishlistBean> mWishlist = JSON.parseArray(giftJson, LiveWishlistBean.class);
if (mWishlist.size() > 0) {
//心单
BannerBean bannerBean2 = new BannerBean();
bannerBean2.setImageUrl(obj.getString("img"));
bannerBean2.setLink("xyd");
mBannerList1.add(bannerBean2);
}
showBanner();
} catch (Exception e) {
e.printStackTrace();
}
}
}
@Override
public void onFinish() {
}
});
}
public void showLiveRoomActivityBanner() {
LiveNetManager.get(mContext).getLiveRoomActivityBanner(new com.yunbao.common.http.base.HttpCallback<List<LiveRoomActivityBanner>>() {
@Override
@ -2744,33 +2818,53 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}
}
public void initWishData() {
LiveHttpUtil.getWishList(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0 && info.length > 0) {
try {
JSONObject obj = JSON.parseObject(info[0]);
String giftJson = obj.getString("wishlist");
List<WishModel> mWishlist = JSON.parseArray(giftJson, WishModel.class);
if (mWishlist.size() > 0) {
List<WishModel> tempList = new ArrayList<>();
for (int i = 0; i < mWishlist.size(); i++) {
if (Integer.parseInt(mWishlist.get(i).getWishlistProgress()) < Integer.parseInt(mWishlist.get(i).getWishlistNum())) {
tempList.add(mWishlist.get(i));
}
}
WishModel wishlistBean = tempList.get(0);
for (int i = 0; i < tempList.size(); i++) {
//未达成
if (wishlistBean.getPrice() < tempList.get(i).getPrice()) {
wishlistBean = tempList.get(i);
}
}
initWishListData(wishlistBean);
}
} catch (Exception e) {
e.printStackTrace();
}
}
}
@Override
public void onFinish() {
}
});
}
/**
* 初始化心愿单列表轮播
*/
public void initWishList(List<WishlistItemModel> wishlist) {
if (wishlist.size() > 0) {
this.wishlist = wishlist;
wishListLayout.setVisibility(View.VISIBLE);
wishlistLayout.setVisibility(View.VISIBLE);
} else {
wishListLayout.setVisibility(View.GONE);
wishlistLayout.setVisibility(View.GONE);
}
((Activity) mContext).runOnUiThread(() -> {
wishListFlipper = (ViewFlipper) findViewById(R.id.wish_list_vf);
for (int i = 0; i < wishlist.size(); i++) {
View wish = LayoutInflater.from(mContext).inflate(R.layout.view_wish_list, null);
wish.setTag(wishlist.get(i).getId());
ImageView wishPic = wish.findViewById(R.id.wish_pic);
TextView wishIndex = wish.findViewById(R.id.wish_index);
ImgLoader.display2(mContext, wishlist.get(i).getWishlistIcon(), wishPic);
wishIndex.setText(wishlist.get(i).getWishlistNumP());
if (wishListFlipper != null) {
wishListFlipper.addView(wish);
}
}
if (wishListFlipper != null) {
wishListFlipper.startFlipping();
}
});
}
public void initHourRank(RankHourModel model) {
@ -2790,6 +2884,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
mHotText = hotView.findViewById(R.id.wish_index);
mHourRank = hourView.findViewById(R.id.wish_index);
mHotText.setText("0");
mHourRank.setText("熱度加成");
mHotText.setLayoutParams(textParams);
mHourRank.setLayoutParams(textParams);
mHotText.setGravity(Gravity.CENTER);
@ -2821,7 +2916,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
liveHDDialogFragment.setArguments(bundle);
liveHDDialogFragment.show(((AbsActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");
});
new LoadDian9TuUtil().loadDian9TuAssets2(mContext, hourRankLayout, "rectangle_new.png", 1);
}
/**
@ -2876,7 +2970,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}
}, Throwable::printStackTrace).isDisposed();
new LoadDian9TuUtil().loadDian9TuAssets2(mContext, hourRankLayout, "rectangle_new.png", 1);
}
private void showUrlHDDialog(String path) {
@ -2945,7 +3038,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}
pkRankLayout.setTag(mLiveUid);
pkUidTmp = pkUid;
new LoadDian9TuUtil().loadDian9TuAssets2(mContext, liveRankPk2, "rectangle_new.png", 1);
}
@ -3099,9 +3191,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
*/
public void setHotData(String hot) {
if (mHourRank != null && !TextUtils.isEmpty(hot)) {
L.eSw("setHotData-" + hot);
mHourRank.setText(hot);
}
}
public void setHotNum(String hotNum) {
@ -3122,12 +3214,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
model.setWishlistProgress(String.valueOf(number));
}
}
if (wishListLayout != null) {
wishListLayout.removeAllViews();
}
initWishList(wishlist);
}
}
//点击头像
@ -3699,53 +3787,26 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
* 设置礼物墙和周星榜
*/
public void setGiftWall(String giftWallLightenNumber, String giftWallLightenTotal) {
if (wksAndGiftWall.getChildCount() > 0) {
wksAndGiftWall.removeAllViews();
}
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(DpUtil.dp2px(16), DpUtil.dp2px(16));
LinearLayout.LayoutParams textParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
textParams.leftMargin = DpUtil.dp2px(5);
textParams.rightMargin = DpUtil.dp2px(5);
params.leftMargin = DpUtil.dp2px(5);
View weekView = LayoutInflater.from(mContext).inflate(R.layout.view_wish_list, null);
ImageView weekViewPic = weekView.findViewById(R.id.wish_pic);
TextView week = weekView.findViewById(R.id.wish_index);
week.setLayoutParams(textParams);
week.setGravity(Gravity.CENTER);
week.setText(mContext.getString(R.string.live_wks));
weekViewPic.setImageResource(R.mipmap.live_icon_zhouxing);
weekViewPic.setLayoutParams(params);
giftLayout = findViewById(R.id.giftLayout);
if (!TextUtils.isEmpty(giftWallLightenNumber) && !TextUtils.isEmpty(giftWallLightenTotal)) {
StringBuffer stringBuffer = new StringBuffer();
stringBuffer.append(mContext.getString(R.string.gift_wall)).append(giftWallLightenNumber).append("/").append(giftWallLightenTotal);
View giftWall = LayoutInflater.from(mContext).inflate(R.layout.view_wish_list, null);
ImageView giftWallPic = giftWall.findViewById(R.id.wish_pic);
TextView giftText = giftWall.findViewById(R.id.wish_index);
giftText.setText(stringBuffer.toString());
giftText.setGravity(Gravity.CENTER);
giftText.setLayoutParams(textParams);
giftWallPic.setImageResource(R.mipmap.icon_gift_wall);
giftWallPic.setLayoutParams(params);
wksAndGiftWall.addView(giftWall);
ViewClicksAntiShake.clicksAntiShake(giftWall, new ViewClicksAntiShake.ViewClicksCallBack() {
giftLayout.setVisibility(View.VISIBLE);
gift_number = findViewById(R.id.gift_number);
gift_total = findViewById(R.id.gift_total);
gift_progressbar = findViewById(R.id.gift_progressbar);
gift_number.setText(giftWallLightenNumber);
gift_total.setText("/" + giftWallLightenTotal);
gift_progressbar.setMax(Integer.parseInt(giftWallLightenTotal));
gift_progressbar.setProgress(Integer.parseInt(giftWallLightenNumber));
ViewClicksAntiShake.clicksAntiShake(giftLayout, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
//Bus.get().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.GIFT_WALL).setUid(mLiveUid).setVoicePress(true).setAvatar(mAvatarUrl).setUname(mAnchorName));
new com.yunbao.common.dialog.GiftWallDialog(mContext, mLiveUid, mAnchorName, mLiveUid, true).setFullWindows(false).showDialog();
}
});
} else {
giftLayout.setVisibility(View.GONE);
}
ViewClicksAntiShake.clicksAntiShake(weekView, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
MobclickAgent.onEvent(mContext, "live_room_week", "周星榜按钮");
Bus.get().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.LIVE_WKS));
}
});
// wksAndGiftWall.addView(weekView);
// wksAndGiftWall.startFlipping();
new LoadDian9TuUtil().loadDian9TuAssets2(mContext, liveWksLayout, "rectangle_new.png", 1);
}
/**
@ -5509,7 +5570,39 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
updatePkRankInfo((PkRankBean) event.getObject());
break;
}
}
public void initWishListData(WishModel model) {
ImgLoader.display(mContext, model.getWishlistIcon(), wish_icon);
wish_number.setText(model.getWishlistProgress());
wish_total.setText("/" + model.getWishlistNum());
wish_progressbar.setMax(Integer.parseInt(model.getWishlistNum()));
wish_progressbar.setProgress(Integer.parseInt(model.getWishlistProgress()));
wishlistLayout.setVisibility(View.VISIBLE);
ViewClicksAntiShake.clicksAntiShake(wishlistLayout, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
MobclickAgent.onEvent(mContext, "live_room_wish", "心愿单按钮");
IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
String type = "";
StringBuffer htmlUrl = new StringBuffer();
String link = CommonAppConfig.HOST + "/index.php";
htmlUrl.append(link).append(link.contains("?") ? "&uid=" : "?uid=").append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&anchorUid=").append(mLiveUid).append("&liveUid=").append(mLiveUid).append("&t=").append(System.currentTimeMillis()).append("&g=Appapi&m=Wish&a=index").append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false, 1);
} else {
Bundle bundle = new Bundle();
bundle.putString("url", htmlUrl.toString());
LiveHDDialogFragment fragment = new LiveHDDialogFragment();
fragment.setArguments(bundle);
if (mContext instanceof LiveAudienceActivity) {
fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");
} else if (mContext instanceof LiveSwAnchorActivity) {
fragment.show(((LiveSwAnchorActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");
}
}
}
});
}
public void wishListProgress(WishModel wishModel, String userNiceName, int level) {
@ -5518,22 +5611,11 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}
wishListProgress = null;
WishModel model = wishModel;
if (!TextUtils.isEmpty(model.getWishlistName()) || !TextUtils.isEmpty(model.getWishlistProgress())) {
for (BannerBean bannerBean : mTopBannerList) {
if (bannerBean.getType() == 1) {
mTopBannerList.remove(bannerBean);
}
}
/*topBanner1.update(mTopBannerList);
topBanner2.update(mTopBannerList);*/
if (wishlistLayout != null) {
initWishListData(model);
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
BannerBean bannerBean = new BannerBean();
bannerBean.setWishlistIcon(model.getWishlistIcon()).setWishlistName(model.getWishlistName()).setWishlistNum(model.getWishlistNum()).setWishlistProgress(model.getWishlistProgress()).setmLink(CommonAppConfig.HOST + "/index.php").setType(1);
bannerBean.setShow_type("2");
mTopBannerList.add(bannerBean);
LiveChatBean bean = new LiveChatBean();
bean.setContent(model.getLuid());
bean.setUserNiceName(userNiceName);
@ -5541,38 +5623,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
bean.setType(LiveChatBean.WISH_LIST_PROGRESS);
bean.setLevel(level);
mLiveChatAdapter.insertItem(bean);
if (mTopBannerList.size() == 0) {
topBanner1.setVisibility(View.GONE);
} else {
topBanner1.update(mTopBannerList);
topBanner2.update(mTopBannerList);
}
}
}, 500);
} else {
for (BannerBean bannerBean : mTopBannerList) {
if (bannerBean.getType() == 1) {
mTopBannerList.remove(bannerBean);
}
}
// LiveChatBean bean = new LiveChatBean();
// bean.setContent(model.getLuid());
// bean.setUserNiceName(userNiceName);
// bean.setAtUserName(model.getWishlistName());
// bean.setType(LiveChatBean.WISH_LIST_PROGRESS);
// mLiveChatAdapter.insertItem(bean);
if (mTopBannerList.size() == 0) {
topBanner1.setVisibility(View.GONE);
topBanner2.setVisibility(View.GONE);
} else {
topBanner1.update(mTopBannerList);
topBanner2.update(mTopBannerList);
}
}
}
/**
* 全服通知
@ -6213,7 +6267,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
isHinde = true;
mAnchorSay.setVisibility(View.GONE);
if (!TextUtils.isEmpty(wishListProgress.getWishlistName()) || !TextUtils.isEmpty(wishListProgress.getWishlistProgress())) {
topBanner2.setVisibility(View.VISIBLE);
//topBanner2.setVisibility(View.VISIBLE);
} else {
topBanner2.setVisibility(View.GONE);
}
@ -6246,179 +6300,22 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
public void updateTopBanner() {
if (wishListProgress == null) return;
if (!TextUtils.isEmpty(wishListProgress.getWishlistName()) || !TextUtils.isEmpty(wishListProgress.getWishlistProgress())) {
if (mTopBannerList == null) {
mTopBannerList = new ArrayList<>();
}
// if(sayModel!=null&&sayModel.getLivePreview().getIsShow()==1&&sa)
if (!isHinde) {
topBanner1.setVisibility(View.VISIBLE);
}
mTopBannerList = new ArrayList<>();
BannerBean bannerBean = new BannerBean();
bannerBean.setWishlistIcon(wishListProgress.getWishlistIcon()).setWishlistName(wishListProgress.getWishlistName()).setWishlistNum(wishListProgress.getWishlistNum()).setWishlistProgress(wishListProgress.getWishlistProgress()).setmLink(CommonAppConfig.HOST + "/index.php").setType(1);
bannerBean.setShow_type("2");
mTopBannerList.add(bannerBean);
/*if (mTopBannerList.size() == 1 || mTopBannerList.size() == 0) {
mTopBannerList.add(bannerBean);
initWishListData(wishListProgress);
wishlistLayout.setVisibility(View.VISIBLE);
} else {
mTopBannerList.set(1, bannerBean);
}*/
topBanner1.update(mTopBannerList);
topBanner2.update(mTopBannerList);
}
}
public void initTopBanner() {
checkNewLetter();
if (mTopBannerList == null) {
mTopBannerList = new ArrayList<>();
}
if (!mTopBannerList.isEmpty()) {
return;
}
topBanner1.setVisibility(View.GONE);
topBanner1.setAutoPlay(true).setPages(mTopBannerList, new TopBannerCustomViewHolder()).setDelayTime(3000).setBannerStyle(BannerConfig.NOT_INDICATOR).setOnBannerClickListener(new OnBannerClickListener() {
@Override
public void onBannerClick(List datas, int position) {
if (datas.size() > 0 && mTopBannerList != null && mTopBannerList.size() > 0) {
if (mTopBannerList.get(position).getType() == TopBannerCustomViewHolder.TYPE_CALL_ANCHOR) {
MobclickAgent.onEvent(mContext, "live_room_contact", "联系方式按钮");
Dialog loading = DialogUitl.loadingDialog(mContext);
loading.show();
LiveNetManager.get(mContext).getContactInfo(mLiveUid, new com.yunbao.common.http.base.HttpCallback<LiveAnchorCallMeModel>() {
@Override
public void onSuccess(LiveAnchorCallMeModel data) {
if (data.getIsGet() == 1) {
new LiveUserAnchorMailBoxWebInfoPopDialog(mContext, mAnchorName, data.getLink()).setOnDismissListener(dialog -> {
checkNewLetter();
loading.dismiss();
}).showDialog();
return;
}
new LiveContactDetailsSendGiftDialog(mContext).setGiftId(data.getGiftId()).setAnchorName(mAnchorName).setStream(mStream).setLiveUid(mLiveUid).setOnDismissListener(dialog1 -> {
checkNewLetter();
}).showDialog();
loading.dismiss();
}
@Override
public void onError(String error) {
loading.dismiss();
}
});
} else {
MobclickAgent.onEvent(mContext, "live_room_wish", "心愿单按钮");
BannerBean bean = mTopBannerList.get(position);
IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
String type = "";
StringBuffer htmlUrl = new StringBuffer();
htmlUrl.append(bean.getLink()).append(bean.getLink().contains("?") ? "&uid=" : "?uid=").append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&anchorUid=").append(mLiveUid).append("&liveUid=").append(mLiveUid).append("&t=").append(System.currentTimeMillis()).append("&g=Appapi&m=Wish&a=index").append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false, 1);
} else {
Bundle bundle = new Bundle();
bundle.putString("url", htmlUrl.toString());
LiveHDDialogFragment fragment = new LiveHDDialogFragment();
fragment.setArguments(bundle);
fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");
}
wishlistLayout.setVisibility(View.GONE);
}
}
public void initWishListView() {
wishlistLayout = findViewById(R.id.wishlistLayout);
wish_icon = findViewById(R.id.wish_icon);
wish_number = findViewById(R.id.wish_number);
wish_total = findViewById(R.id.wish_total);
wish_progressbar = findViewById(R.id.wishlist_progressbar);
}
}).start();
topBanner2.setAutoPlay(true).setPages(mTopBannerList, new TopBannerCustomViewHolder(false)).setDelayTime(3000).setBannerStyle(BannerConfig.NOT_INDICATOR).setOnBannerClickListener(new OnBannerClickListener() {
@Override
public void onBannerClick(List datas, int position) {
if (datas.size() > 0) {
if (position >= mTopBannerList.size()) {
position = 0;
}
if (mTopBannerList.get(position).getType() == TopBannerCustomViewHolder.TYPE_CALL_ANCHOR) {
MobclickAgent.onEvent(mContext, "live_room_contact", "联系方式按钮");
Dialog loading = DialogUitl.loadingDialog(mContext);
loading.show();
LiveNetManager.get(mContext).getContactInfo(mLiveUid, new com.yunbao.common.http.base.HttpCallback<LiveAnchorCallMeModel>() {
@Override
public void onSuccess(LiveAnchorCallMeModel data) {
if (data.getIsGet() == 1) {
new LiveUserAnchorMailBoxWebInfoPopDialog(mContext, mAnchorName, data.getLink()).setOnDismissListener(dialog -> {
checkNewLetter();
loading.dismiss();
}).showDialog();
return;
}
new LiveContactDetailsSendGiftDialog(mContext).setGiftId(data.getGiftId()).setAnchorName(mAnchorName).setStream(mStream).setLiveUid(mLiveUid).setOnDismissListener(dialog1 -> {
checkNewLetter();
}).showDialog();
loading.dismiss();
}
@Override
public void onError(String error) {
loading.dismiss();
}
});
} else {
MobclickAgent.onEvent(mContext, "live_room_wish", "心愿单按钮");
BannerBean bean = mTopBannerList.get(position);
IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
String type = "";
StringBuffer htmlUrl = new StringBuffer();
htmlUrl.append(bean.getLink()).append(bean.getLink().contains("?") ? "&uid=" : "?uid=").append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&anchorUid=").append(mLiveUid).append("&liveUid=").append(mLiveUid).append("&t=").append(System.currentTimeMillis()).append("&g=Appapi&m=Wish&a=index").append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false, 1);
} else {
Bundle bundle = new Bundle();
bundle.putString("url", htmlUrl.toString());
LiveHDDialogFragment fragment = new LiveHDDialogFragment();
fragment.setArguments(bundle);
fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");
}
}
}
}
}).start();
//updateCallMe();
}
private void updateCallMe() {
LiveNetManager.get(mContext).getContactInfo(mLiveUid, new com.yunbao.common.http.base.HttpCallback<LiveAnchorCallMeModel>() {
@Override
public void onSuccess(LiveAnchorCallMeModel data) {
System.out.println(">>>>> 获取联系方式：" + data);
if (data.getIsShow() == 1) {
if (!isHinde) {
topBanner1.setVisibility(View.VISIBLE);
}
BannerBean call = new BannerBean();
call.setData(data);
call.setType(TopBannerCustomViewHolder.TYPE_CALL_ANCHOR);
mTopBannerList.add(0, call);
topBanner1.update(mTopBannerList);
topBanner2.update(mTopBannerList);
}
}
@Override
public void onError(String error) {
System.out.println("!>>>>> 获取联系方式：" + error);
}
});
}
private synchronized void checkNewLetter() {
LiveNetManager.get(mContext).getContactMsg(1, new com.yunbao.common.http.base.HttpCallback<List<LiveUserMailBoxModel>>() {
@Override
public void onSuccess(List<LiveUserMailBoxModel> data) {
@ -6432,16 +6329,12 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} else {
((LiveAudienceActivity) mContext).showMsgRed(-1);
}
}
@Override
public void onError(String error) {
}
});
}
public void blindBoxAllServerNotify(AllServerNotifyEvent event) {

13
live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java
View File

@ -229,7 +229,7 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
findViewById(R.id.btn_task).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
((LiveSwAnchorActivity) mContext).showFunctionDialog();
((LiveSwAnchorActivity) mContext).showTaskDialog();
}
});
findViewById(R.id.btn_fz).setOnClickListener(new View.OnClickListener() {
@ -313,17 +313,6 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
* 设置连麦pk按钮是否可见
*/
public void setPkBtnVisible(boolean visible) {
if (mBtnPk != null) {
if (visible) {
if (mBtnPk.getVisibility() != View.VISIBLE) {
mBtnPk.setVisibility(View.VISIBLE);
}
} else {
if (mBtnPk.getVisibility() == View.VISIBLE) {
mBtnPk.setVisibility(View.INVISIBLE);
}
}
}
}
/**

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

@ -639,7 +639,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
//心愿单顶部bannner
mLiveRoomViewHolder.setWishListProgress(data.getWishListProgress());
//初始化顶部banner
mLiveRoomViewHolder.initTopBanner();
mLiveRoomViewHolder.initWishListView();
mLiveRoomViewHolder.updateTopBanner();
mLiveRoomViewHolder.setVoteData(data.getEnterRoomInfo().getVoteModel());
mLiveRoomViewHolder.updateFansMessageRed();

2
live/src/main/res/drawable/bg_live_item.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="10dp"/>
<solid android:color="#30000000"/>
<solid android:color="#8065615A"/>
</shape>

5
live/src/main/res/drawable/bg_live_item_an.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="18dp"/>
<solid android:color="#8065615A"/>
</shape>

9
live/src/main/res/drawable/bg_live_room_mic_num.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<corners android:radius="30dp" />
<solid android:color="#FFFFB410" />
</shape>
</item>
</selector>

2
live/src/main/res/drawable/bg_push_time_point.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/global"/>
<solid android:color="#FFFE4C4B"/>
</shape>

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

@ -2,6 +2,45 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<RelativeLayout
android:id="@+id/avatarLayout"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingTop="8dp"
android:visibility="gone"
tools:visibility="visible">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/msg_avatar"
android:layout_width="21dp"
android:layout_height="21dp"
android:layout_marginStart="10dp"
android:layout_marginTop="5dp"
android:layout_marginEnd="1dp"
android:layout_marginBottom="11dp"
android:scaleType="centerCrop"
android:src="@drawable/m_chu_xia"
android:visibility="gone"
app:riv_oval="true"
tools:visibility="visible" />
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/avatar_gift_svga"
android:layout_width="31dp"
android:layout_height="31dp"
android:layout_marginStart="5dp"
android:visibility="gone"
app:autoPlay="true"
tools:visibility="visible" />
</RelativeLayout>
<LinearLayout
android:id="@+id/bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -14,13 +53,14 @@
android:layout_height="wrap_content"
android:layout_marginLeft="9dp"
android:layout_marginRight="9dp"
android:layout_toEndOf="@+id/avatar_gift_svga"
android:breakStrategy="simple"
android:paddingBottom="7dp"
android:textColor="#fff"
android:breakStrategy="simple"
android:textSize="12sp"
tools:text="aaaaaaaaa111111111111111111111111111111111111111111111111111111111"
android:visibility="visible"
tools:ignore="RtlHardcoded" />
tools:ignore="RtlHardcoded"
tools:text="aaaaaaaaa111111111111111111111111111111111111111111111111111111111" />
<LinearLayout
android:id="@+id/view_follow"
@ -249,7 +289,6 @@
<TextView
android:id="@+id/prank_open_live_msg"
android:layout_width="match_parent"
android:paddingStart="10dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="5dp"
@ -259,6 +298,7 @@
android:clickable="false"
android:enabled="false"
android:gravity="start"
android:paddingStart="10dp"
android:text="@string/prank_open_live_msg"
android:textColor="#FFFFFF"
android:textSize="12sp" />
@ -269,10 +309,10 @@
android:layout_height="26dp"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="11dp"
android:text="@string/prank_im_immediately_go"
android:gravity="center"
android:textColor="@color/white"
android:background="@drawable/prank_msg_goto"
android:gravity="center"
android:text="@string/prank_im_immediately_go"
android:textColor="@color/white"
android:textSize="10dp" />
</androidx.appcompat.widget.LinearLayoutCompat>
@ -302,3 +342,6 @@
tools:ignore="RtlHardcoded" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

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

@ -36,7 +36,6 @@
</LinearLayout>
<LinearLayout
android:id="@+id/btn_onecz_event"
android:layout_width="55dp"

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

@ -48,7 +48,7 @@
android:id="@+id/pk_container"
android:layout_width="match_parent"
android:layout_height="280dp"
android:layout_marginTop="130dp">
android:layout_marginTop="165dp">
<com.yunbao.live.custom.MyFrameLayout4
android:id="@+id/left_container"
@ -68,7 +68,7 @@
android:id="@+id/dr_pk_view"
android:layout_width="match_parent"
android:layout_height="280dp"
android:layout_marginTop="130dp"
android:layout_marginTop="165dp"
android:orientation="horizontal"
android:visibility="gone">

10
live/src/main/res/layout/view_live_push_sw.xml
View File

@ -42,7 +42,7 @@
android:id="@+id/dr_pk_view"
android:layout_width="match_parent"
android:layout_height="270dp"
android:layout_marginTop="130dp"
android:layout_marginTop="165dp"
android:orientation="horizontal"
android:visibility="gone"
tools:visibility="visible">
@ -126,7 +126,7 @@
android:id="@+id/pk_container"
android:layout_width="match_parent"
android:layout_height="270dp"
android:layout_marginTop="130dp">
android:layout_marginTop="165dp">
<com.yunbao.live.custom.MyFrameLayout4
android:id="@+id/left_container"
@ -142,12 +142,13 @@
android:layout_marginBottom="20dp" />
</FrameLayout>
<LinearLayout
android:id="@+id/goto_room_view"
android:layout_width="wrap_content"
android:layout_height="27dp"
android:layout_alignParentRight="true"
android:layout_marginTop="130dp"
android:layout_marginTop="170dp"
android:layout_marginRight="9dp"
android:background="@drawable/bg_live_other_ico"
android:gravity="center"
@ -182,12 +183,13 @@
android:textSize="12sp" />
</LinearLayout>
<TextView
android:id="@+id/btn_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginTop="400dp"
android:layout_marginTop="435dp"
android:layout_marginRight="8dp"
android:background="@drawable/background_dedede"
android:paddingLeft="8dp"

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

@ -8,7 +8,6 @@
android:layout_marginBottom="45dp"
android:paddingTop="15dp">
<LinearLayout
android:id="@+id/lin"
android:layout_width="match_parent"
@ -22,7 +21,7 @@
android:layout_height="34dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="4dp"
android:background="@drawable/bg_live_ico"
android:background="@drawable/bg_live_item_an"
android:gravity="center_vertical"
android:orientation="horizontal">
@ -162,18 +161,18 @@
<ImageView
android:id="@+id/user_more"
android:layout_width="27dp"
android:layout_height="40dp"
android:layout_width="24dp"
android:layout_height="34dp"
android:layout_gravity="center"
android:src="@mipmap/live_users_more" />
<ImageView
android:id="@+id/btn_close"
android:layout_width="27dp"
android:layout_height="40dp"
android:layout_width="17dp"
android:layout_height="17dp"
android:layout_gravity="center"
android:layout_marginStart="6dp"
android:layout_marginEnd="4dp"
android:layout_marginEnd="10dp"
android:scaleType="fitCenter"
android:src="@mipmap/icon_live_close_3" />
</LinearLayout>
@ -236,50 +235,6 @@
android:visibility="gone" />
</RelativeLayout>
<FrameLayout
android:id="@+id/hour_rank_layout"
android:layout_width="80dp"
android:layout_height="20dp"
android:layout_below="@id/lin"
android:layout_marginLeft="10dp"
android:layout_marginTop="8dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/hour_rank_layout2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal" />
<include
layout="@layout/view_wish_list"
android:layout_width="14dp"
android:layout_height="14dp"
android:src="@mipmap/live_icon_wishlist"
android:visibility="gone"
tools:visibility="visible" />
<ViewFlipper
android:id="@+id/hour_rank_list"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_marginStart="0dp"
android:layout_marginEnd="14dp"
android:flipInterval="5000"
android:inAnimation="@anim/anim_marquee_in"
android:outAnimation="@anim/anim_marquee_out" />
<ImageView
android:layout_width="4dp"
android:layout_height="8dp"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="6dp"
android:src="@drawable/live_icon_right_more" />
</FrameLayout>
<LinearLayout
android:id="@+id/topLayout1"
android:layout_width="match_parent"
@ -299,8 +254,7 @@
android:orientation="horizontal"
android:paddingLeft="8dp"
android:paddingRight="5dp"
android:visibility="gone"
tools:visibility="visible">
android:visibility="gone">
<ImageView
android:layout_width="13dp"
@ -325,13 +279,67 @@
android:textSize="10sp" />
</LinearLayout>
<!--小时榜-->
<FrameLayout
android:id="@+id/hour_rank_layout"
android:layout_width="80dp"
android:layout_height="23dp"
android:layout_marginEnd="7dp"
android:background="@drawable/bg_live_item"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/hour_rank_layout2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal" />
<include
layout="@layout/view_wish_list"
android:layout_width="14dp"
android:layout_height="14dp"
android:src="@mipmap/live_icon_wishlist"
android:visibility="gone"
tools:visibility="visible" />
<ViewFlipper
android:id="@+id/hour_rank_list"
android:layout_width="wrap_content"
android:layout_height="23dp"
android:layout_marginStart="0dp"
android:layout_marginEnd="14dp"
android:flipInterval="5000"
android:inAnimation="@anim/anim_marquee_in"
android:outAnimation="@anim/anim_marquee_out" />
<ImageView
android:layout_width="4dp"
android:layout_height="8dp"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="6dp"
android:src="@drawable/live_icon_right_more" />
</FrameLayout>
<!--贵族-->
<LinearLayout
android:id="@+id/noble_seat"
android:layout_width="wrap_content"
android:layout_height="23dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="7dp"
android:background="@drawable/bg_live_item"
android:visibility="visible">
<include layout="@layout/view_noble_seat" />
</LinearLayout>
<!--天梯赛-->
<FrameLayout
android:id="@+id/live_rank_pk"
android:layout_width="85dp"
android:layout_height="20dp"
android:layout_alignParentEnd="true"
android:layout_marginEnd="10dp"
android:layout_height="23dp"
android:background="@drawable/bg_live_item"
android:clickable="true"
android:focusable="true"
android:visibility="visible">
@ -351,7 +359,6 @@
android:inAnimation="@anim/anim_marquee_in"
android:outAnimation="@anim/anim_marquee_out" />
</FrameLayout>
</LinearLayout>
@ -359,7 +366,7 @@
<LinearLayout
android:id="@+id/topLayout2"
android:layout_width="match_parent"
android:layout_height="38dp"
android:layout_height="40dp"
android:layout_below="@+id/topLayout1"
android:layout_marginTop="5dp"
android:orientation="horizontal">
@ -369,47 +376,52 @@
android:layout_width="82dp"
android:layout_height="match_parent"
android:layout_marginStart="12dp"
android:layout_marginEnd="7dp"
android:background="@mipmap/bg_live_room_task"
android:gravity="center">
android:gravity="center"
android:visibility="gone"
tools:visibility="visible">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:text="新手任務"
android:text="@string/live_room_new_task"
android:textColor="#1D386B"
android:textSize="10dp" />
<ImageView
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginStart="2dp"
android:src="@mipmap/icon_live_room_task" />
</LinearLayout>
<!--红包-->
<RelativeLayout
android:id="@+id/red_packet"
android:layout_width="38dp"
android:layout_height="match_parent">
android:layout_width="40dp"
android:layout_height="match_parent"
android:layout_marginStart="12dp"
android:visibility="gone"
tools:visibility="visible">
<ImageView
android:layout_width="38dp"
android:layout_height="38dp"
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@mipmap/icon_red_packet_new" />
<TextView
android:id="@+id/red_packet_countdown"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:gravity="center_vertical"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:background="@mipmap/bg_live_room_red_time"
android:gravity="center"
android:text="@string/red_packet_countdown"
android:textColor="@color/white"
android:textSize="9sp"
android:visibility="gone" />
android:textSize="7sp"
android:visibility="visible" />
<LinearLayout
android:id="@+id/red_packet_queue"
@ -442,20 +454,20 @@
</LinearLayout>
</RelativeLayout>
<!---->
<RelativeLayout
android:id="@+id/dragon_immediate_participation"
android:layout_width="38dp"
android:layout_width="40dp"
android:layout_height="match_parent"
android:layout_marginStart="10dp"
android:layout_marginStart="12dp"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
<ImageView
android:layout_width="38dp"
android:layout_height="38dp"
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@mipmap/icon_live_dragon_money" />
<TextView
@ -470,20 +482,20 @@
android:textSize="7sp"
android:textStyle="bold" />
</RelativeLayout>
<!---->
<RelativeLayout
android:id="@+id/dragon_immediate_participation_time"
android:layout_width="38dp"
android:layout_width="40dp"
android:layout_height="match_parent"
android:layout_marginStart="10dp"
android:layout_marginStart="12dp"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
<ImageView
android:layout_width="38dp"
android:layout_height="38dp"
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@mipmap/icon_live_dragon_money" />
<TextView
@ -504,67 +516,142 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<!--礼物墙-->
<LinearLayout
android:layout_marginEnd="12dp"
android:id="@+id/giftLayout"
android:layout_width="82dp"
android:layout_height="38dp"
android:layout_height="match_parent"
android:layout_gravity="end"
android:layout_marginEnd="9dp"
android:background="@mipmap/bg_live_room_gift"
android:orientation="horizontal"
android:background="@mipmap/bg_live_room_gift">
android:visibility="gone"
tools:visibility="visible">
<LinearLayout
android:paddingStart="6dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical">
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingStart="6dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="禮物牆"
android:layout_height="12dp"
android:text="@string/live_room_gift"
android:textColor="#FFFFFF"
android:textSize="10dp" />
<LinearLayout
android:layout_width="wrap_content"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_height="16dp"
android:gravity="bottom"
android:orientation="horizontal">
<TextView
android:id="@+id/gift_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="5"
android:text="11"
android:textColor="#FFC949"
android:textSize="15dp" />
<TextView
android:id="@+id/gift_total"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="/26"
android:text="22"
android:textColor="#FFFFFF"
android:textSize="14dp" />
android:textSize="12dp" />
</LinearLayout>
<ProgressBar
android:id="@+id/progressbar"
android:id="@+id/gift_progressbar"
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_width="30dp"
android:layout_height="1.5dp"
android:max="26"
android:progress="5"
android:progressDrawable="@drawable/bg_horizontal_progressbar" />
android:layout_marginTop="2dp"
android:progressDrawable="@drawable/bg_gift_progressbar" />
</LinearLayout>
<ImageView
android:layout_marginStart="10dp"
android:src="@mipmap/icon_live_room_gift"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"/>
android:layout_marginStart="10dp"
android:src="@mipmap/icon_live_room_gift" />
</LinearLayout>
<!--心愿单-->
<LinearLayout
android:id="@+id/wishlistLayout"
android:layout_width="82dp"
android:layout_height="match_parent"
android:layout_gravity="end"
android:layout_marginEnd="12dp"
android:background="@mipmap/bg_live_room_wishlist"
android:orientation="horizontal"
android:visibility="gone"
tools:visibility="visible">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingStart="6dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="12dp"
android:gravity="center"
android:text="@string/live_room_wishlist"
android:textColor="#FFFFFF"
android:textSize="10dp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="16dp"
android:gravity="bottom"
android:orientation="horizontal">
<TextView
android:id="@+id/wish_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="11"
android:textColor="#FFC949"
android:textSize="15dp" />
<TextView
android:id="@+id/wish_total"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="22"
android:textColor="#FFFFFF"
android:textSize="12dp" />
</LinearLayout>
<ProgressBar
android:id="@+id/wishlist_progressbar"
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="30dp"
android:layout_height="1.5dp"
android:layout_marginTop="2dp"
android:progressDrawable="@drawable/bg_gift_progressbar" />
</LinearLayout>
<ImageView
android:id="@+id/wish_icon"
android:layout_width="28dp"
android:layout_height="28dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="10dp"
android:src="@mipmap/icon_live_room_gift" />
</LinearLayout>
@ -578,14 +665,12 @@
android:layout_below="@id/lin"
android:layout_marginLeft="10dp"
android:layout_marginTop="8dp"
android:layout_toRightOf="@id/hour_rank_layout"
android:background="@drawable/bg_live_item"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="8dp"
android:paddingRight="5dp"
android:visibility="gone"
tools:visibility="visible">
android:visibility="gone">
<ImageView
android:layout_width="13dp"
@ -621,9 +706,7 @@
android:id="@+id/btn_guard"
android:layout_width="wrap_content"
android:layout_height="21dp"
android:layout_alignTop="@id/hour_rank_layout"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/hour_rank_layout"
android:background="@drawable/bg_live_item"
android:gravity="center_vertical"
android:orientation="horizontal"
@ -657,12 +740,10 @@
android:id="@+id/live_wks_layout"
android:layout_width="70dp"
android:layout_height="20dp"
android:layout_alignTop="@id/hour_rank_layout"
android:layout_marginStart="4dp"
android:layout_toRightOf="@id/hour_rank_layout"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="visible">
android:visibility="gone">
<LinearLayout
android:id="@+id/live_wks_layout2"
@ -670,16 +751,6 @@
android:layout_height="match_parent"
android:orientation="horizontal" />
<ViewFlipper
android:id="@+id/live_wks_and_gift_wall"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_marginStart="0dp"
android:flipInterval="5000"
android:inAnimation="@anim/anim_marquee_in"
android:outAnimation="@anim/anim_marquee_out" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
@ -704,15 +775,12 @@
android:visibility="gone" />
</LinearLayout>
</FrameLayout>
<!--心愿单-->
<LinearLayout
android:id="@+id/wish_list_layout"
android:layout_width="80dp"
android:layout_height="21dp"
android:layout_alignTop="@id/hour_rank_layout"
android:layout_marginStart="10dp"
android:layout_toRightOf="@id/live_wks_layout"
android:background="@drawable/bg_live_item"
@ -739,24 +807,12 @@
</LinearLayout>
<LinearLayout
android:id="@+id/noble_seat"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@id/hour_rank_layout"
android:layout_marginStart="4dp"
android:layout_toEndOf="@id/live_wks_layout"
android:visibility="visible">
<include layout="@layout/view_noble_seat" />
</LinearLayout>
<!--粉丝团-->
<LinearLayout
android:id="@+id/fans_btn"
android:layout_width="wrap_content"
android:layout_height="21dp"
android:layout_below="@id/lin"
android:layout_alignTop="@id/hour_rank_layout"
android:background="@drawable/bg_live_item"
android:gravity="center_vertical"
android:orientation="horizontal"
@ -791,7 +847,6 @@
android:id="@+id/open_sidebar"
android:layout_width="65dp"
android:layout_height="20dp"
android:layout_alignTop="@id/hour_rank_layout"
android:layout_alignParentRight="true"
android:background="@drawable/bg_live_item_right"
android:clickable="true"
@ -820,7 +875,6 @@
android:id="@+id/btn_noble"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_alignTop="@id/hour_rank_layout"
android:layout_toRightOf="@id/btn_guard"
android:paddingLeft="8dp"
android:paddingRight="5dp"
@ -832,7 +886,6 @@
android:id="@+id/btn_medal_rank"
android:layout_width="wrap_content"
android:layout_height="21dp"
android:layout_alignTop="@id/hour_rank_layout"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/btn_guard"
android:background="@drawable/bg_live_item"
@ -863,13 +916,13 @@
android:layout_width="10dp"
android:layout_height="10dp"
android:src="@mipmap/icon_arrow_right" />
</LinearLayout>
<FrameLayout
android:id="@+id/luck_container"
android:layout_width="match_parent"
android:layout_height="20dp"
android:layout_alignTop="@id/hour_rank_layout"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_toRightOf="@id/btn_medal_rank" />
@ -878,7 +931,6 @@
android:id="@+id/live_time"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_below="@id/hour_rank_layout"
android:layout_alignParentRight="true"
android:layout_marginEnd="10dp"
android:background="@drawable/bg_live_push_time"
@ -912,9 +964,9 @@
android:id="@+id/goto_room_view"
android:layout_width="wrap_content"
android:layout_height="27dp"
android:layout_below="@id/open_sidebar"
android:layout_below="@id/topLayout2"
android:layout_alignParentRight="true"
android:layout_marginTop="20dp"
android:layout_marginTop="15dp"
android:layout_marginRight="9dp"
android:background="@drawable/bg_live_other_ico"
android:gravity="center">
@ -1008,7 +1060,6 @@
android:id="@+id/btn_red_pack"
android:layout_width="40dp"
android:layout_height="50dp"
android:layout_below="@id/hour_rank_layout"
android:layout_alignParentRight="true"
android:layout_marginTop="80dp"
android:layout_marginRight="10dp"
@ -1098,7 +1149,6 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<com.yunbao.common.custom.MyFrameLayout2
android:id="@+id/enter_room_group"
android:layout_width="match_parent"
@ -1170,7 +1220,6 @@
android:id="@+id/title_container"
android:layout_width="match_parent"
android:layout_height="26dp"
android:layout_below="@id/hour_rank_layout"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp" />
@ -1179,7 +1228,6 @@
android:id="@+id/gif_gift_tip_group"
android:layout_width="wrap_content"
android:layout_height="26dp"
android:layout_below="@id/hour_rank_layout"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
@ -1716,7 +1764,7 @@
android:layout_height="28dp"
android:layout_alignTop="@+id/live_video"
android:layout_centerHorizontal="true"
android:layout_marginTop="40dp"
android:layout_marginTop="80dp"
android:src="@mipmap/icon_rank_top_box"
android:visibility="visible" />
@ -1724,7 +1772,7 @@
android:id="@+id/lt_pk_line"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/live_top"
android:layout_marginTop="148dp"
android:visibility="gone"
tools:visibility="visible">
@ -2464,116 +2512,215 @@
android:visibility="gone" />
</RelativeLayout>
<!--連麥-->
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginTop="190dp"
android:layout_marginRight="18dp"
android:gravity="bottom"
android:layout_marginRight="10dp"
android:gravity="bottom|center_horizontal"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/mic_view2"
android:layout_width="40dp"
android:layout_height="50dp"
android:id="@+id/mic_view"
android:layout_width="match_parent"
android:layout_height="65dp"
android:layout_marginTop="10dp"
android:visibility="invisible">
<View
android:layout_width="41dp"
android:layout_height="41dp"
android:layout_marginBottom="10dp"
android:background="@drawable/bg_live_mic_av" />
android:visibility="invisible"
tools:visibility="visible">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/mic_ico2"
android:layout_width="40dp"
android:layout_height="40dp"
android:id="@+id/mic_ico"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_centerHorizontal="true"
android:layout_marginStart="1dp"
android:layout_marginTop="1dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="1dp"
android:layout_marginBottom="11dp"
android:scaleType="centerCrop"
android:src="@drawable/m_chu_xia"
app:riv_oval="true" />
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/mic_gift_svga"
android:layout_width="42dp"
android:layout_height="38dp"
android:layout_centerHorizontal="true"
app:autoPlay="true" />
<ImageView
android:layout_width="18dp"
android:layout_height="18dp"
android:id="@+id/userVoice"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="40dp"
android:src="@mipmap/voice_open" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:src="@mipmap/voice" />
android:gravity="center">
<TextView
android:layout_width="8dp"
android:layout_height="8dp"
android:background="@drawable/bg_live_room_mic_num"
android:gravity="center"
android:text="1"
android:textColor="@color/white"
android:textSize="6dp" />
<TextView
android:id="@+id/userName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:ellipsize="end"
android:maxLines="1"
android:text="昵称"
android:textColor="@color/white"
android:textSize="10dp" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/mic_view1"
android:layout_width="40dp"
android:layout_height="50dp"
android:layout_width="match_parent"
android:layout_height="65dp"
android:layout_marginTop="10dp"
android:visibility="invisible">
<View
android:layout_width="41dp"
android:layout_height="41dp"
android:layout_marginBottom="10dp"
android:background="@drawable/bg_live_mic_av" />
android:visibility="invisible"
tools:visibility="visible">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/mic_ico1"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_centerHorizontal="true"
android:layout_marginStart="1dp"
android:layout_marginTop="1dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="1dp"
android:layout_marginBottom="11dp"
android:scaleType="centerCrop"
android:src="@drawable/m_chu_xia"
app:riv_oval="true" />
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/mic_gift_svga1"
android:layout_width="42dp"
android:layout_height="38dp"
android:layout_centerHorizontal="true"
app:autoPlay="true" />
<ImageView
android:layout_width="18dp"
android:layout_height="18dp"
android:id="@+id/userVoice1"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="40dp"
android:src="@mipmap/voice_open" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:src="@mipmap/voice" />
android:gravity="center">
<TextView
android:layout_width="8dp"
android:layout_height="8dp"
android:background="@drawable/bg_live_room_mic_num"
android:gravity="center"
android:text="2"
android:textColor="@color/white"
android:textSize="6dp" />
<TextView
android:id="@+id/userName1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:ellipsize="end"
android:maxLines="1"
android:text="昵称"
android:textColor="@color/white"
android:textSize="10dp" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/mic_view"
android:layout_width="40dp"
android:layout_height="50dp"
android:id="@+id/mic_view2"
android:layout_width="match_parent"
android:layout_height="65dp"
android:layout_marginTop="10dp"
android:visibility="invisible">
<View
android:layout_width="41dp"
android:layout_height="41dp"
android:layout_marginBottom="10dp"
android:background="@drawable/bg_live_mic_av" />
android:visibility="invisible"
tools:visibility="visible">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/mic_ico"
android:layout_width="40dp"
android:layout_height="40dp"
android:id="@+id/mic_ico2"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_centerHorizontal="true"
android:layout_marginStart="1dp"
android:layout_marginTop="1dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="1dp"
android:layout_marginBottom="11dp"
android:scaleType="centerCrop"
android:src="@drawable/m_chu_xia"
app:riv_oval="true" />
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/mic_gift_svga2"
android:layout_width="42dp"
android:layout_height="38dp"
android:layout_centerHorizontal="true"
app:autoPlay="true" />
<ImageView
android:layout_width="18dp"
android:layout_height="18dp"
android:id="@+id/userVoice2"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="40dp"
android:src="@mipmap/voice_open" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:src="@mipmap/voice" />
android:gravity="center">
<TextView
android:layout_width="8dp"
android:layout_height="8dp"
android:background="@drawable/bg_live_room_mic_num"
android:gravity="center"
android:text="3"
android:textColor="@color/white"
android:textSize="6dp" />
<TextView
android:id="@+id/userName2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:ellipsize="end"
android:maxLines="1"
android:text="昵称"
android:textColor="@color/white"
android:textSize="10dp" />
</LinearLayout>
</RelativeLayout>
@ -2598,8 +2745,7 @@
<include
android:id="@+id/prank_group"
layout="@layout/view_prank_group"
android:visibility="gone"
tools:visibility="visible" />
android:visibility="gone" />
<pl.droidsonroids.gif.GifImageView
android:id="@+id/prank_small_icon"

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

@ -26,7 +26,7 @@
android:layout_marginTop="54dp"
android:layout_toRightOf="@+id/btn_horizontally"
android:padding="3dp"
android:src="@mipmap/icon_fhd"
android:src="@mipmap/icon_sd"
app:layout_constraintStart_toEndOf="@+id/btn_camera"
app:layout_constraintTop_toTopOf="parent" />

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

@ -2,14 +2,14 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="23dp"
android:orientation="vertical"
tools:ignore="MissingDefaultResource">
<FrameLayout
android:id="@+id/wish_list_layout"
android:layout_width="75dp"
android:layout_height="20dp"
android:layout_height="23dp"
android:orientation="horizontal"
android:visibility="visible">

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

@ -10,7 +10,7 @@
android:id="@+id/live_time"
android:layout_width="wrap_content"
android:layout_height="23dp"
android:layout_marginTop="100dp"
android:layout_marginTop="90dp"
android:layout_gravity="end"
android:layout_centerVertical="true"
android:layout_marginEnd="10dp"
@ -286,7 +286,7 @@
android:textColor="#fff"
android:textSize="10sp"
android:translationY="-4dp"
android:visibility="visible" />
android:visibility="gone" />
</RelativeLayout>

BIN
live/src/main/res/mipmap-mdpi/icon_live_close_3.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.4 KiB

BIN
live/src/main/res/mipmap-mdpi/live_users_more.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
live/src/main/res/mipmap-xhdpi/bg_live_room_wishlist.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

BIN
live/src/main/res/mipmap-xhdpi/voice_close.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
live/src/main/res/mipmap-xhdpi/voice_open.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

5
live/src/main/res/values-zh/strings.xml
View File

@ -62,7 +62,7 @@
<string name="live_task_item_complete_false">未完成</string>
<string name="live_task_item_hot">直播熱度</string>
<string name="live_task_item_xp">主播經驗</string>
<string name="live_data_msg1">本場直播數據統計</string>
<string name="live_data_msg1">本場直播信息</string>
<string name="live_data_msg2">歷史數據可在主播中心查看</string>
<string name="live_data_tip">* 人數及新增相關數據非实时计算</string>
<string name="live_user_mailbox_top_text">来自%s的信</string>
@ -162,5 +162,8 @@
<string name="live_end_minute">分鐘</string>
<string name="live_data_now_bottom_zs">本場總計鑽石:</string>
<string name="live_data_now_bottom_person">打賞人數:</string>
<string name="live_room_gift">禮物牆</string>
<string name="live_room_wishlist">心願</string>
<string name="live_room_new_task">新手任務</string>
</resources>

2
live/src/main/res/values/dimen.xml
View File

@ -1,5 +1,5 @@
<resources>
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="live_view">250dp</dimen>
<dimen name="live_top">120dp</dimen>
<dimen name="live_top">165dp</dimen>
</resources>

5
live/src/main/res/values/strings.xml
View File

@ -31,7 +31,7 @@
<string name="live_task_item_complete_false">incomplete</string>
<string name="live_task_item_hot">hot</string>
<string name="live_task_item_xp">exp</string>
<string name="live_data_msg1">This live data statistics</string>
<string name="live_data_msg1">This live information</string>
<string name="live_data_msg2">Historical data can be viewed in the anchor center</string>
<string name="live_data_tip">* Non-real-time calculation of data</string>
@ -165,4 +165,7 @@
<string name="live_end_minute">minute</string>
<string name="live_data_now_bottom_zs">Get diamonds:</string>
<string name="live_data_now_bottom_person">Gift givers:</string>
<string name="live_room_gift">Gift Wall</string>
<string name="live_room_wishlist">Wishlist</string>
<string name="live_room_new_task">Newb job</string>
</resources>

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

@ -31,7 +31,7 @@
<string name="live_task_item_complete_false">incomplete</string>
<string name="live_task_item_hot">hot</string>
<string name="live_task_item_xp">exp</string>
<string name="live_data_msg1">This live data statistics</string>
<string name="live_data_msg1">This live information</string>
<string name="live_data_msg2">Historical data can be viewed in the anchor center</string>
<string name="live_data_tip">* Non-real-time calculation of data</string>