Commit Graph

378 Commits

Author SHA1 Message Date
董宏宇
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
liujing
76f32e5245 测试代码 2021-02-01 16:36:31 +08:00
董宏宇
726aa40b51 修改本地话依赖可用 2021-02-01 15:38:12 +08:00
董宏宇
0eeffcf785 修改测试demo的依赖 2021-02-01 15:22:32 +08:00
董宏宇
fd1bbbca88 上传Maven 2021-02-01 15:14:35 +08:00
董宏宇
8cd9319939 增加了内部依赖的wiki地址 2021-02-01 14:50:18 +08:00
董宏宇
9455480d1b 更新了upload-sdk
增加了setAuthPubKey
2021-02-01 14:48:47 +08:00
zhongchao
1147a3dac9 remove common build files 2021-01-29 17:42:39 +08:00
zhongchao
1a146131fd Merge branch 'master' of http://gitlab.zhidaoauto.com/ecos/app/MoGoAiCloudSdk 2021-01-29 17:41:51 +08:00
zhongchao
b958d839ba fix bug 2021-01-29 17:41:46 +08:00
董宏宇
04d012e975 增加了Token刷新机制 2021-01-29 12:02:40 +08:00
wujifei
d3bf97980c 格式化返回数据 2021-01-29 10:46:56 +08:00
lixiaopeng
781325b130 opt 2021-01-28 19:46:51 +08:00
董宏宇
61da360834 增加了demo 2021-01-28 18:21:32 +08:00
董宏宇
bbcd1fcc84 修改dns初始化 2021-01-28 18:08:54 +08:00
董宏宇
e972cd360d 修改初始化的时候回调的监听 2021-01-28 18:01:24 +08:00
董宏宇
ff4f0ab7fa Merge remote-tracking branch 'origin/master' 2021-01-28 17:43:24 +08:00