donghongyu
|
cfd0e51d0f
|
Merge branch 'fix_loginMultiRoom_bug'
# Conflicts:
# foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java
# gradle.properties
|
2021-11-26 15:29:41 +08:00 |
|
donghongyu
|
9e06469fb6
|
[Fix]修复两分钟后自动开始推流的bug
|
2021-11-26 15:28:54 +08:00 |
|
donghongyu
|
a7bf00f56d
|
[Add]发布1.3.12
|
2021-11-26 14:27:37 +08:00 |
|
donghongyu
|
138988b02d
|
[Add]发布1.3.11
|
2021-11-26 12:16:13 +08:00 |
|
donghongyu
|
c87abbbde9
|
Merge branch 'fix_loginMultiRoom_bug'
|
2021-11-26 11:44:58 +08:00 |
|
donghongyu
|
a7ec0ff43e
|
[Add]增加了是否开启自定义采集配置isExpressEngine
|
2021-11-26 11:44:04 +08:00 |
|
chenfufeng
|
7f7e2b7f89
|
[Update]增加api支持TextureView播放直播
|
2021-11-25 11:20:55 +08:00 |
|
donghongyu
|
ffb1ebbf54
|
Merge branch 'fix_loginMultiRoom_bug'
# Conflicts:
# app/src/main/java/com/mogo/cloud/MoGoApplication.java
# gradle.properties
|
2021-11-24 17:49:32 +08:00 |
|
donghongyu
|
e3dfbc8a7b
|
[Change]修改推流流程，原因是衡阳环境中Socket下发指令有问题，现在改成了借用ZeGo的房间人数流程大于1人开始直播，否则关闭直播
|
2021-11-24 16:39:40 +08:00 |
|
donghongyu
|
ed49db4b32
|
[Change]解除对core中utils的依赖，直接使用已有依赖库中的日志和json解析工具，防止出现插件检查时候出现的重复依赖问题
|
2021-11-22 11:45:43 +08:00 |
|
zhongchao
|
1bf3f5aea4
|
to adjust socket server require ip
|
2021-11-21 10:03:46 +08:00 |
|
donghongyu
|
7c453cb7ef
|
Merge branch 'master' into fix_log_print
# Conflicts:
# foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketConfig.java
# gradle.properties
|
2021-11-19 21:32:31 +08:00 |
|
zhongchao
|
33d97832ac
|
replace auth
|
2021-11-19 21:23:47 +08:00 |
|
donghongyu
|
26fd50e726
|
[Fix]修复日志输出
|
2021-11-19 20:54:29 +08:00 |
|
donghongyu
|
501dac9e55
|
[Upload]网络请求日志分级
|
2021-11-19 16:16:11 +08:00 |
|
donghongyu
|
c18b46b5c2
|
[Upload]对socket RequestUtil 增加日志msgId输出
|
2021-11-19 15:04:45 +08:00 |
|
zhongchao
|
444b7a4c68
|
fix bug of location to upload socket server
|
2021-11-17 17:14:22 +08:00 |
|
zhongchao
|
d3d355c442
|
add log
|
2021-11-16 22:04:06 +08:00 |
|
zhongchao
|
222c93d4c9
|
add log
|
2021-11-16 20:39:23 +08:00 |
|
zhongchao
|
4babfac54c
|
update version to 1.2.8, include the live and socket new verion
|
2021-11-16 20:24:59 +08:00 |
|
zhongchao
|
e148de5450
|
androidx fit
|
2021-11-16 20:07:24 +08:00 |
|
zhongchao
|
fa9c814611
|
socket divide origin and new
|
2021-11-16 20:07:24 +08:00 |
|
zhongchao
|
1e846afd85
|
add new func
|
2021-11-16 20:07:24 +08:00 |
|
zhongchao
|
834603b18a
|
replace the auth key
|
2021-11-16 20:07:24 +08:00 |
|
zhongchao
|
0397c95ee0
|
add socket third core service and update version
:wq
git #
|
2021-11-16 20:07:10 +08:00 |
|
chenfufeng
|
8c0982b150
|
Merge添加第一帧画面和错误相关的回调函数
|
2021-11-16 20:04:18 +08:00 |
|
chenfufeng
|
3f42b0b190
|
添加第一帧画面和错误相关的回调函数
|
2021-11-11 21:42:32 +08:00 |
|
董宏宇
|
c867f7ad89
|
延长直播在线人数检测时间
(cherry picked from commit f948cd4a9b)
|
2021-11-05 10:58:52 +08:00 |
|
董宏宇
|
f948cd4a9b
|
延长直播在线人数检测时间
|
2021-11-05 10:43:52 +08:00 |
|
董宏宇
|
897d95a4da
|
Merge branch 'fix_loginMultiRoom_bug'
|
2021-11-04 22:20:20 +08:00 |
|
董宏宇
|
055cd82164
|
修复了在线人数检测影响的推流
|
2021-11-04 22:07:39 +08:00 |
|
董宏宇
|
a4b2a39e9a
|
Merge branch 'fix_loginMultiRoom_bug'
# Conflicts:
# .idea/deploymentTargetDropDown.xml
# app/src/main/java/com/mogo/cloud/MoGoApplication.java
# gradle.properties
|
2021-11-04 21:03:35 +08:00 |
|
董宏宇
|
6ff9dd977a
|
// 设置是否是直播推流的主播，true 是观众，false-是主播
clientConfig.setAnchor(false);
鹰眼为观看端，设置为 true
行车记录仪或推流服务，为主播设置为false
|
2021-11-04 17:25:32 +08:00 |
|
董宏宇
|
4f365b269e
|
Merge branch 'fix_loginMultiRoom_bug'
|
2021-11-03 16:02:03 +08:00 |
|
董宏宇
|
f49fecd9a9
|
修复登陆房间不统一导致无法拉流的bug
|
2021-11-03 15:44:11 +08:00 |
|
董宏宇
|
d58a9277ab
|
升级Kotlin
|
2021-09-06 17:13:20 +08:00 |
|
董宏宇
|
a454f3649e
|
统一升级Android依赖包，AndroidX
|
2021-09-06 15:28:35 +08:00 |
|
lianglihui
|
66383ddc46
|
loc-upload sdk version update
|
2021-08-23 15:41:54 +08:00 |
|
董宏宇
|
ee73eb1c28
|
增加socket ack 回调msgId
|
2021-08-13 17:34:01 +08:00 |
|
Arrow Em
|
06733b19f2
|
merge
|
2021-08-04 18:42:12 +08:00 |
|
Arrow Em
|
ebd02b6a6d
|
change the environment of demo
|
2021-08-04 18:40:06 +08:00 |
|
董宏宇
|
a9032c8e7b
|
添加服务host
|
2021-07-30 17:51:31 +08:00 |
|
zhongchao
|
08743c73bc
|
changed the code positio
|
2021-07-30 15:36:37 +08:00 |
|
zhongchao
|
7b9c4c6a09
|
fix bug of listener
|
2021-07-30 14:07:51 +08:00 |
|
zhongchao
|
edc42b799e
|
fix bug of order ticket problem
|
2021-07-29 11:24:25 +08:00 |
|
zhongchao
|
59f4d00f46
|
change the socket release func
|
2021-07-29 10:22:48 +08:00 |
|
zhongchao
|
1775c5bdd7
|
add new func in MogoHttpDns
|
2021-07-28 16:08:37 +08:00 |
|
lianglihui
|
b9b8a863cc
|
socket 修改实现
|
2021-07-22 21:23:13 +08:00 |
|
lianglihui
|
435ed713bb
|
socket 增加链接状态监听
|
2021-07-21 17:00:28 +08:00 |
|
zhongchao
|
7a8437ad20
|
add new module of location and update version
|
2021-07-09 09:34:23 +08:00 |
|