diff --git a/common/src/main/java/com/yunbao/common/event/CustomDrawerPopupEvent.java b/common/src/main/java/com/yunbao/common/event/CustomDrawerPopupEvent.java index 21b3826a2..c9279d3e6 100644 --- a/common/src/main/java/com/yunbao/common/event/CustomDrawerPopupEvent.java +++ b/common/src/main/java/com/yunbao/common/event/CustomDrawerPopupEvent.java @@ -23,6 +23,28 @@ public class CustomDrawerPopupEvent extends BaseModel { private boolean refresh = false; //特效設置 private boolean effects = false; + //小窗播放 + private boolean smallWindow = false; + //畫質選擇 + private boolean qualitySelection = false; + + public boolean isSmallWindow() { + return smallWindow; + } + + public CustomDrawerPopupEvent setSmallWindow(boolean smallWindow) { + this.smallWindow = smallWindow; + return this; + } + + public boolean isQualitySelection() { + return qualitySelection; + } + + public CustomDrawerPopupEvent setQualitySelection(boolean qualitySelection) { + this.qualitySelection = qualitySelection; + return this; + } public boolean isRefresh() { return refresh; diff --git a/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java b/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java index b028c4975..2b793f583 100644 --- a/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java +++ b/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java @@ -146,6 +146,20 @@ public class CustomDrawerPopupView extends DrawerPopupView { .popupPosition(PopupPosition.Top) .asCustom(new MoreMenuPopupView(mContext)) + .show(); + } + }); + //播放设置 + ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.live_play_setting), new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + XPopup.Builder builder = new XPopup.Builder(getContext()).atView(findViewById(R.id.more_menu)); + builder.hasShadowBg(false) + .isDestroyOnDismiss(true) + .isLightStatusBar(false) + .popupPosition(PopupPosition.Top) + .asCustom(new PlaySettingPopupView(mContext)) + .show(); } }); @@ -235,10 +249,18 @@ public class CustomDrawerPopupView extends DrawerPopupView { dismiss(); callBack.reportLayout(); } - if(event.isEffects()){ + if (event.isEffects()) { dismiss(); callBack.effectsSetting(); } + if (event.isSmallWindow()) { + dismiss(); + callBack.floatSetting(); + } + if (event.isQualitySelection()) { + dismiss(); + callBack.changeVideo(); + } } if (event.isRefresh()) { diff --git a/common/src/main/java/com/yunbao/common/views/PlaySettingPopupView.java b/common/src/main/java/com/yunbao/common/views/PlaySettingPopupView.java new file mode 100644 index 000000000..bf5ad1bc2 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/views/PlaySettingPopupView.java @@ -0,0 +1,55 @@ +package com.yunbao.common.views; + +import android.content.Context; + +import androidx.annotation.NonNull; + +import com.lxj.xpopup.core.AttachPopupView; +import com.yunbao.common.R; +import com.yunbao.common.event.CustomDrawerPopupEvent; +import com.yunbao.common.utils.Bus; +import com.yunbao.common.views.weight.ViewClicksAntiShake; + +public class PlaySettingPopupView extends AttachPopupView { + public PlaySettingPopupView(@NonNull Context context) { + super(context); + } + + @Override + protected int getImplLayoutId() { + return R.layout.view_play_setting; + } + + @Override + protected void onCreate() { + //特效设置 + ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.effects_settings_layout), new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + dismiss(); + Bus.get().post(new CustomDrawerPopupEvent() + .setDisMiss(true).setEffects(true)); + } + }); + //小窗播放 + ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.float_settings_layout), new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + dismiss(); + Bus.get().post(new CustomDrawerPopupEvent() + .setDisMiss(true).setSmallWindow(true)); + } + }); + //畫質選擇 + ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.system_notice), new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + dismiss(); + Bus.get().post(new CustomDrawerPopupEvent() + .setDisMiss(true).setQualitySelection(true)); + } + }); + + + } +} diff --git a/common/src/main/res/layout/custom_drawer_popup.xml b/common/src/main/res/layout/custom_drawer_popup.xml index 840cacee0..5e987738f 100644 --- a/common/src/main/res/layout/custom_drawer_popup.xml +++ b/common/src/main/res/layout/custom_drawer_popup.xml @@ -46,7 +46,7 @@ android:id="@+id/slide_settings_layout" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="12dp" + android:layout_marginStart="24dp" android:gravity="center" android:orientation="vertical"> @@ -68,7 +68,7 @@ android:id="@+id/share_layout" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="12dp" + android:layout_marginStart="24dp" android:gravity="center" android:orientation="vertical"> @@ -92,7 +92,8 @@ android:layout_height="wrap_content" android:layout_marginStart="12dp" android:gravity="center" - android:orientation="vertical"> + android:orientation="vertical" + android:visibility="gone"> + + + + + + + + android:orientation="vertical" + android:visibility="gone"> diff --git a/common/src/main/res/layout/view_more_menu.xml b/common/src/main/res/layout/view_more_menu.xml index 3e788164f..505522dce 100644 --- a/common/src/main/res/layout/view_more_menu.xml +++ b/common/src/main/res/layout/view_more_menu.xml @@ -1,7 +1,7 @@ + + android:orientation="vertical" + android:visibility="gone"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/common/src/main/res/mipmap-xxhdpi/icon_bfsz.png b/common/src/main/res/mipmap-xxhdpi/icon_bfsz.png new file mode 100644 index 000000000..bc115ec6f Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/icon_bfsz.png differ diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index f46917ebe..3939bc3ce 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1113,5 +1113,6 @@ 不使用 使用 心願 + 播放設置 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 afc7c8c8a..07f4f76fc 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -144,7 +144,7 @@ public class LiveAudienceActivity extends LiveActivity { private LiveBean mLiveBean; //当前直播间下标 private int mCurrentItem, mCurrentPage; - private static PortraitLiveManager manager; + private static PortraitLiveManager manager; private int mLastPosition = -1; private ViewGroup mViewGroup;