Merge pull request #196 from 3598906645/release-9.5.11200

garyxgwang · web-flow · commit a6be6e9e969a · 2022-01-23T16:28:27.000+08:00
release-9.5.11200
diff --git a/Demo/app/build.gradle b/Demo/app/build.gradle
@@ -9,7 +9,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 24
-        versionName "9.5.0.29006"
+        versionName "9.5.0.1482"
 
         multiDexEnabled true
         ndk {
@@ -63,4 +63,6 @@ dependencies {
     implementation('com.blankj:utilcode:1.25.9', {
         exclude group: 'com.google.code.gson', module: 'gson'
     })
+
+
 }
diff --git a/Demo/superplayerdemo/src/main/java/com/tencent/liteav/demo/player/demo/shortvideo/adapter/ShortVideoPlayAdapter.java b/Demo/superplayerdemo/src/main/java/com/tencent/liteav/demo/player/demo/shortvideo/adapter/ShortVideoPlayAdapter.java
@@ -28,9 +28,11 @@ public ShortVideoPlayAdapter(List<ShortVideoBean> list) {
     public void onHolder(VideoViewHolder holder, ShortVideoBean bean, int position) {
         ViewGroup.LayoutParams layoutParams = holder.itemView.getLayoutParams();
         layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT;
-        Glide.with(mContext).load(bean.placeholderImage).
-                diskCacheStrategy(DiskCacheStrategy.ALL).centerCrop()
-                .into(holder.mImageViewCover);
+        if (bean != null && bean.placeholderImage != null) {
+            Glide.with(mContext).load(bean.placeholderImage).
+                    diskCacheStrategy(DiskCacheStrategy.ALL).centerCrop()
+                    .into(holder.mImageViewCover);;
+        }
     }
 
 
diff --git a/Demo/superplayerkit/src/main/java/com/tencent/liteav/demo/superplayer/model/SuperPlayerImpl.java b/Demo/superplayerkit/src/main/java/com/tencent/liteav/demo/superplayer/model/SuperPlayerImpl.java
@@ -571,7 +571,6 @@ private void playTimeShiftLiveURL(int appId, String url) {
         try {
             bizidNum = Integer.parseInt(bizid);
         } catch (NumberFormatException e) {
-            e.printStackTrace();
             Log.e(TAG, "playTimeShiftLiveURL: bizidNum error = " + bizid);
         }
         mLivePlayer.prepareLiveSeek(domian, bizidNum);

Original file line number	Diff line number	Diff line change
`@@ -571,7 +571,6 @@ private void playTimeShiftLiveURL(int appId, String url) {`
`571`	`571`	`try {`
`572`	`572`	`bizidNum = Integer.parseInt(bizid);`
`573`	`573`	`} catch (NumberFormatException e) {`
`574`		`- e.printStackTrace();`
`575`	`574`	`Log.e(TAG, "playTimeShiftLiveURL: bizidNum error = " + bizid);`
`576`	`575`	`}`
`577`	`576`	`mLivePlayer.prepareLiveSeek(domian, bizidNum);`