修复测试反馈问题
This commit is contained in:
@@ -50,7 +50,7 @@ public class CallClientManager {
|
||||
public static final String AUDIO_FLOAT = "audioFloatWindow";//浮窗
|
||||
private static CallClientManager manager;
|
||||
private SurfaceView localVideo, remoteVideo;
|
||||
private Map<Class,OnCallStatusListener> listeners;
|
||||
private Map<Class, OnCallStatusListener> listeners;
|
||||
private CallTimeTask timeTask = null;
|
||||
|
||||
public static CallClientManager getManager() {
|
||||
@@ -84,8 +84,8 @@ public class CallClientManager {
|
||||
RongCallClient.setReceivedCallListener(new CallMeListener());
|
||||
}
|
||||
|
||||
public void addOnVoIPCallListener(Class zlass,OnCallStatusListener statusListener) {
|
||||
listeners.put(zlass,statusListener);
|
||||
public void addOnVoIPCallListener(Class zlass, OnCallStatusListener statusListener) {
|
||||
listeners.put(zlass, statusListener);
|
||||
RongCallClient.getInstance().setVoIPCallListener(new CallStatusListener(new OnCallStatusListener() {
|
||||
@Override
|
||||
public void onCallWait(SurfaceView localVideo) {
|
||||
@@ -96,7 +96,7 @@ public class CallClientManager {
|
||||
|
||||
@Override
|
||||
public void onCallStart(String userId, SurfaceView remoteVideo) {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
listener.onCallStart(userId, remoteVideo);
|
||||
}
|
||||
startTimer(null);
|
||||
@@ -104,7 +104,7 @@ public class CallClientManager {
|
||||
|
||||
@Override
|
||||
public void onCallEnd() {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
listener.onCallEnd();
|
||||
}
|
||||
endTimer();
|
||||
@@ -112,7 +112,7 @@ public class CallClientManager {
|
||||
|
||||
@Override
|
||||
public void onStartFirstFrame() {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
listener.onStartFirstFrame();
|
||||
}
|
||||
}
|
||||
@@ -150,14 +150,14 @@ public class CallClientManager {
|
||||
RongCallClient.getInstance().setVoIPCallListener(new CallStatusListener(new OnCallStatusListener() {
|
||||
@Override
|
||||
public void onCallWait(SurfaceView localVideo) {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
listener.onCallWait(localVideo);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCallStart(String userId, SurfaceView remoteVideo) {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
listener.onCallStart(userId, remoteVideo);
|
||||
}
|
||||
startTimer(targetId);
|
||||
@@ -165,7 +165,7 @@ public class CallClientManager {
|
||||
|
||||
@Override
|
||||
public void onCallEnd() {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
listener.onCallEnd();
|
||||
}
|
||||
endTimer();
|
||||
@@ -173,7 +173,7 @@ public class CallClientManager {
|
||||
|
||||
@Override
|
||||
public void onStartFirstFrame() {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
listener.onStartFirstFrame();
|
||||
}
|
||||
}
|
||||
@@ -187,14 +187,14 @@ public class CallClientManager {
|
||||
RongCallClient.getInstance().setVoIPCallListener(new CallStatusListener(new OnCallStatusListener() {
|
||||
@Override
|
||||
public void onCallWait(SurfaceView localVideo) {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
listener.onCallWait(localVideo);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCallStart(String userId, SurfaceView remoteVideo) {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
listener.onCallStart(userId, remoteVideo);
|
||||
}
|
||||
startTimer(targetId);
|
||||
@@ -202,7 +202,7 @@ public class CallClientManager {
|
||||
|
||||
@Override
|
||||
public void onCallEnd() {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
listener.onCallEnd();
|
||||
}
|
||||
endTimer();
|
||||
@@ -210,7 +210,7 @@ public class CallClientManager {
|
||||
|
||||
@Override
|
||||
public void onStartFirstFrame() {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
listener.onStartFirstFrame();
|
||||
}
|
||||
}
|
||||
@@ -244,7 +244,7 @@ public class CallClientManager {
|
||||
|
||||
public String getSessionId() {
|
||||
RongCallSession callSession = RongCallClient.getInstance().getCallSession();
|
||||
if(callSession==null){
|
||||
if (callSession == null) {
|
||||
return "";
|
||||
}
|
||||
return callSession.getCallerUserId();
|
||||
@@ -265,7 +265,8 @@ public class CallClientManager {
|
||||
|
||||
@Override
|
||||
public boolean cancel() {
|
||||
if (sessionId.equals(targetId)) {
|
||||
long id = IMLoginManager.get(CommonAppContext.sInstance).getUserInfo().getId();
|
||||
if (sessionId.equals(targetId) || !sessionId.equals(id + "")) {
|
||||
System.err.println("接听方不计费 结束");
|
||||
return super.cancel();
|
||||
}
|
||||
@@ -309,7 +310,7 @@ public class CallClientManager {
|
||||
extra = String.format(Locale.ROOT, "%02d:%02d", (time % 3600) / 60, (time % 60));
|
||||
}
|
||||
handler.post(() -> {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
listener.onTime(extra);
|
||||
if (warningTime <= 60) {
|
||||
listener.onTimeWarning(warningTime--);
|
||||
@@ -355,7 +356,7 @@ public class CallClientManager {
|
||||
warningTime = bean.getMp3Time();
|
||||
}
|
||||
if (warningTime <= 60) {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
listener.onTimeWarning(warningTime);
|
||||
}
|
||||
}
|
||||
@@ -365,7 +366,7 @@ public class CallClientManager {
|
||||
public void onError(int status, String msg) {
|
||||
super.onError(status, msg);
|
||||
if (status == OnSendMessageListener.STATUS_NOT_PRICE) {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
for (OnCallStatusListener listener : listeners.values()) {
|
||||
listener.onErrorNotPrice(msg);
|
||||
}
|
||||
endCall();
|
||||
@@ -553,12 +554,12 @@ public class CallClientManager {
|
||||
* 如果对端调用{@link RongCallClient#startCall(int, boolean, Conversation.ConversationType, String, List, List, RongCallCommon.CallMediaType, String, StartCameraCallback)} 或
|
||||
* {@link RongCallClient#acceptCall(String, int, boolean, StartCameraCallback)}开始的音视频通话，则可以使用如下设置改变对端视频流的镜像显示：<br />
|
||||
* <pre class="prettyprint">
|
||||
* public void onRemoteUserJoined(String userId, RongCallCommon.CallMediaType mediaType, int userType, SurfaceView remoteVideo) {
|
||||
* if (null != remoteVideo) {
|
||||
* ((RongRTCVideoView) remoteVideo).setMirror( boolean);//观看对方视频流是否镜像处理
|
||||
* }
|
||||
* }
|
||||
* </pre>
|
||||
* public void onRemoteUserJoined(String userId, RongCallCommon.CallMediaType mediaType, int userType, SurfaceView remoteVideo) {
|
||||
* if (null != remoteVideo) {
|
||||
* ((RongRTCVideoView) remoteVideo).setMirror( boolean);//观看对方视频流是否镜像处理
|
||||
* }
|
||||
* }
|
||||
* </pre>
|
||||
*/
|
||||
@Override
|
||||
public void onRemoteUserJoined(String userId, RongCallCommon.CallMediaType mediaType, int userType, SurfaceView remoteVideo) {
|
||||
|
||||
Reference in New Issue
Block a user