Commit Graph

150 Commits

Author SHA1 Message Date
董宏宇
ae5089cc33 修复了在线状态的bug 2021-02-08 18:32:15 +08:00
董宏宇
4b91ab060a 发布了直播推送SDK 2021-02-07 19:38:09 +08:00
董宏宇
db4841a462 完成了人数的判断 2021-02-07 19:16:11 +08:00
zhongchao
30c3f89d25 merge 2021-02-07 17:57:57 +08:00
zhongchao
e0e2f1b30a add log 2021-02-07 17:56:07 +08:00
董宏宇
fc7c979324 Merge remote-tracking branch 'origin/live_sdk' into live_sdk
# Conflicts:
#	foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java
2021-02-07 17:48:24 +08:00
董宏宇
e9acfe1c34 改造了推流的流程 2021-02-07 17:47:09 +08:00
zhongchao
7c20ec5f13 Merge branch 'live_sdk' of http://gitlab.zhidaoauto.com/ecos/app/MoGoAiCloudSdk into live_sdk 2021-02-07 17:33:13 +08:00
zhongchao
09a4080ab3 fix bug of logic in destory 2021-02-07 17:33:07 +08:00
董宏宇
7a600e3a15 删除了没用到的资源 2021-02-07 16:55:36 +08:00
董宏宇
36864d2ef9 Merge remote-tracking branch 'origin/live_sdk' into live_sdk 2021-02-07 16:29:33 +08:00
董宏宇
f7c7120c5b 增加了房间观看人数增加通知 2021-02-07 16:29:28 +08:00
zhongchao
fe8b41d651 Merge branch 'live_sdk' of http://gitlab.zhidaoauto.com/ecos/app/MoGoAiCloudSdk into live_sdk 2021-02-07 16:29:19 +08:00
zhongchao
1ffd5e7302 fix bug of NPL in MoGoLiveManager 2021-02-07 16:29:08 +08:00
董宏宇
30f81d39a0 完善了直播调用的 2021-02-07 15:59:44 +08:00
zhongchao
0b5f07c319 fix bug of logout room 2021-02-07 15:32:52 +08:00
zhongchao
db65a9f3f0 remove consumer-rules classes 2021-02-07 14:45:58 +08:00
zhongchao
afdeae8126 merge 2021-02-07 14:44:59 +08:00
zhongchao
a9ad47668e add proguard and add close live api 2021-02-07 14:44:02 +08:00
董宏宇
b6e0acb9c1 修改了接口调用 2021-02-07 14:16:37 +08:00
董宏宇
ef446d84d5 删除了无用类 2021-02-07 13:37:46 +08:00
董宏宇
0ad76f9428 Merge remote-tracking branch 'origin/live_sdk' into live_sdk 2021-02-07 12:24:15 +08:00
董宏宇
1075096823 临时存储 2021-02-07 11:34:00 +08:00
zhongchao
d7a3baa4ae fix bug of pull live 2021-02-07 11:33:04 +08:00
董宏宇
6a9fcbd28c 完善了直播场景,通过指令下发
http://dzt-test.zhidaohulian.com/dataSave/integratedServices/app/push/no/livePushAndSwitch/v1
POST
data:{"sn":"X1020210128F803EB2046PZD00149","type":"0","videoChannel":"C_1"}
2021-02-05 20:14:09 +08:00
董宏宇
f0078e2a44 Merge remote-tracking branch 'origin/live_sdk' into live_sdk 2021-02-05 17:49:51 +08:00
zhongchao
8729e556cc Merge branch 'live_sdk' of http://gitlab.zhidaoauto.com/ecos/app/MoGoAiCloudSdk into live_sdk 2021-02-05 17:41:08 +08:00
zhongchao
b5b0eeeae4 finish the trafficlive module 2021-02-05 17:40:58 +08:00
董宏宇
a14fb09a9a Merge branch 'master' into live_sdk 2021-02-05 17:33:53 +08:00
董宏宇
57dde726c7 增加了日志输出 2021-02-05 17:33:30 +08:00
董宏宇
81592c2a1a 完善了通过指令下发的直播流程 2021-02-05 17:31:32 +08:00
董宏宇
cc9f96dc14 Merge remote-tracking branch 'origin/live_sdk' into live_sdk 2021-02-05 12:38:55 +08:00
董宏宇
5a4293b950 完善直播demo 2021-02-05 12:38:52 +08:00
zhongchao
423e7fba13 add RequestLiveManager 2021-02-05 12:06:10 +08:00
董宏宇
c704107c90 Merge remote-tracking branch 'origin/live_sdk' into live_sdk 2021-02-04 18:49:21 +08:00
zhongchao
2ca4bb3018 change the tag 2021-02-04 18:49:08 +08:00
董宏宇
7beec1fc9e 修改socket 2021-02-04 18:42:09 +08:00
zhongchao
3e45e75268 refix name 2021-02-04 18:35:16 +08:00
董宏宇
2ccf8392bf 增加了长连接数据接受 2021-02-04 17:40:51 +08:00
董宏宇
90b8484913 完成了数据上报socket 2021-02-04 17:35:34 +08:00
董宏宇
32fcf26ae8 修改错误maven 2021-02-04 12:00:38 +08:00
董宏宇
3e79f0854c Merge branch 'master' into live_sdk
# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/mogo/cloud/MainActivity.java
#	modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java
2021-02-04 11:34:40 +08:00
董宏宇
5ec2e4fe8e 增加了配置信息为单例模式 2021-02-04 11:20:08 +08:00
董宏宇
aaf294e1e9 使用isShowDebugLog控制日志的输出 2021-02-04 10:36:15 +08:00
董宏宇
1c655fb208 修复中间停止推送后,再次开启推送异常 2021-02-03 18:19:06 +08:00
董宏宇
a3b281e809 修复关闭直播的时候没有退出房间 2021-02-03 17:54:47 +08:00
董宏宇
533f4df3b9 完成了直播推流demo 2021-02-03 17:15:09 +08:00
董宏宇
cb4b3e4bb5 开始编写基于zego的直播模块 2021-02-03 16:33:05 +08:00
董宏宇
9009c9b75a Merge remote-tracking branch 'origin/live_sdk' into live_sdk 2021-02-03 14:08:17 +08:00
董宏宇
36a6785ec2 开始编写直播模块 2021-02-03 14:08:12 +08:00