Skip to content

Commit ba8ac55

Browse files
reneechaiAbySwifter
authored andcommitted
[Android] fix dependency issues
1 parent 271000e commit ba8ac55

33 files changed

Lines changed: 30 additions & 3724 deletions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import android.os.Handler
44
import android.os.Looper
55
import android.util.Log
66
import com.tencent.rtcube.v2.login.LoginEntry
7-
import com.tencent.rtcube.v2.login.tokenauth.utils.TokenCacheManager
7+
import com.tencent.rtcube.v2.login.components.service.TokenCacheManager
88
import com.trtc.uikit.livekit.component.karaoke.store.ActionCallback
99
import com.trtc.uikit.livekit.component.karaoke.store.GetSongListCallBack
1010
import com.trtc.uikit.livekit.component.karaoke.store.MusicCatalogService

application/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ ext {
6161
compileSdkVersion = 35
6262
targetSdkVersion = 35
6363
buildToolsVersion = "35.0.0"
64-
minSdkVersion = 21
64+
minSdkVersion = 23
6565
// liteavSdk = "com.tencent.liteav:LiteAVSDK_Ultimate:12.7.0.19074"
6666
liteavSdk = "com.tencent.liteav:LiteAVSDK_Professional:13.2.0.20058"
6767
liteavScreenCaptureSdk = "com.tencent.liteav:LiteAVSDK_ScreenCapture:13.0.0.19676"

application/login/build.gradle

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ android {
77
compileSdk 35
88

99
defaultConfig {
10-
minSdk 24
10+
minSdk 23
1111

1212
consumerProguardFiles 'consumer-rules.pro'
1313
def rtcubeFull = (project.findProperty('RTCUBE_FULL') ?: 'false').toString()
@@ -77,8 +77,10 @@ dependencies {
7777
implementation libs.coil.compose
7878

7979
// ── iOA login ──
80-
implementation 'com.tencent.moa:itlogin:4.1.1'
81-
implementation 'com.tencent.moa:go-itlogin:4.1.1_20260420'
80+
if (RTCUBE_FULL.toBoolean()) {
81+
implementation 'com.tencent.moa:itlogin:4.1.1'
82+
implementation 'com.tencent.moa:go-itlogin:4.1.1_20260420'
83+
}
8284

8385
implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
8486

@@ -93,5 +95,5 @@ dependencies {
9395
implementation libs.navigation.compose
9496
debugImplementation libs.compose.ui.tooling
9597

96-
implementation 'com.tencent:mmkv:1.3.12'
98+
implementation 'com.tencent:mmkv:1.3.14'
9799
}

application/login/src/main/kotlin/com/tencent/rtcube/v2/login/LoginConfig.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.tencent.rtcube.v2.login
22

3+
import java.io.Serializable
4+
35
/**
46
* Login module configuration.
57
*/
@@ -41,3 +43,10 @@ data class LoginConfig(
4143
)
4244
}
4345
}
46+
47+
data class HiddenConfigCredentials(
48+
val sdkAppId: String,
49+
val userId: String,
50+
val userSig: String,
51+
) : Serializable
52+

application/login/src/main/kotlin/com/tencent/rtcube/v2/login/LoginEntry.kt

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,8 @@ import com.tencent.rtcube.v2.login.components.service.BlackListResult
2121
import com.tencent.rtcube.v2.login.components.service.LoginManager
2222
import com.tencent.rtcube.v2.login.components.service.LoginService
2323
import com.tencent.rtcube.v2.login.components.service.TUILoginListenerHandler
24+
import com.tencent.rtcube.v2.login.components.service.TokenCacheManager
2425
import com.tencent.rtcube.v2.login.debugauth.store.DebugAuthStore
25-
import com.tencent.rtcube.v2.login.hiddenconfig.HiddenConfigCredentials
26-
import com.tencent.rtcube.v2.login.ioaauth.store.IOAAuthStore
27-
import com.tencent.rtcube.v2.login.tokenauth.store.TokenAuthStore
28-
import com.tencent.rtcube.v2.login.tokenauth.utils.TokenCacheManager
2926
import kotlinx.coroutines.CoroutineScope
3027
import kotlinx.coroutines.Dispatchers
3128
import kotlinx.coroutines.SupervisorJob
@@ -321,28 +318,10 @@ object LoginEntry {
321318
}
322319
return@runWhenInitialized
323320
}
324-
325-
// auto login via token
326-
entryScope.launch {
327-
val store = TokenAuthStore(entryScope)
328-
store.performAutoLogin()
329-
val result = store.resultFlow.first()
330-
result.onSuccess {
331-
markLoggedIn(mode ?: LoginMode.TOKEN_AUTH)
332-
}.onFailure {
333-
clearLoggedIn()
334-
TokenCacheManager.clear()
335-
LoginManager.clearLoginInfo()
336-
}
337-
callback(result)
338-
}
339321
}
340322
}
341323

342324
fun logout(callback: ((Result<Unit>) -> Unit)? = null) {
343-
if (currentUser.value?.isLoginByMOA() == true) {
344-
IOAAuthStore.logoutIfNeeded()
345-
}
346325
clearLoggedIn()
347326
_hiddenCredentialsFlow.value = null
348327
LoginManager.clearLoginInfo()

0 commit comments

Comments
 (0)