xiaozhang/zhibo
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: exclude ijkplayer exoplayer transitive dep and resolve manifest merger conflict

Browse Source
This commit is contained in:
xiao12feng8 2025-12-22 11:51:35 +08:00
parent 7d0c0fc4dd
commit 0ac89bb4df
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android-app/app/build.gradle.kts
View File

@ -110,5 +110,7 @@ dependencies {
implementation("androidx.media3:media3-ui:$media3Version") implementation("androidx.media3:media3-ui:$media3Version")
// HTTP-FLV low-latency playback (IjkPlayer via JitPack) // HTTP-FLV low-latency playback (IjkPlayer via JitPack)
implementation("com.github.andnux:ijkplayer:0.0.1") implementation("com.github.andnux:ijkplayer:0.0.1") {
exclude(group = "com.google.android.exoplayer", module = "exoplayer")
}
} }

4
android-app/app/src/main/AndroidManifest.xml
View File

@ -1,4 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"> <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.CAMERA" />
@ -7,6 +8,7 @@
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="Live Streaming" android:label="Live Streaming"
tools:replace="android:allowBackup,android:label"
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.LiveStreaming" android:theme="@style/Theme.LiveStreaming"