|
@@ -38,7 +38,7 @@ import java.util.List;
|
|
|
import java.util.Timer;
|
|
|
import java.util.TimerTask;
|
|
|
|
|
|
-public class MainActivity extends BaseActivity implements Listener.VideoListener {
|
|
|
+public class MainActivity extends BaseActionActivity implements Listener.VideoListener {
|
|
|
public final String TAG = "losion / skvideo :" + getClass().getSimpleName();
|
|
|
|
|
|
public JuphoonManager mJuphoonManager = new JuphoonManager();
|
|
@@ -139,10 +139,10 @@ public class MainActivity extends BaseActivity implements Listener.VideoListener
|
|
|
mJuphoonManager.answer();
|
|
|
});
|
|
|
voiceIngBtn.setOnClickListener(v -> {
|
|
|
-
|
|
|
+ onClickVoiceButton();
|
|
|
});
|
|
|
voiceOutBtn.setOnClickListener(v -> {
|
|
|
-
|
|
|
+ onClickVoiceButton();
|
|
|
});
|
|
|
mBottomEndButton.setOnClickListener(v -> {
|
|
|
videoEndStep2();
|
|
@@ -217,8 +217,11 @@ public class MainActivity extends BaseActivity implements Listener.VideoListener
|
|
|
|
|
|
@Override
|
|
|
public void onEnterRoom() {
|
|
|
- mLoadingLayout.setVisibility(View.GONE);
|
|
|
- mInfoLayout.setVisibility(View.VISIBLE);
|
|
|
+ if (mVideoType == Constant.VIDEO_CALL_OUT) {
|
|
|
+ refreshView(1);
|
|
|
+ } else {
|
|
|
+ refreshView( 2);
|
|
|
+ }
|
|
|
|
|
|
// 2. 做出相应的处理,如在界面上显示“振铃中”
|
|
|
if (mMediaPlayerUtils != null) {
|
|
@@ -231,12 +234,6 @@ public class MainActivity extends BaseActivity implements Listener.VideoListener
|
|
|
startTimeoutTimer();
|
|
|
mVideoLayout.addView(view, 0);
|
|
|
mVideoLayout.setVisibility(View.VISIBLE);
|
|
|
-
|
|
|
- if (mVideoType == Constant.VIDEO_CALL_OUT) {
|
|
|
- refreshView(1);
|
|
|
- } else {
|
|
|
- refreshView( 2);
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
@Override
|