升级版本到1.4.2

Author: SHLURENJIA

build.gradle

@@ -30,16 +30,15 @@ allprojects {
         maven{
             url 'https://maven.aliyun.com/repository/public'
         }
-
     }
 }
 
 ext {
     compileSdkVersion = 27
     minSdkVersion = 21
     targetSdkVersion = 27
-    versionCode = 141
-    versionName = "1.4.1"
+    versionCode = 142
+    versionName = "1.4.2"
 }
 
 task clean(type: Delete) {

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

@@ -16,7 +16,7 @@ public void onCreate() {
         PLVLiveSDKConfig.init(
                 new PLVLiveSDKConfig.Parameter(this)
                         .isOpenDebugLog(true)
-                        .isEnableHttpDns(true)
+                        .isEnableHttpDns(false)
         );
     }
 }

polyvLiveCloudClassScene/src/main/java/com/easefun/polyv/livecloudclass/modules/chatroom/PLVLCChatFragment.java

@@ -599,11 +599,14 @@ private void openCamera() {
             values.put(MediaStore.Images.Media.DISPLAY_NAME, picName);
             takePictureUri = getContext().getContentResolver().insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values);
         } else {
+            if (getContext() == null || getContext().getApplicationContext() == null) {
+                return;
+            }
             String savePath = PLVSDCardUtils.createPath(getContext(), "PLVChatImg");
             takePictureFilePath = new File(savePath, picName);
             takePictureUri = FileProvider.getUriForFile(
                     getContext(),
-                    "plvfileprovider",
+                    getContext().getApplicationContext().getPackageName() + ".plvfileprovider",
                     takePictureFilePath);
         }
 

polyvLiveCloudClassScene/src/main/java/com/easefun/polyv/livecloudclass/modules/linkmic/PLVLCLinkMicLayout.java

@@ -57,6 +57,9 @@ public class PLVLCLinkMicLayout extends FrameLayout implements IPLVLinkMicContra
     // <editor-fold defaultstate="collapsed" desc="变量">
     private static final String TAG = PLVLCLinkMicLayout.class.getSimpleName();
 
+    // 连麦权限请求失败错误码
+    private static final int ERROR_PERMISSION_DENIED = 1060501;
+
     //尺寸
     private static final int DP_LAND_LINK_MIC_LIST_MARGIN_LEFT = 8;
     private static final int DP_LAND_LINK_MIC_LIST_MARGIN_RIGHT = 34;
@@ -390,7 +393,7 @@ public void updateFirstScreenChanged(String firstScreenLinkMicId, int oldPos, in
     @Override
     public void onLinkMicError(int errorCode, Throwable throwable) {
         PLVCommonLog.exception(throwable);
-        if (errorCode == 1060501) {
+        if (errorCode == ERROR_PERMISSION_DENIED) {
             new AlertDialog.Builder(getContext()).setTitle(R.string.plv_common_dialog_tip)
                     .setMessage(R.string.plv_linkmic_error_tip_permission_denied)
                     .setPositiveButton(R.string.plv_common_dialog_confirm, new DialogInterface.OnClickListener() {

polyvLiveCloudClassScene/src/main/java/com/easefun/polyv/livecloudclass/modules/linkmic/adapter/PLVLinkMicListAdapter.java

@@ -26,6 +26,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
+import java.util.Locale;
 
 /**
  * date: 2020/7/27
@@ -256,8 +257,12 @@ public LinkMicItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int v
         SurfaceView renderView = adapterCallback.createLinkMicRenderView();
 
         LinkMicItemViewHolder viewHolder = new LinkMicItemViewHolder(itemView);
-        viewHolder.renderView = renderView;
-        viewHolder.flRenderViewContainer.addView(renderView, getRenderViewLayoutParam());
+        if (renderView != null) {
+            viewHolder.renderView = renderView;
+            viewHolder.flRenderViewContainer.addView(renderView, getRenderViewLayoutParam());
+        } else {
+            PLVCommonLog.e(TAG, "create render view return null");
+        }
         return viewHolder;
     }
 
@@ -271,8 +276,12 @@ public void onBindViewHolder(@NonNull final LinkMicItemViewHolder holder, final
         if (holder.isViewRecycled) {
             holder.isViewRecycled = false;
             holder.renderView = adapterCallback.createLinkMicRenderView();
-            holder.flRenderViewContainer.addView(holder.renderView, getRenderViewLayoutParam());
-            holder.isRenderViewSetup = false;
+            if (holder.renderView != null) {
+                holder.flRenderViewContainer.addView(holder.renderView, getRenderViewLayoutParam());
+                holder.isRenderViewSetup = false;
+            } else {
+                PLVCommonLog.e(TAG, String.format(Locale.US, "create render view return null at position:%d", position));
+            }
         }
         PLVLinkMicItemDataBean itemDataBean = dataList.get(position);
         String linkMicId = itemDataBean.getLinkMicId();

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

@@ -193,6 +193,12 @@ private void initView() {
         mediaController = findViewById(R.id.controller_view);
         chatLandscapeLayout = findViewById(R.id.chat_landscape_ly);
 
+        // 底部占位图
+        PLVLCPlaceHolderView placeHolderView = new PLVLCPlaceHolderView(getContext());
+        placeHolderView.setVisibility(VISIBLE);
+        placeHolderView.setPlaceHolderText("");
+        addView(placeHolderView, 0);
+
         initVideoView();
         initDanmuView();
         initMediaController();
@@ -292,6 +298,7 @@ public void onShow(boolean show) {
                     onViewActionListener.onShowMediaController(show);
                 }
             }
+
         });
     }
 

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

@@ -423,6 +423,7 @@ public void clean() {
         dispose(bitPopupWindowTimer);
         dispose(reopenFloatingDelay);
     }
+
     // </editor-fold>
 
     // <editor-fold defaultstate="collapsed" desc="对外API - 重写View定义的方法">
@@ -585,9 +586,11 @@ public void onChanged(@Nullable PLVPlayInfoVO playInfoVO) {
                 if (playInfoVO.isPlaying()) {
                     videoPausePortIv.setSelected(true);
                     videoPauseLandIv.setSelected(true);
+
                 } else {
                     videoPausePortIv.setSelected(false);
                     videoPauseLandIv.setSelected(false);
+
                 }
             }
         });
@@ -651,4 +654,5 @@ public void run() {
         }
     }
     // </editor-fold>
+
 }

polyvLiveCloudClassScene/src/main/java/com/easefun/polyv/livecloudclass/modules/media/danmu/PLVLCLandscapeMessageSendPanel.java

@@ -9,6 +9,7 @@
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.inputmethod.EditorInfo;
 import android.widget.EditText;
@@ -65,7 +66,7 @@ public PLVLCLandscapeMessageSendPanel(AppCompatActivity appCompatActivity, View
             public void onGlobalLayout() {//all call
                 int usableHeightNow = computeUsableHeight(childOfContent);
                 if (usableHeightPrevious != usableHeightNow) {
-                    FrameLayout.LayoutParams flp = (FrameLayout.LayoutParams) llSendMessage.getLayoutParams();
+                    ViewGroup.LayoutParams flp = (ViewGroup.LayoutParams) llSendMessage.getLayoutParams();
                     if (flp == null) {
                         return;
                     }

polyvLiveCloudClassScene/src/main/java/com/easefun/polyv/livecloudclass/scenes/PLVLCCloudClassActivity.java

@@ -11,6 +11,7 @@
 import android.util.Pair;
 import android.view.View;
 import android.view.ViewStub;
+import android.view.WindowManager;
 
 import com.easefun.polyv.livecloudclass.R;
 import com.easefun.polyv.livecloudclass.modules.chatroom.chatlandscape.PLVLCChatLandscapeLayout;
@@ -252,6 +253,7 @@ public void onClick(DialogInterface dialog, int which) {
                 }
         ).show();
     }
+
     // </editor-fold>
 
     // <editor-fold defaultstate="collapsed" desc="初始化 - 页面参数">
@@ -709,6 +711,15 @@ public void onShowLandscapeRTCLayout(boolean show) {
             public void onChangeTeacherLocation(PLVViewSwitcher viewSwitcher, PLVSwitchViewAnchorLayout switchView) {
                 viewSwitcher.registerSwitchVew(switchView, mediaLayout.getPlayerSwitchView());
                 viewSwitcher.switchView();
+                mediaLayout.getPlayerSwitchView().post(new Runnable() {
+                    @Override
+                    public void run() {
+                        if(mediaLayout != null && mediaLayout.getPlayerSwitchView() != null) {
+                            //兼容 constraint-layout 升级到 2.0.0+ 出现的无延迟黑屏问题
+                            mediaLayout.getPlayerSwitchView().requestLayout();
+                        }
+                    }
+                });
             }
 
             @Override
@@ -747,8 +758,11 @@ public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
         if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {
             PLVScreenUtils.enterLandscape(this);
+            getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
         } else {
             PLVScreenUtils.enterPortrait(this);
+            getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN
+                    | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
         }
     }
     // </editor-fold>

polyvLiveCommonModul/build.gradle

@@ -21,15 +21,22 @@ android {
         // but continue the build even when errors are found:
         abortOnError false
     }
+    repositories {
+        flatDir {
+            dirs 'libs'
+        }
+    }
 }
 
 dependencies {
     implementation 'com.android.support:design:27.1.1'
-    // 注意1.4.1起依赖的groupId已经变更，请整个依赖复制粘贴修改，勿只修改版本号
-    api ('net.polyv.android:polyvSDKLiveScenes:1.4.1')
+    api 'net.polyv.android:polyvSDKLiveScenes:1.4.2'
+
     //glide
     api ("com.github.bumptech.glide:okhttp3-integration:4.7.1"){
 //        exclude group:'com.github.bumptech.glide',module:'glide'
     }
     annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1'
+
+
 }