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
9714f6ae
Commit
9714f6ae
authored
Oct 12, 2022
by
sheteng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
语音房间
parent
7c1a4482
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
35 additions
and
27 deletions
+35
-27
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
+1
-3
ccim/src/main/java/com/ccwangluo/ccim/audio/JanusService.java
.../src/main/java/com/ccwangluo/ccim/audio/JanusService.java
+17
-8
ccim/src/main/java/com/ccwangluo/ccim/manage/CallBackManager.java
.../main/java/com/ccwangluo/ccim/manage/CallBackManager.java
+6
-3
ccim/src/main/java/com/ccwangluo/ccim/socket/NettyChatClient.java
.../main/java/com/ccwangluo/ccim/socket/NettyChatClient.java
+10
-12
No files found.
app/src/main/res/layout/activity_login.xml
View file @
9714f6ae
...
...
@@ -69,7 +69,7 @@
android:layout_height=
"wrap_content"
android:layout_marginTop=
"8dp"
android:hint=
"ip"
android:text=
"10
.17.4.20
7"
android:text=
"10
6.15.237.6
7"
android:imeActionLabel=
"@string/action_sign_in_short"
android:imeOptions=
"actionDone"
android:selectAllOnFocus=
"true"
...
...
ccim/src/main/java/com/ccwangluo/ccim/CCIMClient.java
View file @
9714f6ae
...
...
@@ -406,7 +406,7 @@ public class CCIMClient {
*/
public
boolean
checkMutedExpired
()
{
long
currentTimeMillis
=
System
.
currentTimeMillis
();
if
(
currentTimeMillis
<
mutedExpiredAt
)
{
if
(
mutedExpiredAt
==
-
1L
||
currentTimeMillis
<
mutedExpiredAt
)
{
return
false
;
}
return
true
;
...
...
@@ -715,8 +715,6 @@ public class CCIMClient {
conf
.
plugin
(
JanusPlugins
.
VIDEOROOM
);
if
(
janusService
!=
null
)
{
janusService
.
stop
();
// callback.onJoinFailed(ErrorCode.JOIN_AUDIO_FAILED_JOINED);
// return;
}
janusService
=
new
JanusService
(
context
,
roomId
,
user
,
callback
);
janusService
.
start
(
context
,
conf
);
...
...
ccim/src/main/java/com/ccwangluo/ccim/audio/JanusService.java
View file @
9714f6ae
...
...
@@ -48,20 +48,16 @@ public class JanusService extends JanusDelegate {
private
Boolean
isJoin
=
false
;
private
AudioRoomListener
callback
;
// private AudioManager audioManager;
// private AudioManager audioManager;
private
AudioTrack
audioTrack
;
private
AppRTCAudioManager
audioManager
;
public
JanusService
(
Context
context
,
Integer
roomId
,
User
user
,
AudioRoomListener
callback
)
{
audioManager
=
AppRTCAudioManager
.
create
(
context
);
// audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
this
.
user
=
user
;
this
.
roomId
=
roomId
;
this
.
callback
=
callback
;
audioManager
.
start
((
selectedAudioDevice
,
availableAudioDevices
)
->
{
});
}
...
...
@@ -104,7 +100,12 @@ public class JanusService extends JanusDelegate {
public
void
onClose
()
{
logger
.
info
(
"close"
);
if
(
audioManager
!=
null
)
{
audioManager
.
stop
();
CCIMClient
.
getInstance
().
handler
.
post
(
new
Runnable
()
{
@Override
public
void
run
()
{
audioManager
.
stop
();
}
});
}
}
...
...
@@ -121,6 +122,14 @@ public class JanusService extends JanusDelegate {
payload
.
setInt
(
"room"
,
roomId
);
payload
.
setString
(
"display"
,
new
Gson
().
toJson
(
user
));
this
.
_janus
.
dispatch
(
JanusCommands
.
JOIN
,
payload
);
CCIMClient
.
getInstance
().
handler
.
post
(
new
Runnable
()
{
@Override
public
void
run
()
{
audioManager
.
start
((
selectedAudioDevice
,
availableAudioDevices
)
->
{
});
}
});
}
@Override
...
...
@@ -131,9 +140,9 @@ public class JanusService extends JanusDelegate {
@Override
public
void
onMediaChanged
(
MediaBundle
media
)
{
if
(
media
.
localAudioTrack
()
!=
null
)
{
if
(
media
.
localAudioTrack
()
!=
null
)
{
audioTrack
=
media
.
localAudioTrack
();
if
(!
CCIMClient
.
getInstance
().
checkMutedExpired
()){
if
(!
CCIMClient
.
getInstance
().
checkMutedExpired
())
{
audioTrack
.
setEnabled
(
false
);
}
}
...
...
ccim/src/main/java/com/ccwangluo/ccim/manage/CallBackManager.java
View file @
9714f6ae
...
...
@@ -3,14 +3,16 @@ package com.ccwangluo.ccim.manage;
import
android.os.Handler
;
import
android.os.Looper
;
import
com.ccwangluo.ccim.CCIMClient
;
import
com.ccwangluo.ccim.listener.ResultEventCallback
;
import
com.ccwangluo.ccim.util.ErrorCode
;
import
java.util.HashMap
;
import
java.util.logging.Logger
;
public
class
CallBackManager
<
T
>
{
private
final
HashMap
<
Integer
,
ResultEventCallback
<
T
>>
callbackHashMap
=
new
HashMap
<>();
private
final
Logger
logger
=
Logger
.
getLogger
(
CCIMClient
.
class
.
getName
());
private
static
final
int
time_out
=
20
*
1000
;
...
...
@@ -19,11 +21,12 @@ public class CallBackManager<T> {
//设置60秒超时
new
Handler
(
Looper
.
getMainLooper
()).
postDelayed
(()
->
{
ResultEventCallback
<
T
>
callBack
=
getCallBack
(
id
);
if
(
callBack
!=
null
&&
id
!=
0
){
if
(
callBack
!=
null
&&
id
!=
0
)
{
removeCallBack
(
id
);
callBack
.
onFailed
(
ErrorCode
.
NET_TIME_OUT
);
logger
.
info
(
"send time out,seq id is "
+
id
);
}
},
time_out
);
},
time_out
);
}
public
ResultEventCallback
<
T
>
getCallBack
(
int
id
)
{
...
...
ccim/src/main/java/com/ccwangluo/ccim/socket/NettyChatClient.java
View file @
9714f6ae
...
...
@@ -145,24 +145,22 @@ public class NettyChatClient implements SocketClient {
@Override
public
void
heartBeat
(
Long
frequency
,
Chat
.
ChatRequestMessage
build
)
{
if
(
timer
!=
null
){
if
(
timer
!=
null
)
{
timer
.
cancel
();
timer
=
null
;
}
timer
=
new
Timer
();
timer
.
schedule
(
new
TimerTask
()
{
public
void
run
()
{
if
(
getConnectivityStatus
(
context
))
{
if
(
channelFuture
!=
null
&&
channelFuture
.
channel
().
isActive
())
{
logger
.
info
(
"check connect is active"
);
channelFuture
.
channel
().
writeAndFlush
(
build
);
}
else
{
try
{
logger
.
info
(
"reconnect"
);
connectSync
();
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
if
(
channelFuture
!=
null
&&
channelFuture
.
channel
().
isActive
())
{
logger
.
info
(
"check connect is active"
);
channelFuture
.
channel
().
writeAndFlush
(
build
);
}
else
{
try
{
logger
.
info
(
"reconnect"
);
connectSync
();
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
}
}
...
...
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