yangyakun921/MoGoAiCloudSdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完成了数据上报socket

Browse Source
This commit is contained in:
董宏宇
2021-02-04 17:35:34 +08:00
parent 32fcf26ae8
commit 90b8484913
12 changed files with 561 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/com/mogo/cloud/LivePlayActivity.java
View File

@@ -2,7 +2,6 @@ package com.mogo.cloud;
import android.os.Bundle;
import android.util.Log;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
import android.widget.EditText;
import android.widget.Toast;
@@ -11,8 +10,7 @@ import android.widget.ToggleButton;
import androidx.appcompat.app.AppCompatActivity;
import com.mogo.cloud.live.listener.ILiveProgressListener;
import com.mogo.cloud.live.manager.ZeGoLiveManager;
import com.mogo.cloud.util.Devices;
import com.mogo.cloud.live.manager.MoGoLiveManager;
public class LivePlayActivity extends AppCompatActivity {
@@ -36,12 +34,12 @@ public class LivePlayActivity extends AppCompatActivity {
Toast.makeText(getApplicationContext(), buttonView.getText(), Toast.LENGTH_SHORT).show();
if (isChecked) {
String roomId = etLookRoomId.getText().toString().trim();
mStreamId = ZeGoLiveManager.STREAM_ID_PREFIX + roomId;
ZeGoLiveManager.getInstance().init(this.getApplication(), null);
ZeGoLiveManager.getInstance().loginRoom("F803EB2046PZD00140", roomId);
ZeGoLiveManager.getInstance().setLiveProgressListener(listener);
mStreamId = MoGoLiveManager.STREAM_ID_PREFIX + roomId;
MoGoLiveManager.getInstance().init(this.getApplication(), null);
MoGoLiveManager.getInstance().loginRoom("F803EB2046PZD00140", roomId);
MoGoLiveManager.getInstance().setLiveProgressListener(listener);
} else {
ZeGoLiveManager.getInstance().stopLive(mStreamId);
MoGoLiveManager.getInstance().stopLive(mStreamId);
}
});
}
@@ -87,15 +85,15 @@ public class LivePlayActivity extends AppCompatActivity {
private void toggleLive(boolean isChecked) {
Log.i(TAG, "toggleLive status : " + isChecked + " , mStreamId : " + mStreamId);
if (isChecked) {
ZeGoLiveManager.getInstance().startLive(mStreamId, surfaceView);
MoGoLiveManager.getInstance().startLive(mStreamId, surfaceView);
} else {
ZeGoLiveManager.getInstance().stopLive(mStreamId);
MoGoLiveManager.getInstance().stopLive(mStreamId);
}
}
@Override
protected void onDestroy() {
super.onDestroy();
ZeGoLiveManager.getInstance().onDestroyLive();
MoGoLiveManager.getInstance().onDestroyLive();
}
}

15
app/src/main/java/com/mogo/cloud/LivePushActivity.java
View File

@@ -4,6 +4,8 @@ import android.os.Bundle;
import android.util.Log;
import com.mogo.cloud.live.manager.CameraFrameManager;
import com.mogo.cloud.live.manager.LiveStreamManager;
import com.mogo.cloud.live.manager.LiveStreamManagerImpl;
import com.mogo.cloud.live.server.PushService;
import com.mogo.cloud.util.Devices;
@@ -20,6 +22,9 @@ public class LivePushActivity extends BaseLiveActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// 初始化直播流管理
LiveStreamManager liveStreamManager = LiveStreamManagerImpl.getInstance(this, Devices.getSn());
liveStreamManager.uploadCamStatus(1, 1);
}
@Override
@@ -35,11 +40,11 @@ public class LivePushActivity extends BaseLiveActivity {
public void toggleLive(boolean isLive) {
Log.i(TAG, "toggleLive : " + isLive);
this.isLive = isLive;
if (isLive) {
PushService.startService(this, PushService.ACTION_START_RTMP_PUSH, Devices.getSn());
} else {
PushService.startService(this, PushService.ACTION_STOP_RTMP_PUSH, null);
}
// if (isLive) {
// PushService.startService(this, PushService.ACTION_START_RTMP_PUSH, Devices.getSn());
// } else {
// PushService.startService(this, PushService.ACTION_STOP_RTMP_PUSH, null);
// }
}
@Override