donghongyu
|
c01d52bacc
|
[Add]解决冲突
|
2021-12-17 19:48:02 +08:00 |
|
donghongyu
|
3b89b3f0e2
|
Merge branch 'fix_loginMultiRoom_bug'
# Conflicts:
# app/src/main/java/com/mogo/cloud/LivePlayActivity.java
# app/src/main/java/com/mogo/cloud/MoGoApplication.java
# app/src/main/res/layout/activity_live_play.xml
# foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java
# gradle.properties
|
2021-11-30 16:51:48 +08:00 |
|
donghongyu
|
d033ade272
|
[Add]增加是否Toast 提示错误信息
|
2021-11-30 16:48:31 +08:00 |
|
donghongyu
|
e5293b24b7
|
[Add]升级ZeGo-SDK版本2.14.0.5551_stable_video
增加了多路直播同时观看功能
|
2021-11-29 17:03:47 +08:00 |
|
donghongyu
|
39890fd684
|
Merge branch 'fix_loginMultiRoom_bug'
# Conflicts:
# .idea/misc.xml
# gradle.properties
|
2021-11-26 17:50:22 +08:00 |
|
donghongyu
|
9e974eeea9
|
[Fix]修复触发直播的触发，采用房间更新的接口，更加即时。
|
2021-11-26 17:49:57 +08:00 |
|
donghongyu
|
ae3ff62b12
|
[Fix]发布v1.3.13修复两分钟后自动开始推流的bug
|
2021-11-26 15:30:32 +08:00 |
|
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
|
abb4c0f3fc
|
[Add]发布1.3.10
|
2021-11-26 11:49:02 +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
|
94f944b0a4
|
[Upload修改查看车机SN
|
2021-11-24 17:47:32 +08:00 |
|
donghongyu
|
b2da61cabe
|
[Upload修改查看车机SN颜色
|
2021-11-24 17:38:07 +08:00 |
|
donghongyu
|
118696dcaf
|
[Upload修改查看车机SN
|
2021-11-24 17:37:32 +08:00 |
|
donghongyu
|
2cc71fb0eb
|
[Upload]上传maven 1.1.58-live
|
2021-11-24 16:56:11 +08:00 |
|
donghongyu
|
e3dfbc8a7b
|
[Change]修改推流流程，原因是衡阳环境中Socket下发指令有问题，现在改成了借用ZeGo的房间人数流程大于1人开始直播，否则关闭直播
|
2021-11-24 16:39:40 +08:00 |
|
donghongyu
|
7e63716b9e
|
[Change]修改请求httpdns的经纬度请求衡阳
|
2021-11-23 18:08:42 +08:00 |
|
donghongyu
|
c9186b9148
|
[Change]修改请求httpdns的经纬度请求衡阳
|
2021-11-23 18:05:43 +08:00 |
|
donghongyu
|
ed49db4b32
|
[Change]解除对core中utils的依赖，直接使用已有依赖库中的日志和json解析工具，防止出现插件检查时候出现的重复依赖问题
|
2021-11-22 11:45:43 +08:00 |
|
zhongchao
|
db19f15ab6
|
update version to 1.3.7
|
2021-11-21 10:06:18 +08:00 |
|
zhongchao
|
1bf3f5aea4
|
to adjust socket server require ip
|
2021-11-21 10:03:46 +08:00 |
|
donghongyu
|
6cf6a0c9f1
|
[Update]升级MOGO_CORE_UTILS_VERSION=0.0.26
|
2021-11-19 23:21:45 +08:00 |
|
donghongyu
|
1646e44abd
|
[Upload]发布版本1.3.6
|
2021-11-19 21:41:14 +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 |
|
donghongyu
|
493da4d118
|
Merge remote-tracking branch 'origin/master'
|
2021-11-19 21:29:02 +08:00 |
|
donghongyu
|
380c248ff4
|
[Fix]修复安卓10之后Cleartext HTTP traffic to dzt.zhidaozhixing.com not permitted问题
|
2021-11-19 21:28:54 +08:00 |
|
zhongchao
|
9e7ca17d17
|
update version
|
2021-11-19 21:26:19 +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
|
7e2c3cb921
|
update targetSdkVersion to 29
|
2021-11-17 18:49:34 +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
|
6989608c3d
|
update version
|
2021-11-16 20:09:28 +08:00 |
|
zhongchao
|
e148de5450
|
androidx fit
|
2021-11-16 20:07:24 +08:00 |
|
zhongchao
|
21628a75a1
|
update version
|
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 |
|
zhongchao
|
93182e0d2e
|
remove unuse impl
|
2021-11-16 20:06:23 +08:00 |
|
donghongyu
|
7ef199b208
|
[Fix]上传新版本解决播放回掉
|
2021-11-16 20:04:51 +08:00 |
|