Commit Graph

694 Commits

Author SHA1 Message Date
董宏宇
f0078e2a44 Merge remote-tracking branch 'origin/live_sdk' into live_sdk 2021-02-05 17:49:51 +08:00
zhongchao
dee1cc7bfe fix bug 2021-02-05 17:46:33 +08:00
zhongchao
418b9a2f4b fix bug 2021-02-05 17:46:06 +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
zhongchao
f05837b653 remove unuse code and add interface 2021-02-04 18:12:24 +08:00
董宏宇
8906d03d08 Merge branch 'master' into live_sdk
# Conflicts:
#	gradle.properties
2021-02-04 17:45:05 +08:00
董宏宇
91212976bd 发布1.0.9-SNAPSHOT 2021-02-04 17:44:09 +08:00
lixiaopeng
931f64047a opt 2021-02-04 17:41:13 +08:00
董宏宇
2ccf8392bf 增加了长连接数据接受 2021-02-04 17:40:51 +08:00
董宏宇
90b8484913 完成了数据上报socket 2021-02-04 17:35:34 +08:00
zhongchao
ca8a1b4593 add log 2021-02-04 14:34:54 +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
董宏宇
638d30d0bd Merge remote-tracking branch 'origin/master' 2021-02-04 11:20:15 +08:00
董宏宇
5ec2e4fe8e 增加了配置信息为单例模式 2021-02-04 11:20:08 +08:00
liujing
0163134472 Merge branch 'lo' 2021-02-04 10:37:26 +08:00
liujing
6dc1ff729d 日志输出加判断 2021-02-04 10:37:16 +08:00
董宏宇
aaf294e1e9 使用isShowDebugLog控制日志的输出 2021-02-04 10:36:15 +08:00
董宏宇
1c655fb208 修复中间停止推送后,再次开启推送异常 2021-02-03 18:19:06 +08:00
董宏宇
b1c8c0fa3c Merge remote-tracking branch 'origin/live_sdk' into live_sdk 2021-02-03 17:54:55 +08:00
董宏宇
a3b281e809 修复关闭直播的时候没有退出房间 2021-02-03 17:54:47 +08:00
zhongchao
cd23213a08 add new module trafficLive and rename package of class 2021-02-03 17:49:16 +08:00
zhongchao
1a937c33a5 add new module trafficLive and rename class package 2021-02-03 17:48:37 +08:00
董宏宇
f325f43171 完成了直播播放的拉流demo 2021-02-03 17:46: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
zhongchao
aaa79002db Merge branch 'master' of http://gitlab.zhidaoauto.com/ecos/app/MoGoAiCloudSdk into live_sdk 2021-02-03 12:12:53 +08:00
zhongchao
ffaccfffc3 extand socketManager to fit liveSDK 2021-02-03 12:12:47 +08:00
董宏宇
ca397a4400 增加了直播模块 2021-02-02 15:17:34 +08:00
lixiaopeng
279bbae105 opt 2021-02-02 10:37:08 +08:00
董宏宇
ceb4c92f93 Merge remote-tracking branch 'origin/master' 2021-02-02 10:19:14 +08:00
董宏宇
5bb9f0769b 删除无用api地址 2021-02-02 10:19:11 +08:00
zhongchao
c016229888 erge branch 'master' of http://gitlab.zhidaoauto.com/ecos/app/MoGoAiCloudSdk 2021-02-02 10:12:49 +08:00
zhongchao
885c6b862c fix bug 2021-02-02 10:12:43 +08:00
董宏宇
37c39ebb59 Merge remote-tracking branch 'origin/master' 2021-02-01 17:22:27 +08:00
董宏宇
323ccdb05e 修改gradle版本以兼容jenkins 2021-02-01 17:22:16 +08:00
liujing
9ef8941444 Revert "测试代码"
This reverts commit 76f32e5245.
2021-02-01 17:13:15 +08:00