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

横屏部分弹窗修改

Browse Source
This commit is contained in:
gongduoxiang 2024-08-19 15:53:54 +08:00
parent d61d142ec1
commit 6e7d27cbc3
26 changed files with 5168 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/main/java/com/yunbao/common/dialog/GiftWallAchieveDialog.java
View File

@ -1,6 +1,7 @@
package com.yunbao.common.dialog; package com.yunbao.common.dialog;
import android.content.Context; import android.content.Context;
import android.content.res.Configuration;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ImageView; import android.widget.ImageView;
@ -85,7 +86,7 @@ public class GiftWallAchieveDialog extends AbsDialogPopupWindow {
@Override @Override
protected int getPopupHeight() { protected int getPopupHeight() {
if (isFullWindows) { if (isFullWindows ||getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
return super.getPopupHeight(); return super.getPopupHeight();
} }
int screenHeight = ScreenDimenUtil.getInstance().getScreenHeight(); int screenHeight = ScreenDimenUtil.getInstance().getScreenHeight();

17
common/src/main/java/com/yunbao/common/dialog/GiftWallDialog.java
View File

@ -2,6 +2,7 @@ package com.yunbao.common.dialog;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.res.Configuration;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.view.View; import android.view.View;
@ -80,6 +81,7 @@ public class GiftWallDialog extends AbsDialogPopupWindow {
} }
@Override @Override
public int bindLayoutId() { public int bindLayoutId() {
return R.layout.dialog_gift_wall; return R.layout.dialog_gift_wall;
@ -87,13 +89,18 @@ public class GiftWallDialog extends AbsDialogPopupWindow {
@Override @Override
protected int getPopupHeight() { protected int getPopupHeight() {
if (isFullWindows) { if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
if (isFullWindows) {
return super.getPopupHeight() - DpUtil.dp2px(10);
}
int screenHeight = ScreenDimenUtil.getInstance().getScreenHeight();
return (int) (screenHeight * 0.8);
} else {
return super.getPopupHeight() - DpUtil.dp2px(10); return super.getPopupHeight() - DpUtil.dp2px(10);
} }
int screenHeight = ScreenDimenUtil.getInstance().getScreenHeight();
return (int) (screenHeight * 0.8);
} }
void initView() { void initView() {
mIvBg = findViewById(R.id.iv_root_bg); mIvBg = findViewById(R.id.iv_root_bg);
mIvTips = findViewById(R.id.v_tips); mIvTips = findViewById(R.id.v_tips);
@ -196,6 +203,10 @@ public class GiftWallDialog extends AbsDialogPopupWindow {
if (isTab2) { if (isTab2) {
mTvTab2.callOnClick(); mTvTab2.callOnClick();
} }
if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
findViewById(R.id.rootView).setOnClickListener(v -> dismiss());
mIvBg.setOnClickListener(v -> {});
}
} }
private void resetWindows() { private void resetWindows() {

3
common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java
View File

@ -4,6 +4,7 @@ import android.animation.Animator;
import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorListenerAdapter;
import android.animation.ObjectAnimator; import android.animation.ObjectAnimator;
import android.content.Context; import android.content.Context;
import android.content.res.Configuration;
import android.graphics.Color; import android.graphics.Color;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -117,7 +118,7 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
@Override @Override
protected int getPopupHeight() { protected int getPopupHeight() {
if (isFullWindows) { if (isFullWindows || getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
return super.getPopupHeight(); return super.getPopupHeight();
} }
int screenHeight = ScreenDimenUtil.getInstance().getScreenHeight(); int screenHeight = ScreenDimenUtil.getInstance().getScreenHeight();

6
common/src/main/res/drawable-land/background_gift_money2.xml Normal file
View File

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

138
common/src/main/res/layout-land/dialog_gift_wall.xml Normal file
View File

@ -0,0 +1,138 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/rootView"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/iv_root_bg"
android:layout_width="0dp"
android:layout_margin="8dp"
android:layout_height="0dp"
android:scaleType="fitXY"
android:src="@mipmap/bg_gift_wall_main_root"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintWidth_percent="0.48"
app:riv_corner_radius="16dp"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/v_achievement"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginEnd="10dp"
android:visibility="invisible"
tools:visibility="visible"
app:layout_constraintEnd_toEndOf="@id/iv_root_bg"
app:layout_constraintTop_toTopOf="@id/iv_root_bg">
<ImageView
android:id="@+id/imageView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/bg_gift_wall_main_achievement"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="1dp"
android:layout_marginEnd="1dp"
android:layout_marginBottom="1dp"
android:text="@string/dialog_gift_wall_text_honors"
android:textColor="#FFFFFF"
android:textSize="6.8sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView
android:id="@+id/v_tips"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="11dp"
app:layout_constraintBottom_toBottomOf="@+id/v_achievement"
app:layout_constraintEnd_toStartOf="@+id/v_achievement"
app:layout_constraintTop_toTopOf="@+id/v_achievement"
app:srcCompat="@mipmap/icon_gift_wall_main_tips" />
<com.yunbao.common.views.CustomEllipsizeTextView
android:id="@+id/user_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="111111111的礼物展馆"
android:textColor="#6BCDFF"
android:textSize="22sp"
app:layout_constraintBottom_toBottomOf="@+id/v_achievement"
app:layout_constraintEnd_toStartOf="@+id/v_tips"
app:layout_constraintStart_toEndOf="@+id/iv_back"
app:layout_constraintTop_toTopOf="@+id/v_achievement" />
<LinearLayout
android:id="@+id/tab_layout"
android:layout_width="240dp"
android:layout_height="36dp"
android:layout_marginTop="13dp"
android:background="@mipmap/icon_gift_wall_main_switch_main"
android:gravity="center"
android:scaleType="fitXY"
app:layout_constraintEnd_toEndOf="@id/iv_root_bg"
app:layout_constraintStart_toStartOf="@id/iv_root_bg"
app:layout_constraintTop_toBottomOf="@+id/v_achievement">
<TextView
android:id="@+id/tab1"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="@string/dialog_gift_wall_text_personal_hal"
android:textSize="16sp"
android:textColor="#9CE7FF"
android:textStyle="bold" />
<TextView
android:id="@+id/tab2"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="@string/dialog_gift_wall_text_site_hal"
android:textColor="#FFFFFF"
android:textSize="14sp" />
</LinearLayout>
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/viewPager2"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="@id/iv_root_bg"
app:layout_constraintEnd_toEndOf="@id/iv_root_bg"
app:layout_constraintStart_toStartOf="@id/iv_root_bg"
app:layout_constraintTop_toBottomOf="@+id/tab_layout" />
<ImageView
android:id="@+id/iv_back"
android:layout_width="1dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:src="@mipmap/icon_sud_rule_close_bottom"
android:visibility="invisible"
tools:visibility="visible"
app:layout_constraintBottom_toBottomOf="@+id/user_name"
app:layout_constraintStart_toStartOf="@+id/iv_root_bg"
app:layout_constraintTop_toTopOf="@+id/user_name" />
</androidx.constraintlayout.widget.ConstraintLayout>

93
common/src/main/res/layout-land/dialog_gift_wall_achieve.xml Normal file
View File

@ -0,0 +1,93 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/rootView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_root_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
android:src="@mipmap/dialog_gift_wall_achieve" />
<View
android:id="@+id/top_bar"
android:layout_width="0dp"
android:layout_height="0dp" />
<ImageView
android:id="@+id/iv_back"
android:layout_width="80dp"
android:layout_height="60dp"
android:layout_below="@+id/top_bar"
android:paddingEnd="25dp"
android:scaleType="center"
android:src="@mipmap/dialog_gift_wall_back" />
<TextView
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_below="@+id/top_bar"
android:gravity="center"
android:text="@string/gift_wall_achieve_title"
android:textColor="@color/white"
android:textSize="20sp"
android:textStyle="bold" />
<LinearLayout
android:id="@+id/topLayout"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_below="@+id/iv_back"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:background="@mipmap/dialog_gift_wall_achieve_top_bg"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/top_icon"
android:layout_width="120dp"
android:layout_height="20dp"
android:layout_marginLeft="10dp"
android:src="@mipmap/dialog_gift_wall_achieve_top_icon" />
<TextView
android:id="@+id/numCount"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="5dp"
android:layout_weight="1"
android:gravity="start|center_vertical"
android:text="0/1"
android:textColor="#FDE9D8" />
<TextView
android:id="@+id/honor"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="@string/wall_honor"
android:textColor="#E0E0E0"
android:textSize="12dp" />
<ImageView
android:layout_width="13dp"
android:layout_height="13dp"
android:layout_marginRight="7dp"
android:src="@mipmap/dialog_gift_wall_more" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/topLayout"
android:layout_marginLeft="10dp"
android:layout_marginTop="15dp"
android:layout_marginRight="10dp" />
</RelativeLayout>

450
common/src/main/res/layout-land/dialog_live_gift_popup.xml Normal file
View File

@ -0,0 +1,450 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:paddingBottom="12dp"
android:orientation="vertical">
<FrameLayout
android:id="@+id/overlay"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<ImageView
android:id="@+id/operate_image"
android:layout_width="122dp"
android:layout_height="50dp"
android:layout_gravity="end|bottom"
android:layout_marginEnd="5dp"
android:scaleType="fitXY" />
<FrameLayout
android:id="@+id/blind_box"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:visibility="invisible">
<include
layout="@layout/view_blind_box" />
</FrameLayout>
<FrameLayout
android:id="@+id/naming_layout"
android:layout_width="match_parent"
android:layout_height="28dp"
android:layout_gravity="bottom"
android:layout_marginStart="25dp"
android:layout_marginEnd="25dp"
android:layout_marginBottom="5dp">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
android:src="@mipmap/background_live_gift_gift_itle" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical">
<ImageView
android:id="@+id/gift_itle"
android:layout_width="54dp"
android:layout_height="13dp"
android:layout_marginStart="13dp"
android:src="@mipmap/icon_live_gift_gift_itle" />
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/naming_avatar"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_centerHorizontal="true"
android:layout_marginStart="6dp"
android:scaleType="centerCrop"
android:src="@drawable/m_chu_xia"
app:riv_oval="true" />
<com.yunbao.common.views.weight.MarqueeTextView
android:id="@+id/naming_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="4dp"
android:layout_marginEnd="16dp"
android:layout_weight="1"
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
android:textColor="#FFFFFFFF"
android:textSize="12sp" />
</LinearLayout>
</FrameLayout>
</FrameLayout>
<RelativeLayout
android:id="@+id/gift_list"
android:layout_width="match_parent"
android:layout_height="323dp"
android:animateLayoutChanges="true"
android:orientation="vertical">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/git_background2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
android:src="@drawable/backgroud_custom_gift2"
app:riv_corner_radius_bottom_left="10dp"
app:riv_corner_radius_bottom_right="10dp"
app:riv_corner_radius_top_left="10dp"
app:riv_corner_radius_top_right="10dp" />
<LinearLayout
android:id="@+id/git_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:animateLayoutChanges="true">
<LinearLayout
android:id="@+id/leveling_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:visibility="gone">
<FrameLayout
android:layout_width="40dp"
android:layout_height="22dp"
android:layout_marginStart="17dp"
android:layout_marginTop="9dp"
android:background="@mipmap/icon_grade_angle_mark">
<TextView
android:id="@+id/lv_str"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="Lv.8"
android:textColor="@color/white"
android:textSize="12sp" />
</FrameLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="18dp"
android:layout_weight="1"
android:orientation="vertical">
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="4dp"
android:max="100"
android:progress="0"
android:progressDrawable="@drawable/progress_bg_user" />
<com.yunbao.common.views.weight.MarqueeTextView
android:id="@+id/leave_hint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="2dp"
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
android:text="@string/leveling_points"
android:textColor="#BBBBBB"
android:textSize="9sp" />
</LinearLayout>
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginTop="14dp"
android:layout_marginEnd="14dp"
android:background="@mipmap/icon_right" />
</LinearLayout>
<com.yunbao.common.views.weight.MarqueeTextView
android:id="@+id/gift_description"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="15dp"
android:layout_marginEnd="16dp"
android:layout_weight="1"
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
android:textColor="#80FFFFFF"
android:textSize="12sp" />
<FrameLayout
android:id="@+id/btn_luck_gift_tip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp">
<include layout="@layout/view_nobility" />
</FrameLayout>
</LinearLayout>
<RelativeLayout
android:id="@+id/gift_bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="8dp"
android:paddingStart="16dp">
<LinearLayout
android:id="@+id/diamond_linear"
android:layout_width="wrap_content"
android:layout_height="32dp"
android:background="@drawable/background_gift_money"
android:gravity="center_vertical"
android:paddingStart="4dp"
android:paddingTop="7dp"
android:paddingBottom="7dp">
<ImageView
android:layout_width="18dp"
android:layout_height="18dp"
android:clickable="false"
android:focusable="false"
android:src="@mipmap/diamond" />
<TextView
android:id="@+id/diamond_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:clickable="false"
android:focusable="false"
android:text="0"
android:textColor="@color/white"
android:textSize="12sp" />
<ImageView
android:layout_width="8dp"
android:layout_height="8dp"
android:layout_marginEnd="4dp"
android:background="@mipmap/icon_right" />
</LinearLayout>
<LinearLayout
android:id="@+id/gold_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:layout_toRightOf="@id/diamond_linear"
android:gravity="center_vertical">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:clickable="false"
android:focusable="false"
android:src="@mipmap/gold_coin" />
<TextView
android:id="@+id/gold_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:clickable="false"
android:focusable="false"
android:text="10000000"
android:textColor="@color/white"
android:textSize="12sp" />
</LinearLayout>
<FrameLayout
android:id="@+id/gift_send_layout"
android:layout_width="130dp"
android:layout_height="32dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="14dp">
<FrameLayout
android:id="@+id/gift_number_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginEnd="42dp"
android:background="@drawable/background_gift_money2">
<TextView
android:id="@+id/gift_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="15dp"
android:text="1"
android:textColor="#F5C05A"
android:textSize="14sp" />
<ImageView
android:id="@+id/icon_arrow"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_gravity="center_vertical|end"
android:layout_marginEnd="30dp"
android:src="@mipmap/icon_arrow_right_2" />
</FrameLayout>
<TextView
android:id="@+id/live_gift_send"
android:layout_width="62dp"
android:layout_height="32dp"
android:layout_gravity="end"
android:background="@drawable/bg_live_gift_send_new"
android:gravity="center"
android:text="@string/live_gift_send"
android:textColor="@color/white"
android:textSize="14sp" />
</FrameLayout>
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/gift_bottom"
android:layout_below="@id/git_title"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="18dp">
<FrameLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/gift_title"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="8dp"
android:layout_marginEnd="10dp" />
<ImageView
android:layout_width="27dp"
android:layout_height="match_parent"
android:layout_gravity="end"
android:background="@drawable/icon_covering_layer"
android:scaleType="centerCrop" />
</FrameLayout>
<View
android:layout_width="1dp"
android:layout_height="11dp"
android:layout_gravity="center_vertical"
android:background="@color/white" />
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginEnd="10dp">
<TextView
android:id="@+id/live_wrap"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingEnd="8dp"
android:text="@string/live_wrap"
android:textColor="#CCCDCE"
android:textSize="16sp" />
<View
android:id="@+id/red_point"
android:layout_width="6dp"
android:layout_height="6dp"
android:layout_gravity="end"
android:layout_marginEnd="6dp"
android:background="@drawable/bg_red_point" />
</FrameLayout>
</LinearLayout>
<FrameLayout
android:id="@+id/context_layout_gift"
android:layout_width="match_parent"
android:layout_height="196dp"
android:layout_marginTop="12dp" />
</LinearLayout>
<RelativeLayout
android:id="@+id/btn_send_lian"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="10dp"
android:layout_marginBottom="5dp"
android:background="@mipmap/icon_live_gift_lian"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dp"
android:text="@string/live_gift_send_lian"
android:textColor="@color/white"
android:textSize="12sp" />
<TextView
android:id="@+id/lian_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="35dp"
android:textColor="#fff"
android:textSize="14sp" />
</RelativeLayout>
</RelativeLayout>
</LinearLayout>

2
live/src/main/AndroidManifest.xml
View File

@ -25,7 +25,7 @@
android:windowSoftInputMode="adjustPan|stateAlwaysHidden" /> android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />
<activity <activity
android:name=".activity.LiveAudienceActivity" android:name=".activity.LiveAudienceActivity"
android:configChanges="screenLayout|orientation" android:configChanges="screenLayout|orientation|screenSize"
android:launchMode="singleTask" android:launchMode="singleTask"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/AppTheme" android:theme="@style/AppTheme"

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

@ -4,6 +4,7 @@ package com.yunbao.live.activity;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Dialog; import android.app.Dialog;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.media.AudioManager; import android.media.AudioManager;
import android.os.Build; import android.os.Build;
@ -213,6 +214,8 @@ public class LiveAudienceActivity extends LiveActivity {
Bus.getOn(this); Bus.getOn(this);
super.main(); super.main();
liveAudienceActivity = this; liveAudienceActivity = this;
// 设置初始屏幕方向为竖屏
//setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
CrashSaveBean.getInstance().addEnterRoom(); CrashSaveBean.getInstance().addEnterRoom();
mProcessResultUtil = new ProcessResultUtil(this); mProcessResultUtil = new ProcessResultUtil(this);
Intent intent = getIntent(); Intent intent = getIntent();
@ -287,6 +290,10 @@ public class LiveAudienceActivity extends LiveActivity {
} }
}; };
/** /**
* 初始化界面 * 初始化界面
*/ */
@ -904,7 +911,9 @@ public class LiveAudienceActivity extends LiveActivity {
@Override @Override
public void onConfigurationChanged(@NonNull Configuration newConfig) { public void onConfigurationChanged(@NonNull Configuration newConfig) {
super.onConfigurationChanged(newConfig); super.onConfigurationChanged(newConfig);
Log.i(TAG,"onConfigurationChanged");
adjustFullScreen(newConfig); adjustFullScreen(newConfig);
liveHandler.post(liveRunnable);
} }
private void adjustFullScreen(Configuration config) { private void adjustFullScreen(Configuration config) {

33
live/src/main/java/com/yunbao/live/dialog/LiveFansFragment.java
View File

@ -1,10 +1,14 @@
package com.yunbao.live.dialog; package com.yunbao.live.dialog;
import android.app.Activity; import android.app.Activity;
import android.content.Context;
import android.content.res.Configuration;
import android.graphics.Point;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.view.Display;
import android.view.Gravity; import android.view.Gravity;
import android.view.View; import android.view.View;
import android.view.Window; import android.view.Window;
@ -13,7 +17,9 @@ import android.webkit.WebSettings;
import android.webkit.WebView; import android.webkit.WebView;
import android.webkit.WebViewClient; import android.webkit.WebViewClient;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout;
import com.yunbao.common.Constants; import com.yunbao.common.Constants;
import com.yunbao.common.dialog.AbsDialogFragment; import com.yunbao.common.dialog.AbsDialogFragment;
@ -62,14 +68,31 @@ public class LiveFansFragment extends AbsDialogFragment {
@Override @Override
protected void setWindowAttributes(Window window) { protected void setWindowAttributes(Window window) {
window.setWindowAnimations(R.style.bottomToTopAnim);
WindowManager.LayoutParams params = window.getAttributes(); WindowManager.LayoutParams params = window.getAttributes();
params.width = WindowManager.LayoutParams.MATCH_PARENT; if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
params.height = DpUtil.dp2px(400); window.setWindowAnimations(R.style.bottomToTopAnim);
params.gravity = Gravity.BOTTOM; params.width = WindowManager.LayoutParams.MATCH_PARENT;
params.height = DpUtil.dp2px(400);
params.gravity = Gravity.BOTTOM;
} else {
window.setWindowAnimations(R.style.RightLeftToAnim);
// 获取屏幕尺寸
Point size = new Point();
Display display = ((WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
display.getSize(size);
int screenWidth = size.x;
int screenHeight = size.y;
// 设置宽度为屏幕宽度的 48%
params.width = (int) (screenWidth * 0.46f);
// 设置高度为屏幕高度的 70%
params.height = WindowManager.LayoutParams.MATCH_PARENT;
// 设置居中对齐
params.gravity = Gravity.CENTER_VERTICAL | Gravity.RIGHT;
}
window.setAttributes(params); window.setAttributes(params);
} }
@Override @Override
public void onCreate(@Nullable Bundle savedInstanceState) { public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -132,7 +155,7 @@ public class LiveFansFragment extends AbsDialogFragment {
LiveAudienceActivity.is_fans = "2"; LiveAudienceActivity.is_fans = "2";
int num = LiveAudienceActivity.fansNum - 1; int num = LiveAudienceActivity.fansNum - 1;
LiveRoomViewHolder.setFansNum(num); LiveRoomViewHolder.setFansNum(num);
ToastUtil.show(WordUtil.isNewZh()?"退出成功":"Exit successfully"); ToastUtil.show(WordUtil.isNewZh() ? "退出成功" : "Exit successfully");
EventBus.getDefault().post("exitFansGroup"); EventBus.getDefault().post("exitFansGroup");
dismiss(); dismiss();
} else if (TextUtils.equals(event.getMethod(), "sendFansCard")) { } else if (TextUtils.equals(event.getMethod(), "sendFansCard")) {

30
live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
View File

@ -6,8 +6,11 @@ import static com.yunbao.live.views.LiveRoomViewHolder.bean1;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.res.Configuration;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Point;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
@ -16,6 +19,7 @@ import android.text.SpannableStringBuilder;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.style.ForegroundColorSpan; import android.text.style.ForegroundColorSpan;
import android.util.Log; import android.util.Log;
import android.view.Display;
import android.view.Gravity; import android.view.Gravity;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
@ -44,6 +48,7 @@ import com.opensource.svgaplayer.SVGADrawable;
import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAImageView;
import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAParser;
import com.opensource.svgaplayer.SVGAVideoEntity; import com.opensource.svgaplayer.SVGAVideoEntity;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.L; import com.yunbao.common.utils.L;
import com.yunbao.common.utils.MobclickAgent; import com.yunbao.common.utils.MobclickAgent;
import com.yunbao.common.CommonAppConfig; import com.yunbao.common.CommonAppConfig;
@ -1337,12 +1342,29 @@ public class LiveGiftPopup extends AbsDialogFragment {
@Override @Override
protected void setWindowAttributes(Window window) { protected void setWindowAttributes(Window window) {
window.setWindowAnimations(R.style.bottomToTopAnim);
window.setDimAmount(0f);//去掉遮罩层（全透明） window.setDimAmount(0f);//去掉遮罩层（全透明）
WindowManager.LayoutParams params = window.getAttributes(); WindowManager.LayoutParams params = window.getAttributes();
params.width = WindowManager.LayoutParams.MATCH_PARENT; if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
params.height = WindowManager.LayoutParams.WRAP_CONTENT; window.setWindowAnimations(R.style.bottomToTopAnim);
params.gravity = Gravity.BOTTOM; params.width = WindowManager.LayoutParams.MATCH_PARENT;
params.height = WindowManager.LayoutParams.WRAP_CONTENT;
params.gravity = Gravity.BOTTOM;
} else {
window.setWindowAnimations(R.style.RightLeftToAnim);
window.setWindowAnimations(com.yunbao.live.R.style.RightLeftToAnim);
// 获取屏幕尺寸
Point size = new Point();
Display display = ((WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
display.getSize(size);
int screenWidth = size.x;
int screenHeight = size.y;
// 设置宽度为屏幕宽度的 48%
params.width = (int) (screenWidth * 0.46f);
// 设置高度为屏幕高度的 70%
params.height = WindowManager.LayoutParams.MATCH_PARENT;
// 设置居中对齐
params.gravity = Gravity.CENTER_VERTICAL | Gravity.RIGHT;
}
window.setAttributes(params); window.setAttributes(params);
} }

58
live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java
View File

@ -2,6 +2,8 @@ package com.yunbao.live.dialog;
import android.app.Activity; import android.app.Activity;
import android.app.Dialog; import android.app.Dialog;
import android.content.pm.ActivityInfo;
import android.content.res.Configuration;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
@ -71,8 +73,10 @@ import pl.droidsonroids.gif.GifImageView;
/** /**
* Created by cxf on 2018/10/15. * Created by cxf on 2018/10/15.
* 直播间个人资料弹窗 * 直播间个人资料弹窗
*
* @modify by ningwenqiang 2024/8/16
* 如果是横屏则从右边弹出
*/ */
public class LiveUserDialogFragment extends AbsDialogFragment implements View.OnClickListener { public class LiveUserDialogFragment extends AbsDialogFragment implements View.OnClickListener {
private String TAG = "用户弹窗"; private String TAG = "用户弹窗";
@ -150,6 +154,8 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
} }
private boolean isPortrait = true;
@Override @Override
protected void setWindowAttributes(Window window) { protected void setWindowAttributes(Window window) {
window.setWindowAnimations(R.style.bottomToTopAnim); window.setWindowAnimations(R.style.bottomToTopAnim);
@ -157,7 +163,12 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
window.setWindowAnimations(R.style.bottomToTopAnim); window.setWindowAnimations(R.style.bottomToTopAnim);
params.width = WindowManager.LayoutParams.MATCH_PARENT; params.width = WindowManager.LayoutParams.MATCH_PARENT;
params.height = WindowManager.LayoutParams.WRAP_CONTENT; params.height = WindowManager.LayoutParams.WRAP_CONTENT;
params.gravity = Gravity.BOTTOM; isPortrait = getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT;
if (isPortrait) {
params.gravity = Gravity.BOTTOM;
} else {
params.gravity = Gravity.CENTER;
}
window.setAttributes(params); window.setAttributes(params);
} }
@ -209,6 +220,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
loadData(); loadData();
} }
private void initView() { private void initView() {
gift_svga = (SVGAImageView) mRootView.findViewById(R.id.gift_svga); gift_svga = (SVGAImageView) mRootView.findViewById(R.id.gift_svga);
btn_live = mRootView.findViewById(R.id.btn_live); btn_live = mRootView.findViewById(R.id.btn_live);
@ -249,6 +261,17 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
mLvVal = mRootView.findViewById(R.id.user_card_lv_val); mLvVal = mRootView.findViewById(R.id.user_card_lv_val);
mNobleIconLayout.setOnClickListener(this); mNobleIconLayout.setOnClickListener(this);
mSetting.setOnClickListener(this); mSetting.setOnClickListener(this);
if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
View view = findViewById(R.id.rootView);
if (view != null) {
view.setOnClickListener(v -> dismiss());
}
View view1 = findViewById(R.id.bgView);
if (view1 != null) {
view1.setOnClickListener(this);
}
}
mHonorLayout.setOnClickListener(new View.OnClickListener() { mHonorLayout.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
@ -292,7 +315,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
.setVoicePress(isAnchor) .setVoicePress(isAnchor)
.setUname(mToName) .setUname(mToName)
.setAvatar(mAvatarUrl));*/ .setAvatar(mAvatarUrl));*/
new com.yunbao.common.dialog.GiftWallDialog(mContext, mToUid + "",mToName,mLiveUid, isAnchor).setFullWindows(false).showDialog(); new com.yunbao.common.dialog.GiftWallDialog(mContext, mToUid + "", mToName, mLiveUid, isAnchor).setFullWindows(false).showDialog();
dismiss(); dismiss();
} }
}); });
@ -344,7 +367,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
} }
} }
} }
//是否是主播
boolean isAnchor = false; boolean isAnchor = false;
private void showData(String data) { private void showData(String data) {
@ -544,7 +567,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
public void onComplete(SVGAVideoEntity videoItem) { public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem); SVGADrawable drawable = new SVGADrawable(videoItem);
gift_svga.setImageDrawable(drawable); gift_svga.setImageDrawable(drawable);
SVGAViewUtils.playEndClear(gift_svga,true,0,null); SVGAViewUtils.playEndClear(gift_svga, true, 0, null);
//SVGAViewUtils.playEndClear(gift_svga); //SVGAViewUtils.playEndClear(gift_svga);
} }
@ -653,7 +676,15 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
*/ */
private void report() { private void report() {
if (TextUtils.equals(mLiveUid, "uid")) return; if (TextUtils.equals(mLiveUid, "uid")) return;
LiveReportActivity.forward(mContext, mToUid); if (!isPortrait) {
Log.i("nwq", "先切换成竖屏");
getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
LiveReportActivity.forward(mContext, mToUid);
dismiss();
}else {
LiveReportActivity.forward(mContext, mToUid);
}
} }
@ -699,6 +730,15 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
} }
//切换横竖屏
private void switchPortraitOrientation() {
if (!isPortrait) {
Log.i("nwq", "先切换成竖屏");
getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
}
}
@Override @Override
public void onClick(View v) { public void onClick(View v) {
int i = v.getId(); int i = v.getId();
@ -731,6 +771,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
} else if (i == R.id.btn_guard) { } else if (i == R.id.btn_guard) {
if (TextUtils.equals(mLiveUid, "uid")) return; if (TextUtils.equals(mLiveUid, "uid")) return;
MobclickAgent.onEvent(mContext, "anchor_avatar_guard", "守护按钮"); MobclickAgent.onEvent(mContext, "anchor_avatar_guard", "守护按钮");
switchPortraitOrientation();
((LiveActivity) mContext).openNewGuardListWindow(mContext instanceof LiveSwAnchorActivity, mToUid); ((LiveActivity) mContext).openNewGuardListWindow(mContext instanceof LiveSwAnchorActivity, mToUid);
} else if (i == R.id.btn_live) { } else if (i == R.id.btn_live) {
gotoLive(mToUid); gotoLive(mToUid);
@ -740,6 +781,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
dismiss(); dismiss();
((LiveActivity) mContext).openFansWindow(mToUid); ((LiveActivity) mContext).openFansWindow(mToUid);
} else { } else {
switchPortraitOrientation();
MobclickAgent.onEvent(mContext, "user_avatar_noble", "贵族按钮"); MobclickAgent.onEvent(mContext, "user_avatar_noble", "贵族按钮");
Bus.get().post(new LiveAudienceEvent() Bus.get().post(new LiveAudienceEvent()
.setType(LiveAudienceEvent.LiveAudienceType.NOBLE)); .setType(LiveAudienceEvent.LiveAudienceType.NOBLE));
@ -766,7 +808,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
return; return;
} }
boolean isAnchor = CommonAppConfig.getInstance().getUserBean().getUsers_type().equals("C"); boolean isAnchor = CommonAppConfig.getInstance().getUserBean().getUsers_type().equals("C");
CommonHttpUtil.sayHi(mToUid, isAnchor ? "6" : "7",new HttpCallback() { CommonHttpUtil.sayHi(mToUid, isAnchor ? "6" : "7", new HttpCallback() {
@Override @Override
public void onSuccess(int code, String msg, String[] info) { public void onSuccess(int code, String msg, String[] info) {
@ -777,7 +819,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
} }
public void showMsgError() { public void showMsgError() {
ToastUtil.show(WordUtil.isNewZh()?"無法聊天,待開發":"Unable to chat, awaiting development"); ToastUtil.show(WordUtil.isNewZh() ? "無法聊天,待開發" : "Unable to chat, awaiting development");
} }

45
live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
View File

@ -4,6 +4,8 @@ import android.Manifest;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.pm.ActivityInfo;
import android.content.res.Configuration;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Color; import android.graphics.Color;
@ -304,21 +306,22 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
pd_pao.setOnLongClickListener(new View.OnLongClickListener() { pd_pao.setOnLongClickListener(new View.OnLongClickListener() {
@Override @Override
public boolean onLongClick(View view) { public boolean onLongClick(View view) {
IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo(); switchCurrentOrientation();
StringBuffer urlString = new StringBuffer(); // IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
urlString.append(CommonAppConfig.HOST) // StringBuffer urlString = new StringBuffer();
.append("/h5/exchangeShop/index.html?uid=") // urlString.append(CommonAppConfig.HOST)
.append(userInfo.getId()) // .append("/h5/exchangeShop/index.html?uid=")
.append("&token=") // .append(userInfo.getId())
.append(userInfo.getToken()).append("&isZh=") // .append("&token=")
.append(WordUtil.isNewZh() ? "1" : 0); // .append(userInfo.getToken()).append("&isZh=")
Bundle bundle1 = new Bundle(); // .append(WordUtil.isNewZh() ? "1" : 0);
bundle1.putString("url", urlString.toString()); // Bundle bundle1 = new Bundle();
LiveHDDialogFragment liveHDDialogFragment = new LiveHDDialogFragment(); // bundle1.putString("url", urlString.toString());
liveHDDialogFragment.setArguments(bundle1); // LiveHDDialogFragment liveHDDialogFragment = new LiveHDDialogFragment();
liveHDDialogFragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment"); // liveHDDialogFragment.setArguments(bundle1);
Bus.get().post(new QuickGiftingEvent().setReminder(true)); // liveHDDialogFragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");
MobclickAgent.onEvent(mContext, "small_pd_gifts", "长按"); // Bus.get().post(new QuickGiftingEvent().setReminder(true));
// MobclickAgent.onEvent(mContext, "small_pd_gifts", "长按");
return true; return true;
} }
}); });
@ -396,6 +399,18 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
} }
//切换横竖屏
private void switchCurrentOrientation() {
int currentOrientation = context.getResources().getConfiguration().orientation;
if (currentOrientation == Configuration.ORIENTATION_PORTRAIT) {
// 当前为竖屏，切换到横屏
context.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
} else {
// 当前为横屏，切换回竖屏
context. setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
}
}
public void setGiftRemainingQuantity(String giftRemainingQuantity) { public void setGiftRemainingQuantity(String giftRemainingQuantity) {
mQuickGiftRemainingQuantity = Integer.parseInt(giftRemainingQuantity); mQuickGiftRemainingQuantity = Integer.parseInt(giftRemainingQuantity);
if (mQuickGiftRemainingQuantity > 0) { if (mQuickGiftRemainingQuantity > 0) {

1
live/src/main/java/com/yunbao/live/views/LivePlaySwViewHolder.java
View File

@ -674,6 +674,7 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
/** /**
* 播放开始 * 播放开始
* TODO 横屏
*/ */
public void onPrepared() { public void onPrepared() {
if (mEnd) { if (mEnd) {

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

@ -2127,7 +2127,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} }
}; };
//主播倒计时调用接口 //主播倒计时调用接口b
private Handler anchorTimeHandler = new Handler(); private Handler anchorTimeHandler = new Handler();
private int mCountdown; private int mCountdown;
private Runnable anchorTimeRunnable = new Runnable() { private Runnable anchorTimeRunnable = new Runnable() {

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

@ -396,8 +396,10 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
liveHandler.removeCallbacks(loadTimeoutRunnableGone); liveHandler.removeCallbacks(loadTimeoutRunnableGone);
if (mLivePlayViewHolder == null) { if (mLivePlayViewHolder == null) {
if (isSw) { if (isSw) {
Log.i("NWQ", "打开播放器源 声网");
mLivePlayViewHolder = new LivePlaySwViewHolder(mContext, playContainer, mLiveBean.getLandscape()); mLivePlayViewHolder = new LivePlaySwViewHolder(mContext, playContainer, mLiveBean.getLandscape());
} else { } else {
Log.i("NWQ", "打开播放器源 融云");
mLivePlayViewHolder = new LivePlayRyViewHolder(mContext, playContainer, 1); mLivePlayViewHolder = new LivePlayRyViewHolder(mContext, playContainer, 1);
} }
@ -730,9 +732,9 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
} }
} }
isShowPrank = false; isShowPrank = false;
}else{ } else {
//初始化天梯赛数据(不在pk过程中) //初始化天梯赛数据(不在pk过程中)
mLiveRoomViewHolder.initRankPKInfo(mLiveUid,""); mLiveRoomViewHolder.initRankPKInfo(mLiveUid, "");
} }
if (mLiveRoomViewHolder != null) { if (mLiveRoomViewHolder != null) {
mLiveRoomViewHolder.pkHandler = false; mLiveRoomViewHolder.pkHandler = false;
@ -818,9 +820,9 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
upDataPkScore(pkInfo.getJSONArray("userlist"), pkInfo.getIntValue("drpk_time")); upDataPkScore(pkInfo.getJSONArray("userlist"), pkInfo.getIntValue("drpk_time"));
isShowPrank = false; isShowPrank = false;
}else{ } else {
//初始化天梯赛数据(不在pk过程中) //初始化天梯赛数据(不在pk过程中)
mLiveRoomViewHolder.initRankPKInfo(mLiveUid,""); mLiveRoomViewHolder.initRankPKInfo(mLiveUid, "");
} }
if (data.getEnterRoomInfo().getGuard() != null) { if (data.getEnterRoomInfo().getGuard() != null) {
if (mLiveRoomViewHolder != null) { if (mLiveRoomViewHolder != null) {
@ -907,7 +909,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mLiveRoomViewHolder.onSendMoneyLong(); mLiveRoomViewHolder.onSendMoneyLong();
} }
//初始化整蠱列表 //初始化整蠱列表
mLiveRoomViewHolder.initPrankProgress(isShowPrank?1:2); mLiveRoomViewHolder.initPrankProgress(isShowPrank ? 1 : 2);
} }
@ -1967,7 +1969,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
//整蛊进度数据更新 //整蛊进度数据更新
@Override @Override
public void onUpdatePrankProgress(String prankString) { public void onUpdatePrankProgress(String prankString) {
if (mLiveRoomViewHolder != null){ if (mLiveRoomViewHolder != null) {
mLiveRoomViewHolder.refreshPrank(prankString); mLiveRoomViewHolder.refreshPrank(prankString);
} }
} }

5
live/src/main/res/drawable-land/bg_live_user.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="15dp" />
<solid android:color="@color/white" />
</shape>

67
live/src/main/res/layout-land/activity_live_audience.xml Normal file
View File

@ -0,0 +1,67 @@
<?xml version="1.0" encoding="utf-8"?>
<com.yunbao.common.views.weight.MyDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/live_back"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@mipmap/live_bg" />
<View
android:id="@+id/mask"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#80000000" />
<FrameLayout
android:id="@+id/play_container"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<com.yunbao.common.custom.MyViewPager
android:id="@+id/viewPager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:overScrollMode="never" />
<FrameLayout
android:id="@+id/page_container"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<ImageView
android:id="@+id/btn_small_screen"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_gravity="right"
android:layout_marginTop="30dp"
android:layout_marginRight="20dp"
android:padding="5dp"
android:src="@mipmap/icon_live_close"
android:visibility="gone" />
</FrameLayout>
<include
android:id="@+id/loading"
layout="@layout/layout_portrait_live_item" />
<Switch
android:id="@+id/switch1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Switch" />
</com.yunbao.common.views.weight.MyDrawerLayout>

18
live/src/main/res/layout-land/dialog_fans.xml Normal file
View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="18dp"
android:layout_marginBottom="18dp"
android:gravity="center_vertical|right"
android:orientation="vertical"
app:cardCornerRadius="12dp"
app:cardElevation="16dp">
<WebView
android:id="@+id/rlWebview"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</androidx.cardview.widget.CardView>

610
live/src/main/res/layout-land/dialog_new_live_user.xml Normal file
View File

@ -0,0 +1,610 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/rootView"
android:layout_width="match_parent"
android:layout_height="match_parent">
<!--用来确认头像位置的基准线，需要根据背景进行调整 -->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/bgView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:background="@drawable/bg_live_user"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.52"
app:layout_constraintWidth_percent="0.48">
<ImageView
android:id="@+id/title_bg"
android:layout_width="0dp"
android:layout_height="93dp"
android:visibility="visible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<TextView
android:id="@+id/btn_report"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginEnd="14dp"
android:gravity="center"
android:text="@string/report"
android:textColor="#B1B1B1"
android:visibility="visible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/ai_te"
android:layout_width="41dp"
android:layout_height="25dp"
android:layout_marginTop="10dp"
android:background="@drawable/background_fc6945"
android:gravity="center"
android:text="\@TA"
android:textColor="@color/white"
android:visibility="visible"
app:layout_constraintEnd_toEndOf="@+id/btn_report"
app:layout_constraintTop_toBottomOf="@+id/btn_report" />
<LinearLayout
android:id="@+id/btn_guard"
android:layout_width="88dp"
android:layout_height="23dp"
android:layout_marginStart="25dp"
android:layout_marginTop="18dp"
android:background="@drawable/bg_user_card_guard"
android:gravity="center"
android:orientation="horizontal"
android:visibility="invisible"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/guard_val"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="1dp"
android:text="@string/user_card_guard"
android:textColor="#FFFFFF"
android:textSize="10sp" />
<ImageView
android:id="@+id/imageView4"
android:layout_width="10dp"
android:layout_height="10dp"
app:srcCompat="@mipmap/icon_arrow_right_3" />
</LinearLayout>
<ImageView
android:id="@+id/btn_setting"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginTop="18dp"
android:layout_marginEnd="14dp"
android:src="@mipmap/icon_live_usercard_setting"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="MissingConstraints"
tools:visibility="visible" />
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="48dp"
android:ellipsize="end"
android:singleLine="true"
android:textColor="@color/textColor"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="sxsdff" />
<LinearLayout
android:id="@+id/ll1"
android:layout_width="wrap_content"
android:layout_height="17dp"
android:layout_marginTop="13dp"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/name">
<ImageView
android:id="@+id/good_nub_ico"
android:layout_width="18dp"
android:layout_height="15dp"
android:layout_marginRight="6dp"
android:src="@mipmap/usercard_good_nub"
android:visibility="visible" />
<ImageView
android:layout_width="18dp"
android:layout_height="15dp"
android:layout_marginRight="6dp"
android:src="@mipmap/user_card_id"
android:visibility="visible" />
<TextView
android:id="@+id/id_val"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:textColor="#B1B1B1"
android:textSize="13sp" />
<View
android:layout_width="1dp"
android:layout_height="25dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:background="#B1B1B1"
android:visibility="visible" />
<TextView
android:id="@+id/fans_val"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:textColor="#B1B1B1"
android:textSize="13sp" />
<View
android:layout_width="1dp"
android:layout_height="25dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:background="#B1B1B1"
android:visibility="visible" />
<TextView
android:id="@+id/praise_val"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:textColor="#B1B1B1"
android:textSize="13sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll2"
android:layout_width="wrap_content"
android:layout_height="17.5dp"
android:layout_marginTop="15dp"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll1">
<ImageView
android:id="@+id/sex"
android:layout_width="27dp"
android:layout_height="match_parent"
android:layout_marginLeft="4dp" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="46.5dp"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_marginStart="6dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/user_card_lv_icon"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/user_card_lv_val"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_marginStart="5dp"
android:gravity="center"
android:textColor="#FFFFFF"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:id="@+id/btn_union"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="6dp"
android:background="@drawable/bg_user_card_guard"
android:gravity="center"
android:orientation="horizontal"
android:visibility="gone">
<TextView
android:id="@+id/union_val"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:gravity="center"
android:text="@string/user_card_guard"
android:textColor="#FFFFFF"
android:textSize="9sp" />
</LinearLayout>
<ImageView
android:id="@+id/user_card_noble"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="6dp"
android:src="@mipmap/emperor_rom" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll2">
<ImageView
android:layout_width="17dp"
android:layout_height="14dp"
android:layout_gravity="top"
android:src="@mipmap/icon_user_card_t1" />
<TextView
android:id="@+id/sign"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/live_user_dialog_tips"
android:textColor="#B1B1B1"
android:textSize="14sp" />
<ImageView
android:layout_width="17dp"
android:layout_height="14dp"
android:layout_gravity="bottom"
android:src="@mipmap/icon_user_card_t2" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:gravity="center"
android:orientation="horizontal"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll3"
tools:visibility="visible">
<ImageView
android:id="@+id/medal_ico1"
android:layout_width="35dp"
android:layout_height="35dp" />
<LinearLayout
android:id="@+id/ry_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="visible">
<View
android:id="@+id/no_gz"
android:layout_width="1dp"
android:layout_height="25dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:background="#B1B1B1"
android:visibility="visible" />
<ImageView
android:id="@+id/ry_ico1"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginLeft="8dp"
android:visibility="visible" />
<ImageView
android:id="@+id/ry_ico2"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginLeft="8dp"
android:visibility="visible" />
<ImageView
android:id="@+id/ry_ico3"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginLeft="8dp"
android:visibility="visible" />
<ImageView
android:id="@+id/ry_ico4"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginLeft="8dp"
android:visibility="visible" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll5"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:visibility="visible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll4">
<LinearLayout
android:id="@+id/user_level_layout"
android:layout_width="0dp"
android:layout_height="55dp"
android:layout_marginStart="8dp"
android:layout_weight="1"
android:background="@drawable/bg_user_card_lv"
android:gravity="center_vertical">
<ImageView
android:id="@+id/live_icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="2dp"
android:layout_marginEnd="5dp"
android:src="@mipmap/icon_chat_face"
android:visibility="visible" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/lv_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/live_user_level_anchor"
android:textColor="#FFFFFF"
android:textSize="11sp" />
<TextView
android:id="@+id/lv_val"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Lv.0"
android:textColor="#FFFFFF"
android:textSize="9sp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/gift_wall"
android:layout_width="0dp"
android:layout_height="55dp"
android:layout_marginStart="8dp"
android:layout_weight="1"
android:background="@drawable/bg_user_card_lv"
android:gravity="center_vertical">
<ImageView
android:id="@+id/icon_gift_wall"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="2dp"
android:layout_marginEnd="5dp"
android:src="@mipmap/icon_chat_face"
android:visibility="visible" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/text_gift_wall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/live_user_level_anchor"
android:textColor="#FFFFFF"
android:textSize="11sp" />
<TextView
android:id="@+id/value_gift_wall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Lv.0"
android:textColor="#FFFFFF"
android:textSize="9sp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/noble_icon_layout"
android:layout_width="0dp"
android:layout_height="55dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:background="@mipmap/img_aristocrat_notopen"
android:gravity="center_vertical">
<ImageView
android:id="@+id/noble_icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="7dp"
android:layout_marginEnd="5dp"
android:src="@mipmap/img_fans_default"
android:visibility="invisible" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:layout_marginEnd="2dp"
android:orientation="vertical">
<TextView
android:id="@+id/noble_title_val"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/live_noble_level_anchor"
android:textColor="#FFFFFF"
android:textSize="11sp" />
<TextView
android:id="@+id/noble_val"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Lv.0"
android:textColor="#FFFFFF"
android:textSize="9sp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/honor_layout"
android:layout_width="0dp"
android:layout_height="55dp"
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:background="@drawable/bg_user_card_honor"
android:gravity="center_vertical">
<ImageView
android:id="@+id/honor_icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="2dp"
android:layout_marginEnd="5dp"
android:src="@mipmap/img_honor_default"
android:visibility="visible" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/live_honor_number_anchor"
android:textColor="#FFFFFF"
android:textSize="11sp" />
<TextView
android:id="@+id/honor_val"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#FFFFFF"
android:textSize="9sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<FrameLayout
android:id="@+id/bottom_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="13dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll5" />
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:id="@+id/guideline"
android:layout_width="1dp"
android:layout_height="1dp"
android:layout_marginTop="20dp"
app:layout_constraintStart_toStartOf="@id/bgView"
app:layout_constraintTop_toTopOf="@id/bgView" />
<ImageView
android:id="@+id/shawl"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="@id/bgView"
app:layout_constraintStart_toStartOf="@id/bgView"
app:layout_constraintTop_toTopOf="@+id/guideline"
app:layout_constraintBottom_toBottomOf="@+id/guideline" />
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar"
android:layout_width="63dp"
android:layout_height="63dp"
android:layout_centerInParent="true"
android:scaleType="centerCrop"
app:layout_constraintBottom_toBottomOf="@+id/guideline"
app:layout_constraintEnd_toEndOf="@id/bgView"
app:layout_constraintStart_toStartOf="@id/bgView"
app:riv_oval="true"
tools:src="@mipmap/icon_avatar_male" />
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/gift_svga"
android:layout_width="82dp"
android:layout_height="82dp"
android:layout_centerInParent="true"
android:scaleType="centerCrop"
app:autoPlay="true"
app:layout_constraintBottom_toBottomOf="@+id/avatar"
app:layout_constraintEnd_toEndOf="@+id/avatar"
app:layout_constraintStart_toStartOf="@+id/avatar"
app:layout_constraintTop_toTopOf="@+id/avatar" />
<pl.droidsonroids.gif.GifImageView
android:id="@+id/btn_live"
android:layout_width="70dp"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:adjustViewBounds="true"
android:src="@mipmap/icon_user_home_living"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="@+id/gift_svga"
app:layout_constraintEnd_toEndOf="@+id/gift_svga"
app:layout_constraintStart_toStartOf="@+id/gift_svga" />
</androidx.constraintlayout.widget.ConstraintLayout>

520
live/src/main/res/layout-land/view_live_audience.xml Normal file
View File

@ -0,0 +1,520 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_gravity="bottom"
android:orientation="vertical">
<LinearLayout
android:id="@+id/btn_turntable"
android:layout_width="76dp"
android:layout_height="45dp"
android:layout_gravity="right"
android:layout_marginRight="10dp"
android:layout_marginBottom="30dp"
android:gravity="center_horizontal"
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/live_turntable" />
</LinearLayout>
<LinearLayout
android:id="@+id/btn_onecz_event"
android:layout_width="55dp"
android:layout_height="55dp"
android:layout_gravity="right"
android:layout_marginRight="10dp"
android:layout_marginBottom="20dp"
android:gravity="center_horizontal"
android:orientation="vertical"
android:visibility="gone">
<pl.droidsonroids.gif.GifImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:adjustViewBounds="true"
android:src="@mipmap/onecz" />
</LinearLayout>
<LinearLayout
android:id="@+id/btn_wishlist"
android:layout_width="55dp"
android:layout_height="55dp"
android:layout_gravity="right"
android:layout_marginRight="10dp"
android:layout_marginBottom="50dp"
android:gravity="center_horizontal"
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/icon_wish_player" />
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/live_wish_list"
android:textColor="@color/gray2"
android:textSize="10sp"
android:visibility="gone" />
</LinearLayout>
<LinearLayout
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_gravity="right"
android:layout_marginRight="10dp"
android:layout_marginBottom="5dp"
android:background="@drawable/bg_live_link_mic"
android:gravity="center_horizontal"
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginTop="2dp"
android:src="@mipmap/icon_live_link_mic" />
<TextView
android:id="@+id/link_mic_tip"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/live_link_mic_2"
android:textColor="@color/gray2"
android:textSize="10sp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_alignParentBottom="true"
android:gravity="center_vertical">
<ImageView
android:id="@+id/btn_close"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:padding="5dp"
android:src="@mipmap/icon_live_close"
android:visibility="invisible" />
<pl.droidsonroids.gif.GifImageView
android:id="@+id/btn_zg"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:layout_toLeftOf="@id/btn_gift"
android:adjustViewBounds="true"
android:background="@mipmap/img_bg"
android:padding="5dp"
android:src="@mipmap/zg"
android:visibility="gone" />
<RelativeLayout
android:id="@+id/btn_zg1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toLeftOf="@id/btn_zg"
android:visibility="gone">
<ImageView
android:layout_width="32dp"
android:layout_height="32dp"
android:background="@mipmap/img_bg" />
<pl.droidsonroids.gif.GifImageView
android:id="@+id/btn_hd"
android:layout_width="33dp"
android:layout_height="33dp"
android:adjustViewBounds="true"
android:src="@mipmap/play" />
</RelativeLayout>
<pl.droidsonroids.gif.GifImageView
android:id="@+id/btn_share"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:layout_toRightOf="@id/btn_gift"
android:adjustViewBounds="true"
android:background="@mipmap/img_bg"
android:padding="5dp"
android:src="@mipmap/zan_gif"
android:visibility="gone" />
<pl.droidsonroids.gif.GifImageView
android:id="@+id/btn_gift"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:layout_marginRight="10dp"
android:layout_toLeftOf="@id/btn_close"
android:adjustViewBounds="true"
android:background="@mipmap/img_bg"
android:src="@mipmap/live_lw"
android:visibility="gone" />
<ImageView
android:id="@+id/btn_link_mic"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_centerVertical="true"
android:layout_toLeftOf="@id/btn_more"
android:src="@mipmap/icon_live_link_mic_1"
android:visibility="gone" />
<ImageView
android:id="@+id/btn_more"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_centerVertical="true"
android:layout_marginRight="5dp"
android:layout_toLeftOf="@id/btn_mic"
android:src="@mipmap/live_user_more"
android:visibility="gone" />
<ImageView
android:id="@+id/btn_mic"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_centerVertical="true"
android:layout_marginRight="5dp"
android:layout_toLeftOf="@id/btn_zg1"
android:src="@mipmap/lianmai"
android:visibility="gone" />
<ImageView
android:id="@+id/btn_red_pack"
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_marginRight="5dp"
android:layout_toLeftOf="@id/btn_link_mic"
android:padding="5dp"
android:src="@mipmap/icon_live_red_pack"
android:visibility="gone" />
<!--聊天-->
<LinearLayout
android:layout_width="126dp"
android:layout_height="35dp"
android:layout_marginStart="10dp"
android:clickable="false"
android:orientation="horizontal">
<TextView
android:id="@+id/et_input"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="9"
android:alpha="0.5"
android:background="@drawable/bc_sound_recording_left"
android:gravity="center"
android:hint="@string/say_something3"
android:singleLine="true"
android:textColor="#D9D9D9"
android:textColorHint="@color/gray3"
android:textSize="12sp" />
<LinearLayout
android:id="@+id/voice_button"
android:layout_width="36dp"
android:layout_height="36dp"
android:background="@drawable/bc_sound_recording_right"
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center">
<ImageView
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_gravity="center"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:src="@mipmap/icon_voice"
android:visibility="visible" />
</LinearLayout>
</LinearLayout>
<!--消息中心-->
<RelativeLayout
android:visibility="visible"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<RelativeLayout
android:id="@+id/rt_msg"
android:layout_width="45dp"
android:layout_height="45dp">
<ImageView
android:id="@+id/btn_msg"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_centerInParent="true"
android:src="@mipmap/icon_message" />
<View
android:id="@+id/v_msg_redpoint"
android:layout_width="6dp"
android:layout_height="6dp"
android:layout_marginTop="6dp"
android:background="@drawable/background_ff5075"
android:visibility="gone" />
</RelativeLayout>
<TextView
android:id="@+id/red_point"
android:layout_width="6dp"
android:layout_height="6dp"
android:layout_alignTop="@id/rt_msg"
android:layout_alignRight="@id/rt_msg"
android:layout_marginTop="5dp"
android:layout_marginRight="5dp"
android:background="@drawable/bg_red_point"
android:gravity="center"
android:includeFontPadding="false"
android:minWidth="14dp"
android:paddingLeft="3dp"
android:paddingRight="3dp"
android:textColor="#fff"
android:textSize="10sp"
android:translationY="-4dp"
android:visibility="invisible" />
</RelativeLayout>
<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_weight="1" />
<!--整蛊-->
<ImageView
android:id="@+id/live_cheat"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginEnd="8dp"
android:src="@mipmap/icon_prank"
android:visibility="gone" />
<!--玩-->
<ImageView
android:id="@+id/live_play"
android:layout_width="27.2dp"
android:layout_height="27.2dp"
android:layout_marginEnd="8dp"
android:src="@mipmap/live_icon_play"
android:visibility="gone" />
<!--新人特惠-->
<RelativeLayout
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginEnd="13dp"
android:padding="4dp"
android:visibility="gone">
<ImageView
android:id="@+id/live_new_people"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:src="@mipmap/live_icon_newpeople_en"
android:visibility="invisible" />
<View
android:id="@+id/live_new_people_red_dot"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_alignParentRight="true"
android:layout_marginTop="0dp"
android:layout_marginRight="0dp"
android:background="@drawable/background_ff5075"
android:visibility="invisible" />
</RelativeLayout>
<RelativeLayout
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginEnd="8dp">
<com.yunbao.common.views.weight.CircleProgress2
android:id="@+id/circleProgress"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true" />
<ImageView
android:id="@+id/pd_pao"
android:layout_width="27dp"
android:layout_height="27dp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:src="@mipmap/icon_pd_pao" />
<TextView
android:id="@+id/time_text"
android:layout_width="27dp"
android:layout_height="27dp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:background="@drawable/backgroud_panda_time"
android:gravity="center"
android:text="120S"
android:textColor="@color/white"
android:textSize="10sp"
android:visibility="gone" />
<ImageView
android:id="@+id/combo"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@mipmap/icon_combo"
android:visibility="gone" />
</RelativeLayout>
<!--礼物-->
<ImageView
android:id="@+id/gift_image"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginEnd="8dp"
android:background="@drawable/background_gift" />
<!--特权-->
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="40dp"
android:layout_height="40dp">
<ImageView
android:id="@+id/live_privilege"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginEnd="8dp"
android:src="@mipmap/icon_privilege"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/privilege_red_point"
android:layout_width="6dp"
android:layout_height="6dp"
android:layout_marginTop="5dp"
android:layout_marginEnd="10dp"
android:background="@drawable/bg_red_point"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>
<RelativeLayout
android:layout_width="38dp"
android:layout_height="38dp">
<!--普通工具合集-->
<ImageView
android:id="@+id/total_image"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginEnd="8dp"
android:src="@mipmap/icon_more_live_menu" />
<View
android:id="@+id/total_image_red_point"
android:layout_width="6dp"
android:layout_height="6dp"
android:layout_alignParentEnd="true"
android:layout_marginEnd="12dp"
android:layout_marginTop="3dp"
android:background="@drawable/bg_red_point"
tools:visibility="visible" />
</RelativeLayout>
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_alignParentBottom="true"
android:layout_marginBottom="360dp">
<com.opensource.svgaplayer.SVGAImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical" />
<include
android:id="@+id/station_horn_banner"
layout="@layout/view_whole_station_horn_layout"
android:visibility="gone" />
</RelativeLayout>
<TextView
android:id="@+id/quick_gift_remaining_quantity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginEnd="144dp"
android:layout_marginBottom="-2dp"
android:text="99"
android:textColor="#FFB403"
android:textSize="8sp"
android:textStyle="bold" />
</RelativeLayout>
</LinearLayout>

92
live/src/main/res/layout-land/view_live_play_ksy.xml Normal file
View File

@ -0,0 +1,92 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/root"
android:animateLayoutChanges="true"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.google.android.exoplayer2.ui.StyledPlayerView
android:id="@+id/video_view"
android:layout_width="match_parent"
app:surface_type="texture_view"
app:use_controller="false"
android:layout_height="match_parent" />
<ImageView
android:id="@+id/leave"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:scaleType="centerCrop"
android:src="@mipmap/zslk"
android:visibility="gone" />
<RelativeLayout
android:id="@+id/pk_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/live_top">
<com.yunbao.live.custom.MyFrameLayout4
android:id="@+id/left_container"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginBottom="20dp" />
<com.yunbao.live.custom.MyFrameLayout4
android:id="@+id/right_container"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="right"
android:layout_marginBottom="20dp" />
</RelativeLayout>
<com.yunbao.live.custom.MyFrameLayout3
android:id="@+id/small_container"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="120dp"
app:mfl3_ratio="0.25" />
<FrameLayout
android:id="@+id/ry_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<ImageView
android:id="@+id/cover"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop" />
<ProgressBar
android:id="@+id/loading"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginTop="240dp"
android:layout_centerHorizontal="true"
android:indeterminateBehavior="repeat"
android:indeterminateDrawable="@drawable/anim_loading"
android:indeterminateOnly="true"
android:visibility="invisible" />
<ProgressBar
android:id="@+id/loading2"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginTop="240dp"
android:layout_centerHorizontal="true"
android:indeterminateBehavior="repeat"
android:indeterminateDrawable="@drawable/anim_loading"
android:indeterminateOnly="true"
android:visibility="invisible" />
</RelativeLayout>

169
live/src/main/res/layout-land/view_live_play_sw.xml Normal file
View File

@ -0,0 +1,169 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:animateLayoutChanges="true">
<com.google.android.exoplayer2.ui.StyledPlayerView
android:id="@+id/video_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"
app:surface_type="texture_view"
app:use_controller="false" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="300dp"
android:layout_centerVertical="true"
android:orientation="horizontal">
<FrameLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<FrameLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
</LinearLayout>
<ImageView
android:id="@+id/leave"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_gravity="center_vertical"
android:scaleType="centerCrop"
android:src="@mipmap/zslk"
android:visibility="gone" />
<FrameLayout
android:id="@+id/pk_container"
android:layout_width="match_parent"
android:layout_height="280dp"
android:layout_marginTop="130dp">
<com.yunbao.live.custom.MyFrameLayout4
android:id="@+id/left_container"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginBottom="20dp" />
<com.yunbao.live.custom.MyFrameLayout4
android:id="@+id/right_container"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="right"
android:layout_marginBottom="20dp" />
</FrameLayout>
<LinearLayout
android:id="@+id/dr_pk_view"
android:layout_width="match_parent"
android:layout_height="280dp"
android:layout_marginTop="130dp"
android:orientation="horizontal"
android:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<FrameLayout
android:id="@+id/dr1_preview"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="@mipmap/live_icon_vacancy"
tools:ignore="NestedWeights" />
<FrameLayout
android:id="@+id/dr3_preview"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="@mipmap/live_icon_vacancy" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<FrameLayout
android:id="@+id/dr2_preview"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="@mipmap/live_icon_vacancy"
tools:ignore="NestedWeights" />
<FrameLayout
android:id="@+id/dr4_preview"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="@mipmap/live_icon_vacancy" />
</LinearLayout>
</LinearLayout>
<com.yunbao.live.custom.MyFrameLayout3
android:id="@+id/small_container"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="120dp"
app:mfl3_ratio="0.25" />
<FrameLayout
android:id="@+id/ry_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<ImageView
android:id="@+id/cover"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop" />
<ProgressBar
android:id="@+id/loading"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="240dp"
android:indeterminateBehavior="repeat"
android:indeterminateDrawable="@drawable/anim_loading"
android:indeterminateOnly="true"
android:visibility="invisible"
tools:visibility="visible"/>
<ProgressBar
android:id="@+id/loading2"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="240dp"
android:indeterminateBehavior="repeat"
android:indeterminateDrawable="@drawable/anim_loading"
android:indeterminateOnly="true"
android:visibility="invisible"
tools:visibility="visible"/>
</RelativeLayout>

2827
live/src/main/res/layout-land/view_live_room.xml Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -395,7 +395,6 @@
<ImageView <ImageView
android:id="@+id/pd_pao" android:id="@+id/pd_pao"
android:layout_width="27dp" android:layout_width="27dp"
android:layout_height="27dp" android:layout_height="27dp"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"

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

@ -236,6 +236,7 @@
android:visibility="gone" /> android:visibility="gone" />
</RelativeLayout> </RelativeLayout>
<!--这个是登记排行的 -->
<FrameLayout <FrameLayout
android:id="@+id/hour_rank_layout" android:id="@+id/hour_rank_layout"
android:layout_width="80dp" android:layout_width="80dp"