From e0a398a9fdab66ec037e436c2ee6dbabf2e47eea Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Fri, 21 Oct 2022 16:01:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E5=86=85=E6=92=AD=E6=94=BE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yunbao/common/views/floatingview/APPEasyFloat.java | 2 +- .../java/com/yunbao/common/views/weight/LiveFloatView.java | 2 +- .../java/com/yunbao/live/activity/LiveAudienceActivity.java | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/views/floatingview/APPEasyFloat.java b/common/src/main/java/com/yunbao/common/views/floatingview/APPEasyFloat.java index dae2d455e..1549e406d 100644 --- a/common/src/main/java/com/yunbao/common/views/floatingview/APPEasyFloat.java +++ b/common/src/main/java/com/yunbao/common/views/floatingview/APPEasyFloat.java @@ -144,7 +144,7 @@ public class APPEasyFloat implements Application.ActivityLifecycleCallbacks { } private void initShow(Activity activity) { - if (FloatingView.get().getContainer() == null) { + if (FloatingView.get().getView() == null) { EnFloatingView enFloatingView = new EnFloatingView(activity, mLayout); FloatingView.get().customView(enFloatingView); if (magnetViewListener != null) { diff --git a/common/src/main/java/com/yunbao/common/views/weight/LiveFloatView.java b/common/src/main/java/com/yunbao/common/views/weight/LiveFloatView.java index 8e13863b3..40e278042 100644 --- a/common/src/main/java/com/yunbao/common/views/weight/LiveFloatView.java +++ b/common/src/main/java/com/yunbao/common/views/weight/LiveFloatView.java @@ -77,7 +77,7 @@ public class LiveFloatView implements Function1 { @Override public void onRemove() { - mPlayer.stopPlay(); +// mPlayer.stopPlay(); } }) .show(mContext); diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java index b1cdb762d..511a96ca6 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -3,12 +3,10 @@ package com.yunbao.live.activity; import static com.yunbao.live.views.LivePlayRyViewHolder.Micing; import android.annotation.SuppressLint; -import android.app.PictureInPictureParams; import android.content.Context; import android.content.Intent; import android.content.res.Configuration; import android.media.AudioManager; -import android.os.Build; import android.os.Bundle; import android.os.CountDownTimer; import android.os.Handler; @@ -21,7 +19,6 @@ import android.widget.ImageView; import androidx.annotation.IdRes; import androidx.annotation.NonNull; -import androidx.annotation.RequiresApi; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; import androidx.core.view.WindowInsetsControllerCompat;