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 TextView titleSDText, titleHDText, titleFHDText, mTips;
private int banSelect; private int banSelect;
private boolean isUser = false; private boolean isUser = false;
private SelectPositionListener selectPositionListener;
public int getSelectClarity() { public int getSelectClarity() {
return selectClarity; return selectClarity;
} }
public void setSelectPositionListener(SelectPositionListener selectPositionListener) {
this.selectPositionListener = selectPositionListener;
}
/** /**
* @param banSelect 禁止选项，{@link #BAN_720} 禁止高清和超高清。 {@link #BAN_1080} 禁止超高清 * @param banSelect 禁止选项，{@link #BAN_720} 禁止高清和超高清。 {@link #BAN_1080} 禁止超高清
* @param isUser 是否为观众，true 观众，false 主播 * @param isUser 是否为观众，true 观众，false 主播
@ -227,6 +232,13 @@ public class LiveClarityCustomPopup extends BottomPopupView implements View.OnCl
iconFhd.setVisibility(VISIBLE); iconFhd.setVisibility(VISIBLE);
break; break;
} }
if(selectPositionListener!=null){
selectPositionListener.onSelect(selectClarity);
}
}
public interface SelectPositionListener{
void onSelect(int position);
} }
private Handler netHandler = new Handler(); 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 <LinearLayout
android:id="@+id/interactionLayout" android:id="@+id/interactionLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:orientation="vertical" android:layout_height="wrap_content"
android:layout_height="wrap_content"> android:orientation="vertical">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -41,9 +41,10 @@
android:src="@mipmap/icon_interaction_zg" /> android:src="@mipmap/icon_interaction_zg" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:gravity="center"
android:text="@string/live_zg" android:text="@string/live_zg"
android:textColor="#FF9A9A9A" android:textColor="#FF9A9A9A"
android:textSize="12sp" /> android:textSize="12sp" />
@ -63,9 +64,10 @@
android:src="@mipmap/icon_interaction_wish" /> android:src="@mipmap/icon_interaction_wish" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:gravity="center"
android:text="@string/live_wishlist" android:text="@string/live_wishlist"
android:textColor="#FF9A9A9A" android:textColor="#FF9A9A9A"
android:textSize="12sp" /> android:textSize="12sp" />
@ -74,8 +76,8 @@
<LinearLayout <LinearLayout
android:id="@+id/live_tool_mic" android:id="@+id/live_tool_mic"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:visibility="visible"> android:visibility="visible">
@ -86,9 +88,10 @@
android:src="@mipmap/icon_interaction_mic" /> android:src="@mipmap/icon_interaction_mic" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:gravity="center"
android:text="@string/live_mic" android:text="@string/live_mic"
android:textColor="#FF9A9A9A" android:textColor="#FF9A9A9A"
android:textSize="12sp" /> android:textSize="12sp" />
@ -97,8 +100,8 @@
<LinearLayout <LinearLayout
android:id="@+id/live_tool_game" android:id="@+id/live_tool_game"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
@ -108,9 +111,10 @@
android:src="@mipmap/icon_interaction_game" /> android:src="@mipmap/icon_interaction_game" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:gravity="center"
android:text="@string/interactive_game" android:text="@string/interactive_game"
android:textColor="#FF9A9A9A" android:textColor="#FF9A9A9A"
android:textSize="12sp" /> android:textSize="12sp" />
@ -126,8 +130,8 @@
<LinearLayout <LinearLayout
android:id="@+id/live_tool_anchor_say" android:id="@+id/live_tool_anchor_say"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
@ -137,9 +141,10 @@
android:src="@mipmap/icon_interaction_anchor_say" /> android:src="@mipmap/icon_interaction_anchor_say" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:gravity="center"
android:text="@string/live_fun_anchor_say" android:text="@string/live_fun_anchor_say"
android:textColor="#FF9A9A9A" android:textColor="#FF9A9A9A"
android:textSize="12sp" /> android:textSize="12sp" />
@ -148,8 +153,8 @@
<LinearLayout <LinearLayout
android:id="@+id/live_tool_qa" android:id="@+id/live_tool_qa"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
@ -159,17 +164,19 @@
android:src="@mipmap/icon_interaction_qa" /> android:src="@mipmap/icon_interaction_qa" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:gravity="center"
android:text="@string/dialog_live_function_qa" android:text="@string/dialog_live_function_qa"
android:textColor="#FF9A9A9A" android:textColor="#FF9A9A9A"
android:textSize="12sp" /> android:textSize="12sp" />
</LinearLayout> </LinearLayout>
<View <View
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="2" android:layout_height="match_parent"
android:layout_height="match_parent"/> android:layout_weight="2" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@ -177,8 +184,8 @@
<LinearLayout <LinearLayout
android:id="@+id/equityLayout" android:id="@+id/equityLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:orientation="vertical" android:layout_height="wrap_content"
android:layout_height="wrap_content"> android:orientation="vertical">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -209,9 +216,10 @@
android:src="@mipmap/icon_interaction_live_data" /> android:src="@mipmap/icon_interaction_live_data" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:gravity="center"
android:text="@string/broadcast_data" android:text="@string/broadcast_data"
android:textColor="#FF9A9A9A" android:textColor="#FF9A9A9A"
android:textSize="12sp" /> android:textSize="12sp" />
@ -231,9 +239,10 @@
android:src="@mipmap/icon_interaction_robot" /> android:src="@mipmap/icon_interaction_robot" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:gravity="center"
android:text="@string/robot_setup" android:text="@string/robot_setup"
android:textColor="#FF9A9A9A" android:textColor="#FF9A9A9A"
android:textSize="12sp" /> android:textSize="12sp" />
@ -241,9 +250,10 @@
<View <View
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="2" android:layout_height="match_parent"
android:layout_height="match_parent"/> android:layout_weight="2" />
</LinearLayout> </LinearLayout>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -252,18 +262,19 @@
android:text="@string/live_interaction_tools" android:text="@string/live_interaction_tools"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="14sp" /> android:textSize="14sp" />
<LinearLayout <LinearLayout
android:layout_marginTop="14dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="14dp"
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp"
android:paddingEnd="16dp"> android:paddingEnd="16dp">
<LinearLayout <LinearLayout
android:id="@+id/live_tool_beauty" android:id="@+id/live_tool_beauty"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
@ -273,9 +284,10 @@
android:src="@mipmap/icon_interaction_beauty" /> android:src="@mipmap/icon_interaction_beauty" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:gravity="center"
android:text="@string/live_beauty" android:text="@string/live_beauty"
android:textColor="#FF9A9A9A" android:textColor="#FF9A9A9A"
android:textSize="12sp" /> android:textSize="12sp" />
@ -284,8 +296,8 @@
<LinearLayout <LinearLayout
android:id="@+id/live_tool_camera" android:id="@+id/live_tool_camera"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
@ -295,9 +307,10 @@
android:src="@mipmap/icon_interaction_camera" /> android:src="@mipmap/icon_interaction_camera" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:gravity="center"
android:text="@string/live_camera" android:text="@string/live_camera"
android:textColor="#FF9A9A9A" android:textColor="#FF9A9A9A"
android:textSize="12sp" /> android:textSize="12sp" />
@ -306,8 +319,8 @@
<LinearLayout <LinearLayout
android:id="@+id/live_tool_leave" android:id="@+id/live_tool_leave"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
@ -319,17 +332,19 @@
<TextView <TextView
android:id="@+id/live_tool_leave_text" android:id="@+id/live_tool_leave_text"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:gravity="center"
android:text="@string/live_zslk" android:text="@string/live_zslk"
android:textColor="#FF9A9A9A" android:textColor="#FF9A9A9A"
android:textSize="12sp" /> android:textSize="12sp" />
</LinearLayout> </LinearLayout>
<View <View
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_height="match_parent"
android:layout_height="match_parent"/> android:layout_weight="1" />
</LinearLayout> </LinearLayout>
</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">Flip</string>
<string name="live_camera_s">Mirroring</string> <string name="live_camera_s">Mirroring</string>
<string name="live_zg">Trickster</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_mic">Voice connection</string>
<string name="live_wks">billboard</string> <string name="live_wks">billboard</string>
<string name="live_zslk">leave temporarily</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="lunar_wish">Month Wishes</string>
<string name="seasonal_wish">Seasonal Wishes</string> <string name="seasonal_wish">Seasonal Wishes</string>
<string name="wish_number">Wish%s</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="aristocrat_determine">sure</string>
<string name="replacement_wish_day">Reset Your: Day</string> <string name="replacement_wish_day">Reset Your: Day</string>
<string name="replacement_wish_zhou">Reset Wish: Week</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_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_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> </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_history_gain">收益</string>
<string name="live_data_tip">* 人數及新增相關數據非实时计算</string> <string name="live_data_tip">* 人數及新增相關數據非实时计算</string>
<string name="live_data_msg2">歷史數據可在主播中心查看</string> <string name="live_data_msg2">歷史數據可在主播中心查看</string>
<string name="live_data_msg1">本場直播數據統計</string> <string name="live_data_msg1">本場直播信息</string>
</resources> </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="must_hint">A maximum of 10 entries can be set</string>
<string name="live_camera">Flip</string> <string name="live_camera">Flip</string>
<string name="live_zg">Trickster</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_mic">Voice connection</string>
<string name="live_wks">billboard</string> <string name="live_wks">billboard</string>
<string name="live_zslk">leave temporarily</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="lunar_wish">Month Wishes</string>
<string name="seasonal_wish">Seasonal Wishes</string> <string name="seasonal_wish">Seasonal Wishes</string>
<string name="wish_number">Wish%s</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="aristocrat_determine">sure</string>
<string name="replacement_wish_day">Reset Your: Day</string> <string name="replacement_wish_day">Reset Your: Day</string>
<string name="replacement_wish_zhou">Reset Wish: Week</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_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_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> </resources>

4
config.gradle
View File

@ -4,8 +4,8 @@ ext {
buildToolsVersion: "29.0.2", buildToolsVersion: "29.0.2",
minSdkVersion : 23, minSdkVersion : 23,
targetSdkVersion : 34, targetSdkVersion : 34,
versionCode : 550, versionCode : 560,
versionName : "6.8.0", versionName : "6.8.2",
namespace : "com.pandoralive.shayu" namespace : "com.pandoralive.shayu"
] ]
manifestPlaceholders = [ 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.initRankPKInfo(mLiveUid,"");
//初始化心愿单数据
mLiveRoomViewHolder.initWishListView();
mLiveRoomViewHolder.initWishData();
} }
mLiveSwLinkMicPkPresenter.setmLiveRoomViewHolder(mLiveRoomViewHolder); mLiveSwLinkMicPkPresenter.setmLiveRoomViewHolder(mLiveRoomViewHolder);
} }
@ -1793,7 +1796,11 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
.build() .build()
.show(); .show();
break; break;
case WISH_LIST_PROGRESS:
if(mLiveRoomViewHolder!=null){
mLiveRoomViewHolder.wishListProgress(event.getWishListProgress(), event.getUname(), event.getLiveType());
}
break;
} }
} }

93
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.view.animation.AnimationUtils;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@ -41,6 +42,10 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.makeramen.roundedimageview.RoundedImageView; 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.CommonAppConfig;
import com.yunbao.common.Constants; import com.yunbao.common.Constants;
import com.yunbao.common.bean.IMLoginModel; 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.manager.IMLoginManager;
import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.SpUtil; import com.yunbao.common.utils.SpUtil;
import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.WordUtil; 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.utils.LoadDian9TuUtil;
import com.yunbao.live.views.LiveRoomViewHolder; import com.yunbao.live.views.LiveRoomViewHolder;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
@ -221,9 +229,13 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
LinearLayoutCompat attentionLayout; LinearLayoutCompat attentionLayout;
ClipPathCircleImage clipImage2; ClipPathCircleImage clipImage2;
LinearLayoutCompat prank_open_live_layout; LinearLayoutCompat prank_open_live_layout;
TextView prank_open_live_msg; TextView prank_open_live_msg;
TextView prank_to_setting; TextView prank_to_setting;
RoundedImageView msg_avatar;
SVGAImageView avatar_gift_svga;
RelativeLayout avatarLayout;
public Vh(View itemView) { public Vh(View itemView) {
super(itemView); super(itemView);
@ -255,6 +267,9 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
prank_open_live_msg = itemView.findViewById(R.id.prank_open_live_msg); prank_open_live_msg = itemView.findViewById(R.id.prank_open_live_msg);
prank_to_setting = itemView.findViewById(R.id.prank_to_setting); 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) { void setData(final LiveChatBean bean, int position) {
@ -262,9 +277,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
@Override @Override
public boolean onLongClick(View v) { public boolean onLongClick(View v) {
if (!TextUtils.isEmpty(bean.getId()) && !TextUtils.isEmpty(bean.getUserNiceName())) { if (!TextUtils.isEmpty(bean.getId()) && !TextUtils.isEmpty(bean.getUserNiceName())) {
Bus.get().post(new LiveAudienceEvent() Bus.get().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.INPUT_DIALOG).setOlineUserlistModel(new OlineUserlistModel().setId(bean.getId()).setUserNicename(bean.getUserNiceName())));
.setType(LiveAudienceEvent.LiveAudienceType.INPUT_DIALOG)
.setOlineUserlistModel(new OlineUserlistModel().setId(bean.getId()).setUserNicename(bean.getUserNiceName())));
} }
Log.e("eqwewqeweq", bean.toString()); Log.e("eqwewqeweq", bean.toString());
return true; return true;
@ -327,7 +340,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
int length2 = builder.length(); int length2 = builder.length();
builder.append(bean.getAnchorName()); builder.append(bean.getAnchorName());
builder.setSpan(new ForegroundColorSpan(0xFF73FFFF), length2, length2 + bean.getAnchorName().length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); builder.setSpan(new ForegroundColorSpan(0xFF73FFFF), length2, length2 + bean.getAnchorName().length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
builder.append(WordUtil.isNewZh() ? "發出了 " + bean.getContent(): "Sent out " + bean.getContent()); builder.append(WordUtil.isNewZh() ? "發出了 " + bean.getContent() : "Sent out " + bean.getContent());
mTextView.setText(builder); mTextView.setText(builder);
} else if (bean.getType() == -4) { } else if (bean.getType() == -4) {
String str1 = WordUtil.isNewZh() ? "成功拯救了 " : "Succeeded in saving"; String str1 = WordUtil.isNewZh() ? "成功拯救了 " : "Succeeded in saving";
@ -529,7 +542,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
if (!StringUtil.isEmpty(bean.getBubble())) { if (!StringUtil.isEmpty(bean.getBubble())) {
new LoadDian9TuUtil().loadDian9Tu(mContext, mBg, bean.getBubble(), 1); new LoadDian9TuUtil().loadDian9Tu(mContext, mBg, bean.getBubble(), 1);
} }
} else if(bean.getType() == TYPE_TO_ANCHOR_PRANK){ } else if (bean.getType() == TYPE_TO_ANCHOR_PRANK) {
/*String str1 = "<font color='#ff1a1a'>娛樂整蠱</font>"; /*String str1 = "<font color='#ff1a1a'>娛樂整蠱</font>";
String str2 = "<font color='#0d0d0d'>全新升級，快去設置整蠱内容，給直播間增加更多趣味吧！</font>"; String str2 = "<font color='#0d0d0d'>全新升級，快去設置整蠱内容，給直播間增加更多趣味吧！</font>";
String str3 = "<font color='#3384ff'>>>立即前往>></font>"; String str3 = "<font color='#3384ff'>>>立即前往>></font>";
@ -542,16 +555,47 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
mBg.setLayoutParams(params3); mBg.setLayoutParams(params3);
prank_open_live_layout.setVisibility(View.VISIBLE); prank_open_live_layout.setVisibility(View.VISIBLE);
}else if(bean.getType() == TYPE_TO_ANCHOR_PRANK_GIFT){ } else if (bean.getType() == TYPE_TO_ANCHOR_PRANK_GIFT) {
StringBuffer stringBuffer = new StringBuffer(); StringBuffer stringBuffer = new StringBuffer();
stringBuffer.append("<font color='#ffffff'>"+(WordUtil.isNewZh()?"整蠱來了!":"Tricky is coming")+"</font>"); stringBuffer.append("<font color='#ffffff'>" + (WordUtil.isNewZh() ? "整蠱來了!" : "Tricky is coming") + "</font>");
stringBuffer.append(" <font color='#ECB238'>"+bean.getUserNiceName()+"</font>"); stringBuffer.append(" <font color='#ECB238'>" + bean.getUserNiceName() + "</font>");
stringBuffer.append("<font color='#ffffff'>"+(WordUtil.isNewZh()?"送出":"send")+"【"+bean.getGiftName()+"*"+bean.getHot_num()+"】</font>"); stringBuffer.append("<font color='#ffffff'>" + (WordUtil.isNewZh() ? "送出" : "send") + "【" + bean.getGiftName() + "*" + bean.getHot_num() + "】</font>");
stringBuffer.append("<font color='#ffffff'>，"+(WordUtil.isNewZh()?"主播需完成":",and the anchor needs to complete ")+"</font>"); stringBuffer.append("<font color='#ffffff'>，" + (WordUtil.isNewZh() ? "主播需完成" : ",and the anchor needs to complete ") + "</font>");
stringBuffer.append( "<font color='#ECB238'>【"+bean.getContent()+"】</font>"); stringBuffer.append("<font color='#ECB238'>【" + bean.getContent() + "】</font>");
mTextView.setText(Html.fromHtml(stringBuffer.toString())); mTextView.setText(Html.fromHtml(stringBuffer.toString()));
new LoadDian9TuUtil().loadDian9TuAssets(mContext, mBg, 1); new LoadDian9TuUtil().loadDian9TuAssets(mContext, mBg, 1);
}else{ } 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("")) { if (bean.getBubble() != null && !bean.getBubble().equals("")) {
//加载.9图聊天气泡 //加载.9图聊天气泡
new LoadDian9TuUtil().loadDian9Tu(mContext, mBg, bean.getBubble(), 1); new LoadDian9TuUtil().loadDian9Tu(mContext, mBg, bean.getBubble(), 1);
@ -577,8 +621,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
if (bean == null) { if (bean == null) {
return; return;
} }
if (bean.getType() == LiveChatBean.TYPE_TO_USER_MSG if (bean.getType() == LiveChatBean.TYPE_TO_USER_MSG && !CommonAppConfig.getInstance().getUid().equals(bean.getAtUserID())) {
&& !CommonAppConfig.getInstance().getUid().equals(bean.getAtUserID())) {
return; return;
} }
// Log.i(TAG, "insertItem: " + bean.getContent()+" size = "+(mList.size()+1)); // Log.i(TAG, "insertItem: " + bean.getContent()+" size = "+(mList.size()+1));
@ -599,14 +642,10 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
if (isBottom || mRecyclerViewScrolledDy == 0) { if (isBottom || mRecyclerViewScrolledDy == 0) {
scrollToBottom(); scrollToBottom();
} else { } else {
Bus.get().post(new LiveAudienceEvent() Bus.get().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.NEW_MESSAGE_REMINDER));
.setType(LiveAudienceEvent.LiveAudienceType.NEW_MESSAGE_REMINDER));
if (bean.getType() != LiveChatBean.TYPE_TO_USER_MSG && if (bean.getType() != LiveChatBean.TYPE_TO_USER_MSG && bean.getAtUserID() != null && bean.getAtUserID().contains(String.valueOf(model.getId()))) {
bean.getAtUserID() != null Bus.get().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.AT_MESSAGE));
&& bean.getAtUserID().contains(String.valueOf(model.getId()))) {
Bus.get().post(new LiveAudienceEvent()
.setType(LiveAudienceEvent.LiveAudienceType.AT_MESSAGE));
mPosition = size; mPosition = size;
} }
} }
@ -675,8 +714,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
notifyDataSetChanged(); notifyDataSetChanged();
} }
public class ListAdapter extends public class ListAdapter extends RecyclerView.Adapter<ListAdapter.ViewHolder> {
RecyclerView.Adapter<ListAdapter.ViewHolder> {
private LayoutInflater mInflater; private LayoutInflater mInflater;
private List<String> mDatas; private List<String> mDatas;
@ -707,8 +745,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
*/ */
@Override @Override
public ListAdapter.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) { public ListAdapter.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
View view = mInflater.inflate(R.layout.item_chat_active, View view = mInflater.inflate(R.layout.item_chat_active, viewGroup, false);
viewGroup, false);
ListAdapter.ViewHolder viewHolder = new ListAdapter.ViewHolder(view); ListAdapter.ViewHolder viewHolder = new ListAdapter.ViewHolder(view);
return viewHolder; 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;
private String giftname_en; private String giftname_en;
private String toUid; private String toUid;
private String avatar; //头像
private String u_gift_svga; //
public int getNORMAL() { public int getNORMAL() {
return NORMAL; return NORMAL;
@ -82,6 +84,22 @@ public class LiveChatBean {
return this; 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() { public String getToUid() {
return toUid; 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_num;
private String wishlist_progress; private String wishlist_progress;
private String wishlist_name; private String wishlist_name;
private int price;
@JSONField(name = "id") @JSONField(name = "id")
public String getId() { public String getId() {
@ -107,6 +109,12 @@ public class LiveWishlistBean {
this.wishlist_name = wishlist_name; 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) { if (livePushSwViewHolder.timeTitle.getVisibility() == View.GONE && isShowTimeTitle) {
mHandler.removeMessages(WHAT_PK_TIME2); mHandler.removeMessages(WHAT_PK_TIME2);
RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) livePushSwViewHolder.timeTitle.getLayoutParams(); RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) livePushSwViewHolder.timeTitle.getLayoutParams();
layoutParams.topMargin = DpUtil.dp2px(123); layoutParams.topMargin = DpUtil.dp2px(165);
livePushSwViewHolder.timeTitle.setLayoutParams(layoutParams); livePushSwViewHolder.timeTitle.setLayoutParams(layoutParams);
livePushSwViewHolder.timeTitle.setVisibility(View.VISIBLE); livePushSwViewHolder.timeTitle.setVisibility(View.VISIBLE);
String pkTime = StringUtil.getDurationText(time * 1000); 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("isAnchor", isAnchor ? 1 : 0)
.param("level", u.getLevel()) .param("level", u.getLevel())
.param("uname", u.getUserNiceName()) .param("uname", u.getUserNiceName())
.param("u_avatar", u.getAvatar())
.param("u_gift_svga", u.getDress().getAvatar_frame())
.param("bubble", u.getDress().getBubble()) .param("bubble", u.getDress().getBubble())
.param("medal_honor", u.getMedal_no_display_src()) .param("medal_honor", u.getMedal_no_display_src())
.param("medal", u.getDress().getMedal()) .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(); LiveChatBean chatBean = new LiveChatBean();
chatBean.setId(map.getString("uid")); chatBean.setId(map.getString("uid"));
chatBean.setUserNiceName(map.getString("uname")); 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.setLevel(map.getIntValue("level"));
chatBean.setAnchor(map.getIntValue("isAnchor") == 1); chatBean.setAnchor(map.getIntValue("isAnchor") == 1);
chatBean.setManager(map.getIntValue("usertype") == Constants.SOCKET_USER_TYPE_ADMIN); 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 @Override
public void onClick(View v) { public void onClick(View v) {
String url = CommonAppConfig.HOST + "/h5/Grade/index.html?" + "token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&for"; 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() { findViewById(R.id.go_anchor_center).setOnClickListener(new View.OnClickListener() {

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

@ -110,12 +110,14 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
private LiveClassBean classBean; private LiveClassBean classBean;
private FaceManager manager; private FaceManager manager;
private TextView faceTextView;//提示人脸未检测到的TextView private TextView faceTextView;//提示人脸未检测到的TextView
private ImageView selectorProtocol; private ImageView selectorProtocol;
private int selectClarity = 1; private int selectClarity = 1;
private LiveOpenCustomPopup liveOpenCustomPopup; private LiveOpenCustomPopup liveOpenCustomPopup;
private boolean selector = true; private boolean selector = true;
private String mLiveUid; private String mLiveUid;
private ViewFlipper liveOpenVf; private ViewFlipper liveOpenVf;
private ImageView btn_live_clarity;
private int select;
public LiveNewReadySwViewHolder(Context context, ViewGroup parentView, int liveSdk) { public LiveNewReadySwViewHolder(Context context, ViewGroup parentView, int liveSdk) {
super(context, parentView, liveSdk); super(context, parentView, liveSdk);
@ -138,6 +140,7 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
mRootView = (ConstraintLayout) findViewById(R.id.traceroute_rootview); mRootView = (ConstraintLayout) findViewById(R.id.traceroute_rootview);
selectorProtocol = (ImageView) findViewById(R.id.selector_protocol); selectorProtocol = (ImageView) findViewById(R.id.selector_protocol);
anchorAgreement = (TextView) findViewById(R.id.anchor_agreement); anchorAgreement = (TextView) findViewById(R.id.anchor_agreement);
btn_live_clarity = findViewById(R.id.btn_live_clarity);
mRootView.setOnClickListener(new View.OnClickListener() { mRootView.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
@ -245,8 +248,24 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
LiveClarityCustomPopup liveClarityCustomPopup = LiveClarityCustomPopup liveClarityCustomPopup =
new LiveClarityCustomPopup(mContext, new LiveClarityCustomPopup(mContext,
IMLoginManager.get(mContext).getSelectClarity(), select);
IMLoginManager.get(mContext).getClarity() ? 0 : LiveClarityCustomPopup.BAN_1080, false); 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) new XPopup.Builder(mContext)
.setPopupCallback(new XPopupCallback() { .setPopupCallback(new XPopupCallback() {
@Override @Override
@ -317,8 +336,8 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
LiveNetManager.get(mContext).getLiveOpenTips(new com.yunbao.common.http.base.HttpCallback<List<LiveOpenTipsBean>>() { LiveNetManager.get(mContext).getLiveOpenTips(new com.yunbao.common.http.base.HttpCallback<List<LiveOpenTipsBean>>() {
@Override @Override
public void onSuccess(List<LiveOpenTipsBean> data) { public void onSuccess(List<LiveOpenTipsBean> data) {
if(data!=null){ if (data != null) {
for (int i = 0; i <data.size(); i++) { for (int i = 0; i < data.size(); i++) {
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(DpUtil.dp2px(16), DpUtil.dp2px(16)); 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); LinearLayout.LayoutParams textParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
textParams.leftMargin = DpUtil.dp2px(5); textParams.leftMargin = DpUtil.dp2px(5);
@ -328,7 +347,7 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
TextView week = weekView.findViewById(R.id.wish_index); TextView week = weekView.findViewById(R.id.wish_index);
week.setLayoutParams(textParams); week.setLayoutParams(textParams);
week.setGravity(Gravity.CENTER_VERTICAL); week.setGravity(Gravity.CENTER_VERTICAL);
week.setText(WordUtil.isNewZh()?data.get(i).getContent():data.get(i).getEnglish_content()); week.setText(WordUtil.isNewZh() ? data.get(i).getContent() : data.get(i).getEnglish_content());
liveOpenVf.addView(weekView); liveOpenVf.addView(weekView);
} }
liveOpenVf.startFlipping(); liveOpenVf.startFlipping();
@ -368,7 +387,7 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
} else if (i == R.id.btn_wishlist) { } else if (i == R.id.btn_wishlist) {
//点击心愿单 //点击心愿单
openWishListWindow(); openWishListWindow();
} else if (i == R.id.btn_start_live) { } else if (i == R.id.btn_start_live) {
if (!selector) { if (!selector) {
ToastUtil.show(mContext.getString(R.string.anchor_agreement_hint)); ToastUtil.show(mContext.getString(R.string.anchor_agreement_hint));
return; return;
@ -571,6 +590,7 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
openAnchorSayDialog(); openAnchorSayDialog();
} }
} }
private void setSelectClarity(int selectClarity) { private void setSelectClarity(int selectClarity) {
this.selectClarity = selectClarity; this.selectClarity = selectClarity;
IMLoginManager.get(mContext).setSelectClarity(selectClarity); IMLoginManager.get(mContext).setSelectClarity(selectClarity);
@ -590,6 +610,7 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
//重新发布一下流 //重新发布一下流
Bus.get().post(new LivePushRyEvent()); Bus.get().post(new LivePushRyEvent());
} }
/** /**
* 新娱美颜 * 新娱美颜
*/ */

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

File diff suppressed because it is too large Load Diff

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() { findViewById(R.id.btn_task).setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
((LiveSwAnchorActivity) mContext).showFunctionDialog(); ((LiveSwAnchorActivity) mContext).showTaskDialog();
} }
}); });
findViewById(R.id.btn_fz).setOnClickListener(new View.OnClickListener() { findViewById(R.id.btn_fz).setOnClickListener(new View.OnClickListener() {
@ -313,17 +313,6 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
* 设置连麦pk按钮是否可见 * 设置连麦pk按钮是否可见
*/ */
public void setPkBtnVisible(boolean visible) { 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 //心愿单顶部bannner
mLiveRoomViewHolder.setWishListProgress(data.getWishListProgress()); mLiveRoomViewHolder.setWishListProgress(data.getWishListProgress());
//初始化顶部banner //初始化顶部banner
mLiveRoomViewHolder.initTopBanner(); mLiveRoomViewHolder.initWishListView();
mLiveRoomViewHolder.updateTopBanner(); mLiveRoomViewHolder.updateTopBanner();
mLiveRoomViewHolder.setVoteData(data.getEnterRoomInfo().getVoteModel()); mLiveRoomViewHolder.setVoteData(data.getEnterRoomInfo().getVoteModel());
mLiveRoomViewHolder.updateFansMessageRed(); 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"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="10dp"/> <corners android:radius="10dp"/>
<solid android:color="#30000000"/> <solid android:color="#8065615A"/>
</shape> </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"?> <?xml version="1.0" encoding="utf-8"?>
<shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android"> <shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/global"/> <solid android:color="#FFFE4C4B"/>
</shape> </shape>

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

@ -2,303 +2,346 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/bg"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="vertical"> android:orientation="horizontal">
<TextView <RelativeLayout
android:id="@+id/text_txt" android:id="@+id/avatarLayout"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginLeft="9dp" android:paddingTop="8dp"
android:layout_marginRight="9dp"
android:paddingBottom="7dp"
android:textColor="#fff"
android:breakStrategy="simple"
android:textSize="12sp"
tools:text="aaaaaaaaa111111111111111111111111111111111111111111111111111111111"
android:visibility="visible"
tools:ignore="RtlHardcoded" />
<LinearLayout
android:id="@+id/view_follow"
android:layout_width="96dp"
android:layout_height="36dp"
android:background="@drawable/border_fd6052xml"
android:gravity="center|left"
android:orientation="horizontal"
android:visibility="gone" android:visibility="gone"
tools:ignore="RtlHardcoded"
tools:visibility="visible"> tools:visibility="visible">
<com.makeramen.roundedimageview.RoundedImageView <com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar" android:id="@+id/msg_avatar"
android:layout_width="36dp" android:layout_width="21dp"
android:layout_height="36dp" android:layout_height="21dp"
android:scaleType="centerCrop" android:layout_marginStart="10dp"
app:riv_border_color="@color/white"
app:riv_border_width="2dp"
app:riv_oval="true" />
<TextView
android:id="@+id/follow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="9dp"
android:layout_marginEnd="6dp"
android:text="@string/add_follow"
android:textColor="@color/white"
android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/view_action_game"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_live_chat_item"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="12dp"
android:layout_marginTop="6dp"
android:layout_marginRight="12dp"
android:layout_marginBottom="6dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1">
<TextView
android:id="@+id/tv_chat_avtive_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="新年大作战近30场进攻怪物"
android:textColor="@color/blue_81cef2"
android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<View
android:id="@+id/v_chat_active_close"
android:layout_width="15dp"
android:layout_height="15dp"
android:background="@mipmap/icon_live_close_2" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_chat_active"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:overScrollMode="never"
android:scrollbars="none" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="21dp"
android:layout_weight="1">
<TextView
android:id="@+id/tv_chat_active_into"
android:layout_width="96dp"
android:layout_height="21dp"
android:background="@mipmap/bg_chat_active"
android:gravity="center"
android:text="@string/add_into_active"
android:textColor="@color/gray1"
android:textSize="13sp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<View
android:layout_width="21dp"
android:layout_height="21dp"
android:background="@mipmap/icon_new" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/view_zg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bg_live_chat_item"
android:gravity="center|left"
android:orientation="horizontal"
android:paddingLeft="6dp"
android:paddingTop="3dp"
android:paddingRight="6dp"
android:paddingBottom="3dp"
android:visibility="gone"
tools:ignore="RtlHardcoded"
tools:visibility="visible">
<TextView
android:id="@+id/tv_zg_anchorname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="9dp"
android:layout_marginRight="9dp"
android:text=""
android:textColor="@color/white"
android:textSize="14sp"
android:textStyle="bold" />
<ImageView
android:id="@+id/img_zg_img"
android:layout_width="90dp"
android:layout_height="45dp" />
</LinearLayout>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/attention_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:background="@drawable/chat_message_bg"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone"
tools:visibility="visible">
<com.yunbao.common.views.weight.ClipPathCircleImage
android:id="@+id/clip_image2"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_margin="9dp"
android:layout_weight="0"
android:scaleType="centerCrop" />
<TextView
android:id="@+id/automatic_chat"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="3dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="3dp"
android:layout_weight="0.5"
android:clickable="false"
android:enabled="false"
android:gravity="start"
android:text="@string/automatic_chat"
android:textColor="#FFFFFF"
android:textSize="12sp" />
<ImageView
android:id="@+id/btn_attention"
android:layout_width="54dp"
android:layout_height="26dp"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="11dp"
android:layout_weight="0"
android:clickable="false"
android:src="@mipmap/btn_attention" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/prank_open_live_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:background="@drawable/chat_message_bg"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone"
tools:visibility="visible">
<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" android:layout_marginTop="5dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="1dp"
android:layout_marginBottom="5dp" android:layout_marginBottom="11dp"
android:layout_weight="0.5" android:scaleType="centerCrop"
android:clickable="false" android:src="@drawable/m_chu_xia"
android:enabled="false" android:visibility="gone"
android:gravity="start" app:riv_oval="true"
android:text="@string/prank_open_live_msg" tools:visibility="visible" />
android:textColor="#FFFFFF"
android:textSize="12sp" />
<TextView <com.opensource.svgaplayer.SVGAImageView
android:id="@+id/prank_to_setting" android:id="@+id/avatar_gift_svga"
android:layout_width="54dp" android:layout_width="31dp"
android:layout_height="26dp" android:layout_height="31dp"
android:layout_gravity="end|center_vertical" android:layout_marginStart="5dp"
android:layout_marginEnd="11dp" android:visibility="gone"
android:text="@string/prank_im_immediately_go" app:autoPlay="true"
android:gravity="center" tools:visibility="visible" />
android:textColor="@color/white"
android:background="@drawable/prank_msg_goto"
android:textSize="10dp" />
</androidx.appcompat.widget.LinearLayoutCompat> </RelativeLayout>
<LinearLayout <LinearLayout
android:id="@+id/xyd_complete" android:id="@+id/bg"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone"> android:gravity="center_vertical"
android:orientation="vertical">
<ImageView
android:id="@+id/text_leave"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_marginStart="6dp" />
<TextView <TextView
android:id="@+id/text_txt2" android:id="@+id/text_txt"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="9dp" android:layout_marginLeft="9dp"
android:layout_marginRight="9dp" android:layout_marginRight="9dp"
android:layout_toEndOf="@+id/avatar_gift_svga"
android:breakStrategy="simple"
android:paddingBottom="7dp" android:paddingBottom="7dp"
android:textColor="#fff" android:textColor="#fff"
android:textSize="12sp" android:textSize="12sp"
android:visibility="visible" android:visibility="visible"
tools:ignore="RtlHardcoded" /> tools:ignore="RtlHardcoded"
tools:text="aaaaaaaaa111111111111111111111111111111111111111111111111111111111" />
<LinearLayout
android:id="@+id/view_follow"
android:layout_width="96dp"
android:layout_height="36dp"
android:background="@drawable/border_fd6052xml"
android:gravity="center|left"
android:orientation="horizontal"
android:visibility="gone"
tools:ignore="RtlHardcoded"
tools:visibility="visible">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar"
android:layout_width="36dp"
android:layout_height="36dp"
android:scaleType="centerCrop"
app:riv_border_color="@color/white"
app:riv_border_width="2dp"
app:riv_oval="true" />
<TextView
android:id="@+id/follow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="9dp"
android:layout_marginEnd="6dp"
android:text="@string/add_follow"
android:textColor="@color/white"
android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/view_action_game"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_live_chat_item"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="12dp"
android:layout_marginTop="6dp"
android:layout_marginRight="12dp"
android:layout_marginBottom="6dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1">
<TextView
android:id="@+id/tv_chat_avtive_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="新年大作战近30场进攻怪物"
android:textColor="@color/blue_81cef2"
android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<View
android:id="@+id/v_chat_active_close"
android:layout_width="15dp"
android:layout_height="15dp"
android:background="@mipmap/icon_live_close_2" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_chat_active"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:overScrollMode="never"
android:scrollbars="none" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="21dp"
android:layout_weight="1">
<TextView
android:id="@+id/tv_chat_active_into"
android:layout_width="96dp"
android:layout_height="21dp"
android:background="@mipmap/bg_chat_active"
android:gravity="center"
android:text="@string/add_into_active"
android:textColor="@color/gray1"
android:textSize="13sp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<View
android:layout_width="21dp"
android:layout_height="21dp"
android:background="@mipmap/icon_new" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/view_zg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bg_live_chat_item"
android:gravity="center|left"
android:orientation="horizontal"
android:paddingLeft="6dp"
android:paddingTop="3dp"
android:paddingRight="6dp"
android:paddingBottom="3dp"
android:visibility="gone"
tools:ignore="RtlHardcoded"
tools:visibility="visible">
<TextView
android:id="@+id/tv_zg_anchorname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="9dp"
android:layout_marginRight="9dp"
android:text=""
android:textColor="@color/white"
android:textSize="14sp"
android:textStyle="bold" />
<ImageView
android:id="@+id/img_zg_img"
android:layout_width="90dp"
android:layout_height="45dp" />
</LinearLayout>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/attention_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:background="@drawable/chat_message_bg"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone"
tools:visibility="visible">
<com.yunbao.common.views.weight.ClipPathCircleImage
android:id="@+id/clip_image2"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_margin="9dp"
android:layout_weight="0"
android:scaleType="centerCrop" />
<TextView
android:id="@+id/automatic_chat"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="3dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="3dp"
android:layout_weight="0.5"
android:clickable="false"
android:enabled="false"
android:gravity="start"
android:text="@string/automatic_chat"
android:textColor="#FFFFFF"
android:textSize="12sp" />
<ImageView
android:id="@+id/btn_attention"
android:layout_width="54dp"
android:layout_height="26dp"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="11dp"
android:layout_weight="0"
android:clickable="false"
android:src="@mipmap/btn_attention" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/prank_open_live_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:background="@drawable/chat_message_bg"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone"
tools:visibility="visible">
<TextView
android:id="@+id/prank_open_live_msg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="5dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="5dp"
android:layout_weight="0.5"
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" />
<TextView
android:id="@+id/prank_to_setting"
android:layout_width="54dp"
android:layout_height="26dp"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="11dp"
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>
<LinearLayout
android:id="@+id/xyd_complete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone">
<ImageView
android:id="@+id/text_leave"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_marginStart="6dp" />
<TextView
android:id="@+id/text_txt2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="9dp"
android:layout_marginRight="9dp"
android:paddingBottom="7dp"
android:textColor="#fff"
android:textSize="12sp"
android:visibility="visible"
tools:ignore="RtlHardcoded" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

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

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

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

@ -8,7 +8,6 @@
android:layout_marginBottom="45dp" android:layout_marginBottom="45dp"
android:paddingTop="15dp"> android:paddingTop="15dp">
<LinearLayout <LinearLayout
android:id="@+id/lin" android:id="@+id/lin"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -22,7 +21,7 @@
android:layout_height="34dp" android:layout_height="34dp"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:background="@drawable/bg_live_ico" android:background="@drawable/bg_live_item_an"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
@ -162,18 +161,18 @@
<ImageView <ImageView
android:id="@+id/user_more" android:id="@+id/user_more"
android:layout_width="27dp" android:layout_width="24dp"
android:layout_height="40dp" android:layout_height="34dp"
android:layout_gravity="center" android:layout_gravity="center"
android:src="@mipmap/live_users_more" /> android:src="@mipmap/live_users_more" />
<ImageView <ImageView
android:id="@+id/btn_close" android:id="@+id/btn_close"
android:layout_width="27dp" android:layout_width="17dp"
android:layout_height="40dp" android:layout_height="17dp"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:layout_marginEnd="4dp" android:layout_marginEnd="10dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@mipmap/icon_live_close_3" /> android:src="@mipmap/icon_live_close_3" />
</LinearLayout> </LinearLayout>
@ -236,50 +235,6 @@
android:visibility="gone" /> android:visibility="gone" />
</RelativeLayout> </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 <LinearLayout
android:id="@+id/topLayout1" android:id="@+id/topLayout1"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -299,8 +254,7 @@
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:paddingRight="5dp" android:paddingRight="5dp"
android:visibility="gone" android:visibility="gone">
tools:visibility="visible">
<ImageView <ImageView
android:layout_width="13dp" android:layout_width="13dp"
@ -325,13 +279,67 @@
android:textSize="10sp" /> android:textSize="10sp" />
</LinearLayout> </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 <FrameLayout
android:id="@+id/live_rank_pk" android:id="@+id/live_rank_pk"
android:layout_width="85dp" android:layout_width="85dp"
android:layout_height="20dp" android:layout_height="23dp"
android:layout_alignParentEnd="true" android:background="@drawable/bg_live_item"
android:layout_marginEnd="10dp"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:visibility="visible"> android:visibility="visible">
@ -351,7 +359,6 @@
android:inAnimation="@anim/anim_marquee_in" android:inAnimation="@anim/anim_marquee_in"
android:outAnimation="@anim/anim_marquee_out" /> android:outAnimation="@anim/anim_marquee_out" />
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>
@ -359,7 +366,7 @@
<LinearLayout <LinearLayout
android:id="@+id/topLayout2" android:id="@+id/topLayout2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="38dp" android:layout_height="40dp"
android:layout_below="@+id/topLayout1" android:layout_below="@+id/topLayout1"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:orientation="horizontal"> android:orientation="horizontal">
@ -369,47 +376,52 @@
android:layout_width="82dp" android:layout_width="82dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:layout_marginEnd="7dp"
android:background="@mipmap/bg_live_room_task" android:background="@mipmap/bg_live_room_task"
android:gravity="center"> android:gravity="center"
android:visibility="gone"
tools:visibility="visible">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:text="新手任務" android:text="@string/live_room_new_task"
android:textColor="#1D386B" android:textColor="#1D386B"
android:textSize="10dp" /> android:textSize="10dp" />
<ImageView <ImageView
android:layout_width="32dp" android:layout_width="32dp"
android:layout_height="32dp" android:layout_height="32dp"
android:layout_marginStart="2dp"
android:src="@mipmap/icon_live_room_task" /> android:src="@mipmap/icon_live_room_task" />
</LinearLayout> </LinearLayout>
<!--红包-->
<RelativeLayout <RelativeLayout
android:id="@+id/red_packet" android:id="@+id/red_packet"
android:layout_width="38dp" android:layout_width="40dp"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:layout_marginStart="12dp"
android:visibility="gone"
tools:visibility="visible">
<ImageView <ImageView
android:layout_width="38dp" android:layout_width="40dp"
android:layout_height="38dp" android:layout_height="40dp"
android:src="@mipmap/icon_red_packet_new" /> android:src="@mipmap/icon_red_packet_new" />
<TextView <TextView
android:id="@+id/red_packet_countdown" android:id="@+id/red_packet_countdown"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="16dp" android:layout_height="wrap_content"
android:gravity="center_vertical" android:layout_alignParentEnd="true"
android:paddingStart="5dp" android:layout_alignParentBottom="true"
android:paddingEnd="5dp" android:background="@mipmap/bg_live_room_red_time"
android:gravity="center"
android:text="@string/red_packet_countdown" android:text="@string/red_packet_countdown"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="9sp" android:textSize="7sp"
android:visibility="gone" /> android:visibility="visible" />
<LinearLayout <LinearLayout
android:id="@+id/red_packet_queue" android:id="@+id/red_packet_queue"
@ -442,20 +454,20 @@
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
<!---->
<RelativeLayout <RelativeLayout
android:id="@+id/dragon_immediate_participation" android:id="@+id/dragon_immediate_participation"
android:layout_width="38dp" android:layout_width="40dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginStart="10dp" android:layout_marginStart="12dp"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"> tools:visibility="visible">
<ImageView <ImageView
android:layout_width="38dp" android:layout_width="40dp"
android:layout_height="38dp" android:layout_height="40dp"
android:src="@mipmap/icon_live_dragon_money" /> android:src="@mipmap/icon_live_dragon_money" />
<TextView <TextView
@ -470,20 +482,20 @@
android:textSize="7sp" android:textSize="7sp"
android:textStyle="bold" /> android:textStyle="bold" />
</RelativeLayout> </RelativeLayout>
<!---->
<RelativeLayout <RelativeLayout
android:id="@+id/dragon_immediate_participation_time" android:id="@+id/dragon_immediate_participation_time"
android:layout_width="38dp" android:layout_width="40dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginStart="10dp" android:layout_marginStart="12dp"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"> tools:visibility="visible">
<ImageView <ImageView
android:layout_width="38dp" android:layout_width="40dp"
android:layout_height="38dp" android:layout_height="40dp"
android:src="@mipmap/icon_live_dragon_money" /> android:src="@mipmap/icon_live_dragon_money" />
<TextView <TextView
@ -504,67 +516,142 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" /> android:layout_weight="1" />
<!--礼物墙-->
<LinearLayout <LinearLayout
android:layout_marginEnd="12dp" android:id="@+id/giftLayout"
android:layout_width="82dp" android:layout_width="82dp"
android:layout_height="38dp" android:layout_height="match_parent"
android:layout_gravity="end" android:layout_gravity="end"
android:layout_marginEnd="9dp"
android:background="@mipmap/bg_live_room_gift"
android:orientation="horizontal" android:orientation="horizontal"
android:background="@mipmap/bg_live_room_gift"> android:visibility="gone"
tools:visibility="visible">
<LinearLayout <LinearLayout
android:paddingStart="6dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:gravity="center_vertical"
android:orientation="vertical"
android:paddingStart="6dp">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="12dp"
android:text="禮物牆" android:text="@string/live_room_gift"
android:textColor="#FFFFFF" android:textColor="#FFFFFF"
android:textSize="10dp" /> android:textSize="10dp" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:gravity="center_vertical" android:layout_height="16dp"
android:layout_height="wrap_content" android:gravity="bottom"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:id="@+id/gift_number"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="5" android:text="11"
android:textColor="#FFC949" android:textColor="#FFC949"
android:textSize="15dp" /> android:textSize="15dp" />
<TextView <TextView
android:id="@+id/gift_total"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="/26" android:text="22"
android:textColor="#FFFFFF" android:textColor="#FFFFFF"
android:textSize="14dp" /> android:textSize="12dp" />
</LinearLayout> </LinearLayout>
<ProgressBar <ProgressBar
android:id="@+id/progressbar" android:id="@+id/gift_progressbar"
style="@android:style/Widget.ProgressBar.Horizontal" style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="match_parent" android:layout_width="30dp"
android:layout_height="1.5dp" android:layout_height="1.5dp"
android:max="26" android:layout_marginTop="2dp"
android:progress="5" android:progressDrawable="@drawable/bg_gift_progressbar" />
android:progressDrawable="@drawable/bg_horizontal_progressbar" />
</LinearLayout> </LinearLayout>
<ImageView <ImageView
android:layout_marginStart="10dp"
android:src="@mipmap/icon_live_room_gift"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" 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> </LinearLayout>
@ -578,14 +665,12 @@
android:layout_below="@id/lin" android:layout_below="@id/lin"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_toRightOf="@id/hour_rank_layout"
android:background="@drawable/bg_live_item" android:background="@drawable/bg_live_item"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:paddingRight="5dp" android:paddingRight="5dp"
android:visibility="gone" android:visibility="gone">
tools:visibility="visible">
<ImageView <ImageView
android:layout_width="13dp" android:layout_width="13dp"
@ -621,9 +706,7 @@
android:id="@+id/btn_guard" android:id="@+id/btn_guard"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="21dp" android:layout_height="21dp"
android:layout_alignTop="@id/hour_rank_layout"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/hour_rank_layout"
android:background="@drawable/bg_live_item" android:background="@drawable/bg_live_item"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
@ -657,12 +740,10 @@
android:id="@+id/live_wks_layout" android:id="@+id/live_wks_layout"
android:layout_width="70dp" android:layout_width="70dp"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_alignTop="@id/hour_rank_layout"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_toRightOf="@id/hour_rank_layout"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="visible"> android:visibility="gone">
<LinearLayout <LinearLayout
android:id="@+id/live_wks_layout2" android:id="@+id/live_wks_layout2"
@ -670,16 +751,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal" /> 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 <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@ -704,15 +775,12 @@
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>
</FrameLayout> </FrameLayout>
<!--心愿单--> <!--心愿单-->
<LinearLayout <LinearLayout
android:id="@+id/wish_list_layout" android:id="@+id/wish_list_layout"
android:layout_width="80dp" android:layout_width="80dp"
android:layout_height="21dp" android:layout_height="21dp"
android:layout_alignTop="@id/hour_rank_layout"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_toRightOf="@id/live_wks_layout" android:layout_toRightOf="@id/live_wks_layout"
android:background="@drawable/bg_live_item" android:background="@drawable/bg_live_item"
@ -739,24 +807,12 @@
</LinearLayout> </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 <LinearLayout
android:id="@+id/fans_btn" android:id="@+id/fans_btn"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="21dp" android:layout_height="21dp"
android:layout_below="@id/lin" android:layout_below="@id/lin"
android:layout_alignTop="@id/hour_rank_layout"
android:background="@drawable/bg_live_item" android:background="@drawable/bg_live_item"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
@ -791,7 +847,6 @@
android:id="@+id/open_sidebar" android:id="@+id/open_sidebar"
android:layout_width="65dp" android:layout_width="65dp"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_alignTop="@id/hour_rank_layout"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:background="@drawable/bg_live_item_right" android:background="@drawable/bg_live_item_right"
android:clickable="true" android:clickable="true"
@ -820,7 +875,6 @@
android:id="@+id/btn_noble" android:id="@+id/btn_noble"
android:layout_width="45dp" android:layout_width="45dp"
android:layout_height="45dp" android:layout_height="45dp"
android:layout_alignTop="@id/hour_rank_layout"
android:layout_toRightOf="@id/btn_guard" android:layout_toRightOf="@id/btn_guard"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:paddingRight="5dp" android:paddingRight="5dp"
@ -832,7 +886,6 @@
android:id="@+id/btn_medal_rank" android:id="@+id/btn_medal_rank"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="21dp" android:layout_height="21dp"
android:layout_alignTop="@id/hour_rank_layout"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/btn_guard" android:layout_toRightOf="@id/btn_guard"
android:background="@drawable/bg_live_item" android:background="@drawable/bg_live_item"
@ -863,13 +916,13 @@
android:layout_width="10dp" android:layout_width="10dp"
android:layout_height="10dp" android:layout_height="10dp"
android:src="@mipmap/icon_arrow_right" /> android:src="@mipmap/icon_arrow_right" />
</LinearLayout> </LinearLayout>
<FrameLayout <FrameLayout
android:id="@+id/luck_container" android:id="@+id/luck_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_alignTop="@id/hour_rank_layout"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:layout_toRightOf="@id/btn_medal_rank" /> android:layout_toRightOf="@id/btn_medal_rank" />
@ -878,7 +931,6 @@
android:id="@+id/live_time" android:id="@+id/live_time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_below="@id/hour_rank_layout"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:background="@drawable/bg_live_push_time" android:background="@drawable/bg_live_push_time"
@ -912,9 +964,9 @@
android:id="@+id/goto_room_view" android:id="@+id/goto_room_view"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="27dp" android:layout_height="27dp"
android:layout_below="@id/open_sidebar" android:layout_below="@id/topLayout2"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginTop="20dp" android:layout_marginTop="15dp"
android:layout_marginRight="9dp" android:layout_marginRight="9dp"
android:background="@drawable/bg_live_other_ico" android:background="@drawable/bg_live_other_ico"
android:gravity="center"> android:gravity="center">
@ -1008,7 +1060,6 @@
android:id="@+id/btn_red_pack" android:id="@+id/btn_red_pack"
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_below="@id/hour_rank_layout"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginTop="80dp" android:layout_marginTop="80dp"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
@ -1098,7 +1149,6 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<com.yunbao.common.custom.MyFrameLayout2 <com.yunbao.common.custom.MyFrameLayout2
android:id="@+id/enter_room_group" android:id="@+id/enter_room_group"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -1170,7 +1220,6 @@
android:id="@+id/title_container" android:id="@+id/title_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="26dp" android:layout_height="26dp"
android:layout_below="@id/hour_rank_layout"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginRight="10dp" /> android:layout_marginRight="10dp" />
@ -1179,7 +1228,6 @@
android:id="@+id/gif_gift_tip_group" android:id="@+id/gif_gift_tip_group"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="26dp" android:layout_height="26dp"
android:layout_below="@id/hour_rank_layout"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
@ -1716,7 +1764,7 @@
android:layout_height="28dp" android:layout_height="28dp"
android:layout_alignTop="@+id/live_video" android:layout_alignTop="@+id/live_video"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="40dp" android:layout_marginTop="80dp"
android:src="@mipmap/icon_rank_top_box" android:src="@mipmap/icon_rank_top_box"
android:visibility="visible" /> android:visibility="visible" />
@ -1724,7 +1772,7 @@
android:id="@+id/lt_pk_line" android:id="@+id/lt_pk_line"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/live_top" android:layout_marginTop="148dp"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"> tools:visibility="visible">
@ -2464,116 +2512,215 @@
android:visibility="gone" /> android:visibility="gone" />
</RelativeLayout> </RelativeLayout>
<!--連麥-->
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="50dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginTop="190dp" android:layout_marginTop="190dp"
android:layout_marginRight="18dp" android:layout_marginRight="10dp"
android:gravity="bottom" android:gravity="bottom|center_horizontal"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
android:id="@+id/mic_view2" android:id="@+id/mic_view"
android:layout_width="40dp" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="65dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:visibility="invisible"> android:visibility="invisible"
tools:visibility="visible">
<View
android:layout_width="41dp"
android:layout_height="41dp"
android:layout_marginBottom="10dp"
android:background="@drawable/bg_live_mic_av" />
<com.makeramen.roundedimageview.RoundedImageView <com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/mic_ico2" android:id="@+id/mic_ico"
android:layout_width="40dp" android:layout_width="30dp"
android:layout_height="40dp" android:layout_height="30dp"
android:layout_centerHorizontal="true"
android:layout_marginStart="1dp" android:layout_marginStart="1dp"
android:layout_marginTop="1dp" android:layout_marginTop="4dp"
android:layout_marginEnd="1dp" android:layout_marginEnd="1dp"
android:layout_marginBottom="11dp" android:layout_marginBottom="11dp"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/m_chu_xia" android:src="@drawable/m_chu_xia"
app:riv_oval="true" /> 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 <ImageView
android:layout_width="18dp" android:id="@+id/userVoice"
android:layout_height="18dp" 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_alignParentBottom="true"
android:layout_centerHorizontal="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>
<RelativeLayout <RelativeLayout
android:id="@+id/mic_view1" android:id="@+id/mic_view1"
android:layout_width="40dp" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="65dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:visibility="invisible"> android:visibility="invisible"
tools:visibility="visible">
<View
android:layout_width="41dp"
android:layout_height="41dp"
android:layout_marginBottom="10dp"
android:background="@drawable/bg_live_mic_av" />
<com.makeramen.roundedimageview.RoundedImageView <com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/mic_ico1" android:id="@+id/mic_ico1"
android:layout_width="40dp" android:layout_width="30dp"
android:layout_height="40dp" android:layout_height="30dp"
android:layout_centerHorizontal="true"
android:layout_marginStart="1dp" android:layout_marginStart="1dp"
android:layout_marginTop="1dp" android:layout_marginTop="4dp"
android:layout_marginEnd="1dp" android:layout_marginEnd="1dp"
android:layout_marginBottom="11dp" android:layout_marginBottom="11dp"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/m_chu_xia" android:src="@drawable/m_chu_xia"
app:riv_oval="true" /> 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 <ImageView
android:layout_width="18dp" android:id="@+id/userVoice1"
android:layout_height="18dp" 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_alignParentBottom="true"
android:layout_centerHorizontal="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>
<RelativeLayout <RelativeLayout
android:id="@+id/mic_view" android:id="@+id/mic_view2"
android:layout_width="40dp" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="65dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:visibility="invisible"> android:visibility="invisible"
tools:visibility="visible">
<View
android:layout_width="41dp"
android:layout_height="41dp"
android:layout_marginBottom="10dp"
android:background="@drawable/bg_live_mic_av" />
<com.makeramen.roundedimageview.RoundedImageView <com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/mic_ico" android:id="@+id/mic_ico2"
android:layout_width="40dp" android:layout_width="30dp"
android:layout_height="40dp" android:layout_height="30dp"
android:layout_centerHorizontal="true"
android:layout_marginStart="1dp" android:layout_marginStart="1dp"
android:layout_marginTop="1dp" android:layout_marginTop="4dp"
android:layout_marginEnd="1dp" android:layout_marginEnd="1dp"
android:layout_marginBottom="11dp" android:layout_marginBottom="11dp"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/m_chu_xia" android:src="@drawable/m_chu_xia"
app:riv_oval="true" /> 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 <ImageView
android:layout_width="18dp" android:id="@+id/userVoice2"
android:layout_height="18dp" 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_alignParentBottom="true"
android:layout_centerHorizontal="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> </RelativeLayout>
@ -2598,8 +2745,7 @@
<include <include
android:id="@+id/prank_group" android:id="@+id/prank_group"
layout="@layout/view_prank_group" layout="@layout/view_prank_group"
android:visibility="gone" android:visibility="gone" />
tools:visibility="visible" />
<pl.droidsonroids.gif.GifImageView <pl.droidsonroids.gif.GifImageView
android:id="@+id/prank_small_icon" 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_marginTop="54dp"
android:layout_toRightOf="@+id/btn_horizontally" android:layout_toRightOf="@+id/btn_horizontally"
android:padding="3dp" android:padding="3dp"
android:src="@mipmap/icon_fhd" android:src="@mipmap/icon_sd"
app:layout_constraintStart_toEndOf="@+id/btn_camera" app:layout_constraintStart_toEndOf="@+id/btn_camera"
app:layout_constraintTop_toTopOf="parent" /> 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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="23dp"
android:orientation="vertical" android:orientation="vertical"
tools:ignore="MissingDefaultResource"> tools:ignore="MissingDefaultResource">
<FrameLayout <FrameLayout
android:id="@+id/wish_list_layout" android:id="@+id/wish_list_layout"
android:layout_width="75dp" android:layout_width="75dp"
android:layout_height="20dp" android:layout_height="23dp"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="visible"> 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:id="@+id/live_time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="23dp" android:layout_height="23dp"
android:layout_marginTop="100dp" android:layout_marginTop="90dp"
android:layout_gravity="end" android:layout_gravity="end"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
@ -286,7 +286,7 @@
android:textColor="#fff" android:textColor="#fff"
android:textSize="10sp" android:textSize="10sp"
android:translationY="-4dp" android:translationY="-4dp"
android:visibility="visible" /> android:visibility="gone" />
</RelativeLayout> </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_complete_false">未完成</string>
<string name="live_task_item_hot">直播熱度</string> <string name="live_task_item_hot">直播熱度</string>
<string name="live_task_item_xp">主播經驗</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_msg2">歷史數據可在主播中心查看</string>
<string name="live_data_tip">* 人數及新增相關數據非实时计算</string> <string name="live_data_tip">* 人數及新增相關數據非实时计算</string>
<string name="live_user_mailbox_top_text">来自%s的信</string> <string name="live_user_mailbox_top_text">来自%s的信</string>
@ -162,5 +162,8 @@
<string name="live_end_minute">分鐘</string> <string name="live_end_minute">分鐘</string>
<string name="live_data_now_bottom_zs">本場總計鑽石:</string> <string name="live_data_now_bottom_zs">本場總計鑽石:</string>
<string name="live_data_now_bottom_person">打賞人數:</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> </resources>

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

@ -1,5 +1,5 @@
<resources> <resources>
<!-- Default screen margins, per the Android Design guidelines. --> <!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="live_view">250dp</dimen> <dimen name="live_view">250dp</dimen>
<dimen name="live_top">120dp</dimen> <dimen name="live_top">165dp</dimen>
</resources> </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_complete_false">incomplete</string>
<string name="live_task_item_hot">hot</string> <string name="live_task_item_hot">hot</string>
<string name="live_task_item_xp">exp</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_msg2">Historical data can be viewed in the anchor center</string>
<string name="live_data_tip">* Non-real-time calculation of data</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_end_minute">minute</string>
<string name="live_data_now_bottom_zs">Get diamonds:</string> <string name="live_data_now_bottom_zs">Get diamonds:</string>
<string name="live_data_now_bottom_person">Gift givers:</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> </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_complete_false">incomplete</string>
<string name="live_task_item_hot">hot</string> <string name="live_task_item_hot">hot</string>
<string name="live_task_item_xp">exp</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_msg2">Historical data can be viewed in the anchor center</string>
<string name="live_data_tip">* Non-real-time calculation of data</string> <string name="live_data_tip">* Non-real-time calculation of data</string>