1.22.1

CHANGELOG.md

@@ -1,3 +1,34 @@
+## 【v1.22.1] - 2025-01-09
+
+### 【手机开播（纯视频）场景】
+
+新增：
+1. 【推流】断流后页面增加常驻提示【Demo、Common】
+2. 【打赏】支持屏蔽打赏特效【Demo】
+3. 【打赏】支持开启/关闭礼物打赏【Demo、Common、SDK】
+4. 【回放】支持开播前设置回放开关【Demo、SDK】
+
+优化：
+1. 【UI】在线列表入口优化【Demo】
+2. 【UI】观众申请连麦提示优化【Demo】
+3. 【UI】开播前设置页优化【Demo】
+4. 【UI】根据参数隐藏"混流布局"、"横竖屏"【Demo、SDK】
+
+### 【手机开播（三分屏）场景】
+
+新增：
+1. 【推流】断流后页面增加常驻提示【Demo、Common】
+
+### 【观看端（云课堂）场景】
+
+修复：
+1. 【打赏】修复横屏礼物打赏响应开关失败问题【Demo】
+
+### 【SDK】
+
+优化：
+1. 【RTC】RTC兼容低版本【SDK】
+
 ## 【v1.22.0] - 2024-12-10
 
 ### 【手机开播（纯视频）场景】

README.md

@@ -2,7 +2,7 @@ polyv-android-livescenes-sdk-demo
 ===
 
 [![build passing](https://img.shields.io/badge/build-passing-brightgreen.svg)](#)
-[![GitHub release](https://img.shields.io/badge/release-v1.22.0-blue.svg)](https://github.com/polyv/polyv-android-livescenes-sdk-demo/releases/tag/v1.22.0)
+[![GitHub release](https://img.shields.io/badge/release-v1.22.1-blue.svg)](https://github.com/polyv/polyv-android-livescenes-sdk-demo/releases/tag/v1.22.1)
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
@@ -66,7 +66,8 @@ Demo [下载链接](https://www.pgyer.com/Mb6m) （密码：polyv）
 
 | Github仓库Tag | 依赖SDK版本    | API文档                                                                                     | Common层 | 观看端-云课堂场景 | 观看端-直播带货场景 | 开播端-手机开播三分屏场景 | 开播端-手机开播纯视频场景 | 互动学堂场景 |
 |-------------|------------|-------------------------------------------------------------------------------------------|---------|---------|----------|---------------|---------------|--------|
-| 1.22.0      | 1.22.0     | [v1.22.0 API](http://repo.polyv.net/android/livescenes/javadoc/1.22.0/index.html)         | ✅       |   ✅      |  ✅        | ✅              | ✅              |        |
+| 1.22.1      | 1.22.1     | [v1.22.1 API](http://repo.polyv.net/android/livescenes/javadoc/1.22.1/index.html)         | ✅       |   ✅      |          | ✅              | ✅              |        |
+| 1.22.0      | 1.22.0     | [v1.22.0 API](http://repo.polyv.net/android/livescenes/javadoc/1.22.0/index.html)         | ✅       |   ✅      |  ✅       | ✅              | ✅              |        |
 | 1.21.0      | 1.21.0     | [v1.21.0 API](http://repo.polyv.net/android/livescenes/javadoc/1.21.0/index.html)         | ✅       |         |          | ✅              | ✅              |        |
 | 1.20.0      | 1.20.0     | [v1.20.0 API](http://repo.polyv.net/android/livescenes/javadoc/1.20.0/index.html)         | ✅       |   ✅      |  ✅       | ✅              | ✅              |        |
 | 1.19.1      | 1.19.1     | [v1.19.1 API](http://repo.polyv.net/android/livescenes/javadoc/1.19.1/index.html)         | ✅       |   ✅      |  ✅       |               |               |        |

build.gradle

@@ -52,8 +52,8 @@ ext {
     compileSdkVersion = 31
     minSdkVersion = 21
     targetSdkVersion = 30
-    versionCode = 1220
-    versionName = "1.22.0"
+    versionCode = 1221
+    versionName = "1.22.1"
 }
 
 task clean(type: Delete) {

demo/src/main/java/com/easefun/polyv/livedemo/PLVLoginWatcherActivity.java

@@ -1,6 +1,5 @@
 package com.easefun.polyv.livedemo;
 
-import static com.plv.foundationsdk.utils.PLVSugarUtil.format;
 import static com.plv.foundationsdk.utils.PLVSugarUtil.nullable;
 
 import android.app.ProgressDialog;
@@ -50,6 +49,7 @@
 import com.plv.thirdpart.blankj.utilcode.util.ToastUtils;
 
 import java.io.File;
+import java.util.Calendar;
 
 /**
  * date: 2020-04-29
@@ -185,6 +185,7 @@ private void initView() {
         //默认选择直播
         rlLiveGroupLayout.performClick();
 
+        initCopyright();
         initPlaybackCacheConfig();
         initPlaybackCacheViewModel();
         initMultiVenueViewModel();
@@ -312,6 +313,11 @@ public void onDismiss(DialogInterface dialog) {
         });
     }
 
+    private void initCopyright() {
+        final int year = Calendar.getInstance().get(Calendar.YEAR);
+        tvCopyright.setText("");
+    }
+
     private void initPlaybackCacheConfig() {
         PLVDependManager.getInstance().get(PLVPlaybackCacheConfig.class)
                 .setApplicationContext(getApplicationContext())

demo/src/main/res/layout/plv_login_watcher_activity.xml

@@ -2,6 +2,7 @@
 
 <com.easefun.polyv.livecommon.ui.widget.PLVSoftView 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/plv_login_soft_listener_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -212,6 +213,6 @@
         android:layout_marginTop="@dimen/dm_10"
         android:layout_marginBottom="@dimen/dm_30"
         android:gravity="bottom"
-        android:text="@string/plv_login_copyright" />
+        tools:text="Copyright" />
 
 </com.easefun.polyv.livecommon.ui.widget.PLVSoftView>

demo/src/main/res/values-b+zh+Hant/strings.xml

@@ -10,7 +10,6 @@
     <string name="plv_login_appId">APP ID</string>
     <string name="plv_login_appSecret">APP Secret</string>
     <string name="plv_login_waiting">正在登录中，请稍等…</string>
-    <string name="plv_login_copyright">2013 – 2023 易方信息科技股份有限公司 版权所有</string>
 
     <!--手机开播登录页多语言适配-->
     <string name="plv_login_streamer_live_broadcast">手機開播</string>

demo/src/main/res/values-ja/strings.xml

@@ -10,7 +10,6 @@
     <string name="plv_login_appId">APP ID</string>
     <string name="plv_login_appSecret">APP Secret</string>
     <string name="plv_login_waiting">正在登录中，请稍等…</string>
-    <string name="plv_login_copyright">2013 – 2023 易方信息科技股份有限公司 版权所有</string>
 
     <!--手机开播登录页多语言适配-->
     <string name="plv_login_streamer_live_broadcast">携帯電話でスタート</string>

demo/src/main/res/values-ko/strings.xml

@@ -10,7 +10,6 @@
     <string name="plv_login_appId">APP ID</string>
     <string name="plv_login_appSecret">APP Secret</string>
     <string name="plv_login_waiting">正在登录中，请稍等…</string>
-    <string name="plv_login_copyright">2013 – 2023 易方信息科技股份有限公司 版权所有</string>
 
     <!--手机开播登录页多语言适配-->
     <string name="plv_login_streamer_live_broadcast">휴대폰 방송 시작</string>

demo/src/main/res/values-zh/strings.xml

@@ -10,7 +10,6 @@
     <string name="plv_login_appId">APP ID</string>
     <string name="plv_login_appSecret">APP Secret</string>
     <string name="plv_login_waiting">正在登录中，请稍等…</string>
-    <string name="plv_login_copyright">2013 – 2023 易方信息科技股份有限公司 版权所有</string>
 
     <!--手机开播登录页多语言适配-->
     <string name="plv_login_streamer_live_broadcast">手机开播</string>

demo/src/main/res/values/strings.xml

@@ -10,7 +10,6 @@
     <string name="plv_login_appId">APP ID</string>
     <string name="plv_login_appSecret">APP Secret</string>
     <string name="plv_login_waiting">正在登录中，请稍等…</string>
-    <string name="plv_login_copyright">2013 – 2023 易方信息科技股份有限公司 版权所有</string>
 
     <!--手机开播登录页多语言适配-->
     <string name="plv_login_streamer_live_broadcast">Mobile Live Broadcast</string>

polyvLiveCloudClassScene/src/main/java/com/easefun/polyv/livecloudclass/modules/media/controller/PLVLCLiveMediaController.java

@@ -157,7 +157,7 @@ public class PLVLCLiveMediaController extends FrameLayout implements IPLVLCLiveM
     // 服务端的点赞开关
     private boolean isLikesSwitchEnabled = true;
     // 服务端的打赏开关
-    private boolean isRewardSwitchEnabled = true;
+    private boolean isRewardSwitchEnabled = false;
     // 聊天室tab是否可见
     private boolean isChatDisplayEnabled = true;
     // 主播放器是否正在播放

polyvLiveCommonModul/build.gradle

@@ -31,7 +31,7 @@ android {
 dependencies {
     implementation 'com.android.support:design:27.1.1'
     implementation 'com.android.support:gridlayout-v7:27.1.1'
-    api 'net.polyv.android:polyvSDKLiveScenes:1.22.0'
+    api 'net.polyv.android:polyvSDKLiveScenes:1.22.1'
 
     //glide
     api("com.github.bumptech.glide:okhttp3-integration:4.7.1") {

polyvLiveCommonModul/src/main/java/com/easefun/polyv/livecommon/module/data/IPLVLiveRoomDataManager.java

@@ -11,6 +11,7 @@
 import com.plv.livescenes.model.PLVPlaybackChannelDetailVO;
 import com.plv.livescenes.model.commodity.saas.PLVCommodityVO2;
 import com.plv.livescenes.model.interact.PLVWebviewUpdateAppStatusVO;
+import com.plv.livescenes.model.pointreward.PLVRewardSettingVO;
 import com.plv.socket.event.chat.PLVRewardEvent;
 import com.plv.socket.event.interact.PLVCallAppEvent;
 
@@ -113,6 +114,12 @@ public interface IPLVLiveRoomDataManager {
      */
     LiveData<PLVStatefulData<PLVPlaybackChannelDetailVO>> getPlaybackChannelData();
 
+    /**
+     * 获取打赏设置LiveData
+     * @return
+     */
+    LiveData<PLVStatefulData<PLVRewardSettingVO>> getRewardSettingData();
+
     /**
      * 获取请求商品接口的rank
      */
@@ -223,6 +230,11 @@ public interface IPLVLiveRoomDataManager {
      * 请求回放频道的详细信息
      */
     void requestPlaybackChannelStatus();
+
+    /**
+     * 请求打赏设置
+     */
+    void requestRewardSetting();
     // </editor-fold>
 
     // <editor-fold defaultstate="collapsed" desc="4、销毁">

polyvLiveCommonModul/src/main/java/com/easefun/polyv/livecommon/module/data/PLVLiveRoomDataManager.java

@@ -12,6 +12,7 @@
 import com.plv.livescenes.model.PLVPlaybackChannelDetailVO;
 import com.plv.livescenes.model.commodity.saas.PLVCommodityVO2;
 import com.plv.livescenes.model.interact.PLVWebviewUpdateAppStatusVO;
+import com.plv.livescenes.model.pointreward.PLVRewardSettingVO;
 import com.plv.livescenes.streamer.transfer.PLVStreamerInnerDataTransfer;
 import com.plv.socket.event.chat.PLVRewardEvent;
 import com.plv.socket.event.interact.PLVCallAppEvent;
@@ -62,6 +63,8 @@ public class PLVLiveRoomDataManager implements IPLVLiveRoomDataManager {
     private MutableLiveData<Boolean> isOnlyAudio = new MutableLiveData<>();
     //回放频道的详细信息
     private MutableLiveData<PLVStatefulData<PLVPlaybackChannelDetailVO>> playbackChannelDetailVO = new MutableLiveData<>();
+    //打赏配置
+    private MutableLiveData<PLVStatefulData<PLVRewardSettingVO>> rewardSettingVO = new MutableLiveData<>();
     //直播场次Id
     private MutableLiveData<String> sessionIdLiveData = new MutableLiveData<>();
     //聊天室token
@@ -146,6 +149,11 @@ public LiveData<PLVStatefulData<PLVPlaybackChannelDetailVO>> getPlaybackChannelD
         return playbackChannelDetailVO;
     }
 
+    @Override
+    public MutableLiveData<PLVStatefulData<PLVRewardSettingVO>> getRewardSettingData() {
+        return rewardSettingVO;
+    }
+
     @Override
     public MutableLiveData<String> getSessionIdLiveData() {
         return sessionIdLiveData;
@@ -381,6 +389,21 @@ public void onFailed(String msg, Throwable throwable) {
             }
         });
     }
+
+    @Override
+    public void requestRewardSetting() {
+        liveRoomDataRequester.requestRewardSetting(new PLVLiveRoomDataRequester.IPLVNetRequestListener<PLVRewardSettingVO>() {
+            @Override
+            public void onSuccess(PLVRewardSettingVO plvRewardSettingVO) {
+                rewardSettingVO.postValue(PLVStatefulData.success(plvRewardSettingVO));
+            }
+
+            @Override
+            public void onFailed(String msg, Throwable throwable) {
+                rewardSettingVO.postValue(PLVStatefulData.<PLVRewardSettingVO>error(msg, throwable));
+            }
+        });
+    }
     // </editor-fold>
 
     // <editor-fold defaultstate="collapsed" desc="对外API - 4、销毁">

polyvLiveCommonModul/src/main/java/com/easefun/polyv/livecommon/module/data/PLVLiveRoomDataRequester.java

@@ -13,13 +13,16 @@
 import com.plv.foundationsdk.rx.PLVRxBaseRetryFunction;
 import com.plv.foundationsdk.rx.PLVRxBaseTransformer;
 import com.plv.foundationsdk.utils.PLVFormatUtils;
+import com.plv.livescenes.feature.pointreward.IPLVPointRewardDataSource;
+import com.plv.livescenes.feature.pointreward.PLVRewardDataSource;
 import com.plv.livescenes.hiclass.PLVHiClassDataBean;
 import com.plv.livescenes.hiclass.api.PLVHCApiManager;
 import com.plv.livescenes.hiclass.vo.PLVHCLessonDetailVO;
 import com.plv.livescenes.model.PLVIncreasePageViewerVO;
 import com.plv.livescenes.model.PLVLiveStatusVO2;
 import com.plv.livescenes.model.PLVPlaybackChannelDetailVO;
 import com.plv.livescenes.model.commodity.saas.PLVCommodityVO2;
+import com.plv.livescenes.model.pointreward.PLVRewardSettingVO;
 import com.plv.livescenes.net.PLVApiManager;
 import com.plv.socket.user.PLVSocketUserConstant;
 
@@ -43,6 +46,7 @@ public class PLVLiveRoomDataRequester {
     //请求商品的rank
     private int commodityRank = -1;
 
+    private PLVRewardDataSource rewardDataSource = new PLVRewardDataSource();
     //直播频道配置参数
     private PLVLiveChannelConfig liveChannelConfig;
 
@@ -420,6 +424,32 @@ void disposePlayBackChannelDetail(){
     }
     // </editor-fold>
 
+    // <editor-folder defaultstate="collapsed" desc="打赏配置 - 请求、取消">
+    void requestRewardSetting(final IPLVNetRequestListener<PLVRewardSettingVO> listener) {
+        rewardDataSource.getRewardSetting(getConfig().getChannelId(), new IPLVPointRewardDataSource.IPointRewardListener<PLVRewardSettingVO>() {
+            @Override
+            public void onSuccess(PLVRewardSettingVO plvRewardSettingVO) {
+                if (listener != null) {
+                    listener.onSuccess(plvRewardSettingVO);
+                }
+            }
+
+            @Override
+            public void onFailed(Throwable throwable) {
+                if (listener != null) {
+                    listener.onFailed(getErrorMessage(throwable), throwable);
+                }
+            }
+        });
+    }
+
+    void disposeRewardSetting() {
+        if (rewardDataSource != null) {
+            rewardDataSource.destroy();
+        }
+    }
+    // </editor-folder>
+
     // <editor-fold defaultstate="collapsed" desc="销毁">
     void destroy() {
         disposablePageViewer();
@@ -430,6 +460,7 @@ void destroy() {
         disposeUpdateChannelName();
         disposeLessonDetail();
         disposePlayBackChannelDetail();
+        disposeRewardSetting();
     }
     // </editor-fold>