Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
ccim_sdk_android
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
ccim_sdk_android
Commits
7c1a4482
Commit
7c1a4482
authored
Sep 23, 2022
by
sheteng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
语音房间 禁言2
parent
8e5eb158
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
9 deletions
+13
-9
app/src/main/res/layout/activity_login.xml
app/src/main/res/layout/activity_login.xml
+1
-1
ccim/src/main/java/com/ccwangluo/ccim/CCIMClient.java
ccim/src/main/java/com/ccwangluo/ccim/CCIMClient.java
+2
-0
ccim/src/main/java/com/ccwangluo/ccim/audio/JanusService.java
.../src/main/java/com/ccwangluo/ccim/audio/JanusService.java
+9
-8
ccim/src/main/java/com/ccwangluo/ccim/util/ErrorCode.java
ccim/src/main/java/com/ccwangluo/ccim/util/ErrorCode.java
+1
-0
No files found.
app/src/main/res/layout/activity_login.xml
View file @
7c1a4482
...
@@ -69,7 +69,7 @@
...
@@ -69,7 +69,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"8dp"
android:layout_marginTop=
"8dp"
android:hint=
"ip"
android:hint=
"ip"
android:text=
"10
6.15.237.6
7"
android:text=
"10
.17.4.20
7"
android:imeActionLabel=
"@string/action_sign_in_short"
android:imeActionLabel=
"@string/action_sign_in_short"
android:imeOptions=
"actionDone"
android:imeOptions=
"actionDone"
android:selectAllOnFocus=
"true"
android:selectAllOnFocus=
"true"
...
...
ccim/src/main/java/com/ccwangluo/ccim/CCIMClient.java
View file @
7c1a4482
...
@@ -715,6 +715,8 @@ public class CCIMClient {
...
@@ -715,6 +715,8 @@ public class CCIMClient {
conf
.
plugin
(
JanusPlugins
.
VIDEOROOM
);
conf
.
plugin
(
JanusPlugins
.
VIDEOROOM
);
if
(
janusService
!=
null
)
{
if
(
janusService
!=
null
)
{
janusService
.
stop
();
janusService
.
stop
();
// callback.onJoinFailed(ErrorCode.JOIN_AUDIO_FAILED_JOINED);
// return;
}
}
janusService
=
new
JanusService
(
context
,
roomId
,
user
,
callback
);
janusService
=
new
JanusService
(
context
,
roomId
,
user
,
callback
);
janusService
.
start
(
context
,
conf
);
janusService
.
start
(
context
,
conf
);
...
...
ccim/src/main/java/com/ccwangluo/ccim/audio/JanusService.java
View file @
7c1a4482
...
@@ -48,19 +48,20 @@ public class JanusService extends JanusDelegate {
...
@@ -48,19 +48,20 @@ public class JanusService extends JanusDelegate {
private
Boolean
isJoin
=
false
;
private
Boolean
isJoin
=
false
;
private
AudioRoomListener
callback
;
private
AudioRoomListener
callback
;
private
AudioManager
audioManager
;
//
private AudioManager audioManager;
private
AudioTrack
audioTrack
;
private
AudioTrack
audioTrack
;
private
AppRTCAudioManager
audioManager
;
public
JanusService
(
Context
context
,
Integer
roomId
,
User
user
,
AudioRoomListener
callback
)
{
public
JanusService
(
Context
context
,
Integer
roomId
,
User
user
,
AudioRoomListener
callback
)
{
audioManager
=
(
AudioManager
)
context
.
getSystemService
(
Context
.
AUDIO_SERVICE
);
audioManager
=
AppRTCAudioManager
.
create
(
context
);
// audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
this
.
user
=
user
;
this
.
user
=
user
;
this
.
roomId
=
roomId
;
this
.
roomId
=
roomId
;
this
.
callback
=
callback
;
this
.
callback
=
callback
;
if
(
audioManager
!=
null
)
{
audioManager
.
start
((
selectedAudioDevice
,
availableAudioDevices
)
->
{
audioManager
.
setMode
(
AudioManager
.
MODE_IN_COMMUNICATION
);
// audioManager.adjustStreamVolume (AudioManager.STREAM_MUSIC, AudioManager.ADJUST_RAISE, AudioManager.FLAG_SHOW_UI);
});
// audioManager.setSpeakerphoneOn(true);
}
}
}
...
@@ -103,7 +104,7 @@ public class JanusService extends JanusDelegate {
...
@@ -103,7 +104,7 @@ public class JanusService extends JanusDelegate {
public
void
onClose
()
{
public
void
onClose
()
{
logger
.
info
(
"close"
);
logger
.
info
(
"close"
);
if
(
audioManager
!=
null
)
{
if
(
audioManager
!=
null
)
{
audioManager
.
s
etMode
(
AudioManager
.
MODE_NORMAL
);
audioManager
.
s
top
(
);
}
}
}
}
...
...
ccim/src/main/java/com/ccwangluo/ccim/util/ErrorCode.java
View file @
7c1a4482
...
@@ -18,5 +18,6 @@ public class ErrorCode {
...
@@ -18,5 +18,6 @@ public class ErrorCode {
public
static
final
int
ERROR_PERMISSION_DENIE
=
912
;
//权限拒绝
public
static
final
int
ERROR_PERMISSION_DENIE
=
912
;
//权限拒绝
public
static
final
int
JOIN_AUDIO_FAILED
=
913
;
//加入语音失败
public
static
final
int
JOIN_AUDIO_FAILED
=
913
;
//加入语音失败
public
static
final
int
JOIN_AUDIO_FAILED_NO_SUCH_ROOM
=
914
;
//没有这个房间
public
static
final
int
JOIN_AUDIO_FAILED_NO_SUCH_ROOM
=
914
;
//没有这个房间
public
static
final
int
JOIN_AUDIO_FAILED_JOINED
=
915
;
//已经加入房间,不能同时加入多个房间
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment