【TUILiveKit】【Android】run demo bugfix

Author: xanderzhao-zb

.gitignore

@@ -1,2 +1,4 @@
 .DS_Store
 **/.DS_Store
+live/tuilivekit/.gradle/
+room/tuiroomkit/.gradle/

application/assembly/src/main/java/com/tencent/rtcube/modules/voiceroom/karaoke/OnlineMusicService.kt

@@ -126,6 +126,11 @@ class OnlineMusicService : MusicCatalogService() {
         onSuccess: (JSONObject) -> Unit,
         onFailure: (Int, String?) -> Unit,
     ) {
+        if (!url.startsWith("http://") && !url.startsWith("https://")) {
+            Log.e(TAG, "request failed: invalid url=$url, httpBaseUrl not configured")
+            mainHandler.post { onFailure(ERR_INVALID_URL, "invalid url: $url") }
+            return
+        }
         val req = Request.Builder()
             .url(url)
             .post(body.toString().toRequestBody(JSON_MEDIA_TYPE))
@@ -220,6 +225,7 @@ class OnlineMusicService : MusicCatalogService() {
         private const val ERR_DATA_NULL = -1
         private const val ERR_RESPONSE_INVALID = -2
         private const val ERR_NETWORK_FAILURE = -3
+        private const val ERR_INVALID_URL = -4
 
         @Volatile
         private var licenseKey: String = ""

live/tuilivekit/src/main/java/com/trtc/uikit/livekit/features/audienceview/AudienceView.kt

@@ -1,7 +1,9 @@
 package com.trtc.uikit.livekit.features.audienceview
 
+import android.app.Activity
 import android.content.Context
 import android.content.res.Configuration
+import android.text.TextUtils
 import android.util.AttributeSet
 import android.view.View
 import android.widget.FrameLayout
@@ -10,6 +12,7 @@ import com.tencent.qcloud.tuicore.TUICore
 import com.tencent.qcloud.tuicore.interfaces.ITUINotification
 import com.trtc.uikit.livekit.common.EVENT_KEY_LIVE_KIT
 import com.trtc.uikit.livekit.common.EVENT_PARAMS_IS_LINKING
+import com.trtc.uikit.livekit.common.EVENT_SUB_KEY_DESTROY_LIVE_VIEW
 import com.trtc.uikit.livekit.common.EVENT_SUB_KEY_LINK_STATUS_CHANGE
 import com.trtc.uikit.livekit.common.LiveKitLogger
 import com.trtc.uikit.livekit.features.audienceview.store.access.TUILiveListDataSource
@@ -19,6 +22,7 @@ import com.trtc.uikit.livekit.features.audienceview.store.LiveInfoListStore
 import com.trtc.uikit.livekit.features.audienceview.view.liveListviewpager.LiveListViewPager
 import com.trtc.uikit.livekit.features.audienceview.view.liveListviewpager.LiveListViewPagerAdapter
 import io.trtc.tuikit.atomicxcore.api.live.LiveInfo
+import io.trtc.tuikit.atomicxcore.api.live.LiveListStore
 import io.trtc.tuikit.atomicxcore.api.live.SeatLayoutTemplate
 import java.lang.ref.WeakReference
 import java.util.concurrent.CopyOnWriteArrayList
@@ -147,11 +151,13 @@ class AudienceView @JvmOverloads constructor(
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
         TUICore.registerEvent(EVENT_KEY_LIVE_KIT, EVENT_SUB_KEY_LINK_STATUS_CHANGE, this)
+        TUICore.registerEvent(EVENT_KEY_LIVE_KIT, EVENT_SUB_KEY_DESTROY_LIVE_VIEW, this)
     }
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
         TUICore.unRegisterEvent(EVENT_KEY_LIVE_KIT, EVENT_SUB_KEY_LINK_STATUS_CHANGE, this)
+        TUICore.unRegisterEvent(EVENT_KEY_LIVE_KIT, EVENT_SUB_KEY_DESTROY_LIVE_VIEW, this)
         audienceLiveView?.leaveRoom()
     }
 
@@ -176,6 +182,17 @@ class AudienceView @JvmOverloads constructor(
         if (EVENT_SUB_KEY_LINK_STATUS_CHANGE == subKey) {
             onLinkStatusChanged(param)
         }
+        if (TextUtils.equals(key, EVENT_KEY_LIVE_KIT) && EVENT_SUB_KEY_DESTROY_LIVE_VIEW == subKey) {
+            if (context is Activity) {
+                val activity = context as Activity
+                if (activity.isFinishing || activity.isDestroyed) {
+                    return
+                }
+                val liveInfo = LiveListStore.shared().liveState.currentLive.value
+                destroy()
+                notifyListeners { it.onClickCloseButton(liveInfo) }
+            }
+        }
     }
 
     fun destroy() {

live/tuilivekit/src/main/java/com/trtc/uikit/livekit/features/audienceview/AudienceViewDefine.kt

@@ -7,7 +7,7 @@ object AudienceViewDefine {
     interface AudienceViewListener {
         fun onLiveEnded(roomId: String, ownerName: String, ownerAvatarUrl: String)
         fun onClickFloatWindow()
-
+        fun onClickCloseButton(liveInfo: LiveInfo)
         fun onCreateLiveView(audienceView: AudienceLiveView, liveInfo: LiveInfo) {}
 
         fun onLiveViewDidAppear(audienceView: AudienceLiveView, liveInfo: LiveInfo) {}

live/tuilivekit/src/main/java/com/trtc/uikit/livekit/livestream/VideoLiveAudienceActivity.kt

@@ -18,11 +18,10 @@ import com.tencent.cloud.tuikit.engine.common.ContextProvider
 import com.tencent.qcloud.tuicore.TUICore
 import com.tencent.qcloud.tuicore.interfaces.ITUINotification
 import com.trtc.uikit.livekit.R
-import com.trtc.uikit.livekit.common.EVENT_KEY_LIVE_KIT
-import com.trtc.uikit.livekit.common.EVENT_SUB_KEY_DESTROY_LIVE_VIEW
 import com.trtc.uikit.livekit.common.LiveKitLogger
 import com.trtc.uikit.livekit.common.PermissionRequest
 import com.trtc.uikit.livekit.component.pippanel.PIPPanelStore
+import com.trtc.uikit.livekit.component.pippanel.PictureInPictureStore
 import com.trtc.uikit.livekit.features.audienceview.AudienceView
 import com.trtc.uikit.livekit.features.audienceview.AudienceViewDefine.AudienceViewListener
 import com.trtc.uikit.livekit.features.endstatistics.AudienceEndStatisticsView
@@ -31,8 +30,8 @@ import com.trtc.uikit.livekit.livestream.impl.LiveInfoUtils
 import com.trtc.uikit.livekit.livestream.impl.VideoLiveKitImpl
 import io.trtc.tuikit.atomicx.common.FullScreenActivity
 import io.trtc.tuikit.atomicx.common.foregroundservice.VideoForegroundService
-import com.trtc.uikit.livekit.component.pippanel.PictureInPictureStore
 import io.trtc.tuikit.atomicx.widget.basicwidget.popover.AtomicPopover
+import io.trtc.tuikit.atomicxcore.api.live.LiveInfo
 import io.trtc.tuikit.atomicxcore.api.live.LiveListStore
 import io.trtc.tuikit.atomicxcore.api.login.LoginStatus
 import io.trtc.tuikit.atomicxcore.api.login.LoginStore
@@ -79,15 +78,14 @@ class VideoLiveAudienceActivity : FullScreenActivity(),
 
         layoutContainer = findViewById(R.id.fl_container)
         val liveInfo = LiveInfoUtils.convertBundleToLiveInfo(liveBundle)
-        
+
         audienceView = AudienceView(this).apply {
             init(this@VideoLiveAudienceActivity, liveInfo.liveID)
             addListener(this@VideoLiveAudienceActivity)
         }
-        
+
         layoutContainer.addView(audienceView)
         VideoLiveKitImpl.createInstance(applicationContext).addCallingAPIListener(this)
-        TUICore.registerEvent(EVENT_KEY_LIVE_KIT, EVENT_SUB_KEY_DESTROY_LIVE_VIEW, this)
         lifecycleScope.launchWhenStarted {
             launch {
                 PermissionRequest.requestCompleteEvent.collect {
@@ -120,16 +118,13 @@ class VideoLiveAudienceActivity : FullScreenActivity(),
             TextUtils.equals(key, KEY_EXTENSION_NAME) && TextUtils.equals(subKey, NOTIFY_START_ACTIVITY) -> {
                 val intent = param?.get("intent") as? Intent
                 val requestCode = param?.get("requestCode") as? Int
-                
+
                 if (requestCode != null && intent != null) {
                     startActivityForResult(intent, requestCode)
                 } else if (intent != null) {
                     startActivity(intent)
                 }
             }
-            TextUtils.equals(key, EVENT_KEY_LIVE_KIT) && EVENT_SUB_KEY_DESTROY_LIVE_VIEW == subKey -> {
-                destroyAudienceView()
-            }
         }
     }
 
@@ -146,6 +141,7 @@ class VideoLiveAudienceActivity : FullScreenActivity(),
     }
 
     override fun onDestroy() {
+        AtomicPopover.dismissAll()
         super.onDestroy()
         BackgroundLaunchDetector.unregisterActivityLifecycleCallbacks(application, "VideoLiveAudienceActivity")
         PIPPanelStore.sharedInstance().reset()
@@ -167,6 +163,7 @@ class VideoLiveAudienceActivity : FullScreenActivity(),
         TUICore.callService(KEY_EXTENSION_NAME, METHOD_ACTIVITY_RESULT, param)
     }
 
+    @Suppress("MissingSuperCall")
     override fun onBackPressed() {
         // Do nothing
     }
@@ -207,7 +204,7 @@ class VideoLiveAudienceActivity : FullScreenActivity(),
         }
         audienceView?.enablePictureInPictureMode(isInPictureInPictureMode)
         audienceEndStatisticsView?.enablePipMode(isInPictureInPictureMode)
-        
+
         if (!isInPictureInPictureMode && lifecycle.currentState == Lifecycle.State.CREATED
             && PictureInPictureStore.shared.hasPipPermission(this)) {
             destroyAudienceView()
@@ -245,7 +242,7 @@ class VideoLiveAudienceActivity : FullScreenActivity(),
                 }
             })
         }
-        
+
         layoutContainer.removeAllViews()
         layoutContainer.addView(audienceEndStatisticsView)
     }
@@ -258,6 +255,10 @@ class VideoLiveAudienceActivity : FullScreenActivity(),
         }
     }
 
+    override fun onClickCloseButton(liveInfo: LiveInfo) {
+        finishAndRemoveTask()
+    }
+
     private fun destroyAudienceView() {
         if (isFinishing || isDestroyed) {
             return