Commit Graph

127 Commits

Author SHA1 Message Date
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
zhongchao
ffaccfffc3 extand socketManager to fit liveSDK 2021-02-03 12:12:47 +08:00
董宏宇
ca397a4400 增加了直播模块 2021-02-02 15:17:34 +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
董宏宇
726aa40b51 修改本地话依赖可用 2021-02-01 15:38:12 +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
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
董宏宇
de1767f8fd 增加Token拦截适配器 2021-01-28 17:43:20 +08:00
zhongchao
39654b6bda add consumer-rules 2021-01-28 17:20:40 +08:00
zhongchao
f49dc6a259 merge 2021-01-28 17:14:42 +08:00
zhongchao
cf12e2f16b add proguard 2021-01-28 17:11:50 +08:00
董宏宇
352220d78b 修改了网络库名称 2021-01-28 16:48:40 +08:00
董宏宇
2376689b3c 修改令牌展示方式 2021-01-28 16:36:11 +08:00