Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
xuning
/
livekitAndroidXuningTest
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
davidliu
2023-01-03 14:29:46 -0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Committed by
GitHub
2023-01-03 14:29:46 -0800
Commit
0d5143e1533c7d3a38c37a5670113360086621c7
0d5143e1
1 parent
42e20bd3
Use forked version of audio switch to avoid BLUETOOTH_CONNECT (#172)
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
1 行增加
和
19 行删除
livekit-android-sdk/build.gradle
sample-app-basic/src/main/java/io/livekit/android/sample/basic/MainActivity.kt
sample-app-common/src/main/AndroidManifest.xml
sample-app-common/src/main/java/io/livekit/android/sample/util/ActivityPermissionsExt.kt
livekit-android-sdk/build.gradle
查看文件 @
0d5143e
...
...
@@ -118,7 +118,7 @@ dependencies {
implementation
'org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0'
api
'com.github.webrtc-sdk:android:104.5112.05'
api
"com.squareup.okhttp3:okhttp:4.10.0"
api
"com.twilio:audioswitch:1.1.5"
api
'com.github.davidliu:audioswitch:c498d866c57f1d88056d5e7e7a78d622e3b0c046'
implementation
"androidx.annotation:annotation:1.4.0"
implementation
"androidx.core:core:${versions.androidx_core}"
implementation
"com.google.protobuf:protobuf-javalite:${versions.protobuf}"
...
...
sample-app-basic/src/main/java/io/livekit/android/sample/basic/MainActivity.kt
查看文件 @
0d5143e
...
...
@@ -2,7 +2,6 @@ package io.livekit.android.sample.basic
import android.Manifest
import android.content.pm.PackageManager
import android.os.Build
import android.os.Bundle
import android.view.View
import android.widget.Toast
...
...
@@ -98,14 +97,6 @@ class MainActivity : AppCompatActivity() {
// Assemble the needed permissions to request
val neededPermissions = listOf(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA)
.let { perms ->
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
// Need BLUETOOTH_CONNECT permission on API S+ to output to bluetooth devices.
perms + listOf(Manifest.permission.BLUETOOTH_CONNECT)
} else {
perms
}
}
.filter { ContextCompat.checkSelfPermission(this, it) == PackageManager.PERMISSION_DENIED }
.toTypedArray()
...
...
sample-app-common/src/main/AndroidManifest.xml
查看文件 @
0d5143e
...
...
@@ -11,6 +11,5 @@
<uses-permission
android:name=
"android.permission.BLUETOOTH_ADMIN"
android:maxSdkVersion=
"30"
/>
<uses-permission
android:name=
"android.permission.BLUETOOTH_CONNECT"
/>
</manifest>
\ No newline at end of file
...
...
sample-app-common/src/main/java/io/livekit/android/sample/util/ActivityPermissionsExt.kt
查看文件 @
0d5143e
...
...
@@ -2,7 +2,6 @@ package io.livekit.android.sample.util
import android.Manifest
import android.content.pm.PackageManager
import android.os.Build
import android.widget.Toast
import androidx.activity.ComponentActivity
import androidx.activity.result.contract.ActivityResultContracts
...
...
@@ -32,13 +31,6 @@ fun ComponentActivity.requestNeededPermissions(onPermissionsGranted: (() -> Unit
}
val neededPermissions = listOf(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA)
.let { perms ->
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
perms + listOf(Manifest.permission.BLUETOOTH_CONNECT)
} else {
perms
}
}
.filter { ContextCompat.checkSelfPermission(this, it) == PackageManager.PERMISSION_DENIED }
.toTypedArray()
...
...
请
注册
或
登录
后发表评论