diff --git a/app-sdk/qlive-sdk-uikit/qlive-uikit-1.0.6.aar b/app-sdk/qlive-sdk-uikit/qlive-uikit-1.0.6.aar index 432445e..642697b 100644 Binary files a/app-sdk/qlive-sdk-uikit/qlive-uikit-1.0.6.aar and b/app-sdk/qlive-sdk-uikit/qlive-uikit-1.0.6.aar differ diff --git a/app-sdk/qlive-sdk/qlive-sdk-1.0.6.aar b/app-sdk/qlive-sdk/qlive-sdk-1.0.6.aar index 915f707..4d29736 100644 Binary files a/app-sdk/qlive-sdk/qlive-sdk-1.0.6.aar and b/app-sdk/qlive-sdk/qlive-sdk-1.0.6.aar differ diff --git a/app/debug/output-metadata.json b/app/debug/output-metadata.json new file mode 100644 index 0000000..c48415e --- /dev/null +++ b/app/debug/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "com.qlive.qnlivekit", + "variantName": "debug", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 0, + "versionName": "", + "outputFile": "app-debug.apk" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/liveroom-libs/comp_player/src/main/java/com/qlive/qplayer/QMediaPlayer.kt b/liveroom-libs/comp_player/src/main/java/com/qlive/qplayer/QMediaPlayer.kt index b811fe5..6ae6877 100644 --- a/liveroom-libs/comp_player/src/main/java/com/qlive/qplayer/QMediaPlayer.kt +++ b/liveroom-libs/comp_player/src/main/java/com/qlive/qplayer/QMediaPlayer.kt @@ -43,6 +43,7 @@ class QMediaPlayer(val context: Context) : QIPlayer { (mRenderView as QPlayerTextureRenderView).stopPlayback() } mSurface = null + mIMediaPlayer = null } //切换rtc模式为了下麦快速恢复保持链接 @@ -64,6 +65,9 @@ class QMediaPlayer(val context: Context) : QIPlayer { } override fun start() { + if (mIMediaPlayer == null) { + return + } QLiveLogUtil.d( "mIMediaPlayer", "start ${mIMediaPlayer?.isPlaying} ${mIMediaPlayer?.dataSource == currentUrl} ${mIMediaPlayer?.playerState?.name}" @@ -73,9 +77,7 @@ class QMediaPlayer(val context: Context) : QIPlayer { ) { return } - if (mIMediaPlayer == null) { - return - } + if (mIMediaPlayer?.playerState == PlayerState.ERROR) { mIMediaPlayer?.release() resetPlayer() @@ -126,7 +128,7 @@ class QMediaPlayer(val context: Context) : QIPlayer { mIMediaPlayer?.start() } - fun setVolume(leftVolume: Float, rightVolume: Float){ + fun setVolume(leftVolume: Float, rightVolume: Float) { mIMediaPlayer?.setVolume(leftVolume, rightVolume) } @@ -209,8 +211,8 @@ class QMediaPlayer(val context: Context) : QIPlayer { private val mPLOnVideoFrameListener = PLOnVideoFrameListener { bytes, size, w, h, format, ts -> val sei = SEIUtil.parseSEI(bytes, size, w, h, format) - if(sei.isNotEmpty()){ - mQPlayerSEIListener.onSEI(sei) + if (sei.isNotEmpty()) { + mQPlayerSEIListener.onSEI(sei) } } diff --git a/liveroom-uikit-core/src/main/java/com/qlive/uikitcore/QKitFrameLayout.kt b/liveroom-uikit-core/src/main/java/com/qlive/uikitcore/QKitFrameLayout.kt index cf744e4..c403e7b 100644 --- a/liveroom-uikit-core/src/main/java/com/qlive/uikitcore/QKitFrameLayout.kt +++ b/liveroom-uikit-core/src/main/java/com/qlive/uikitcore/QKitFrameLayout.kt @@ -22,7 +22,6 @@ import com.qlive.uikitcore.view.CircleImageView import java.lang.reflect.InvocationTargetException import java.lang.reflect.ParameterizedType - abstract class QKitFrameLayout : FrameLayout, QLiveComponent { override var client: QLiveClient? = null override var roomInfo: QLiveRoomInfo? = null diff --git a/qlive-uicomponnets/uikit-shopping/src/main/java/com/qlive/uikitshopping/PlayerShoppingDialog.kt b/qlive-uicomponnets/uikit-shopping/src/main/java/com/qlive/uikitshopping/PlayerShoppingDialog.kt index 1fc27ed..6ade10b 100644 --- a/qlive-uicomponnets/uikit-shopping/src/main/java/com/qlive/uikitshopping/PlayerShoppingDialog.kt +++ b/qlive-uicomponnets/uikit-shopping/src/main/java/com/qlive/uikitshopping/PlayerShoppingDialog.kt @@ -149,6 +149,7 @@ class PlayerShoppingDialog( helper: QRecyclerViewBindHolder, item: QItem ) { + Glide.with(mContext) .load(item.thumbnail) .into(helper.binding.ivCover) diff --git a/qlive-uicomponnets/uikit-shopping/src/main/java/com/qlive/uikitshopping/TagItem.kt b/qlive-uicomponnets/uikit-shopping/src/main/java/com/qlive/uikitshopping/TagItem.kt index ff56584..1672a0f 100644 --- a/qlive-uicomponnets/uikit-shopping/src/main/java/com/qlive/uikitshopping/TagItem.kt +++ b/qlive-uicomponnets/uikit-shopping/src/main/java/com/qlive/uikitshopping/TagItem.kt @@ -8,14 +8,16 @@ class TagItem { fun strToTagItem(tagStr: String): List { val tags = ArrayList() tagStr.split(",").forEachIndexed { index, s -> - val item = TagItem() - item.tagStr = s - when (index) { - 0 -> item.color = R.drawable.shape_fa8c15_fbad14_1 - 1 -> item.color = R.drawable.shape_ef4149_1 - else -> item.color = R.drawable.shape_fa8c15_fbad14_1 + if(s.isNotEmpty()){ + val item = TagItem() + item.tagStr = s + when (index) { + 0 -> item.color = R.drawable.shape_fa8c15_fbad14_1 + 1 -> item.color = R.drawable.shape_ef4149_1 + else -> item.color = R.drawable.shape_fa8c15_fbad14_1 + } + tags.add(item) } - tags.add(item) } return tags }