141 Commits

Author SHA1 Message Date
xyz
ec17b6d633 「Fix 」
1、删除自定义DNS。对网络请求TryCatch
2025-01-03 17:13:46 +08:00
zhongchao
b0446402be [master]expand the interface of socket, add sn 2023-05-17 19:38:18 +08:00
donghongyu
2ad446c7b1 [Change]
1、升级ZeGo直播SDK
2、修复直播拉流播放状态,

    /**
     * 连接失败,播放失败,都走这里,可以展示播失败信息
     *
     * @param errorMsg
     */
    void onError(String errorMsg);

    /**
     * 拉流成功且处于播放中
     */
    void onPlaying();

    /**
     * 拉流重试中,还没成功,可以做Loading
     */
    void onPlaRequesting();
2023-04-12 21:05:14 +08:00
donghongyu
c78d9f0f59 [Change]
发布新版本1.4.5.10
替换Logger为原生Log,防止过度调用Logger 同步synchronized获取堆栈信息导致卡顿
2023-03-14 19:38:15 +08:00
zhongchao
5d5e2153d8 t:wq
:wq
remove httpdns logic
2023-03-01 16:27:45 +08:00
xuxinchao
2a6a914c4a [master将DNS拦截器去除改为请求头方式请求eagle-dns接口,由服务端进行分发请求 2023-01-19 16:12:58 +08:00
donghongyu
46fac508f5 [Change]
升级zego直播sdk
2022-07-28 16:25:43 +08:00
donghongyu
ffe91524b1 [Change]
升级ZeGo版本
2022-05-18 17:04:36 +08:00
zhongchao
01b07677a4 merge 2022-03-24 20:15:26 +08:00
zhongchao
6372535878 merge 2022-03-01 15:31:08 +08:00
donghongyu
72b9e34461 [Fix] 处理日志调用 2021-12-29 11:48:50 +08:00
donghongyu
d9c424f787 Merge branch 'fix_loginMultiRoom_bug'
# Conflicts:
#	gradle.properties
2021-12-29 11:40:57 +08:00
donghongyu
e4808667d5 [Fix] 处理
1003070 	描述:推流函数调用失败。
可能原因:多房间模式下,调用的推流函数有误。
处理建议:调用带有参数 [ZegoPublisherConfig] 的推流函数。
2021-12-28 14:12:52 +08:00
donghongyu
3ed9a071bc [Fix] 增加了被踢掉出房间后重新进入防止web给踢掉之后无法使用的问题 2021-12-28 11:44:57 +08:00
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
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
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
donghongyu
26fd50e726 [Fix]修复日志输出 2021-11-19 20:54:29 +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
董宏宇
a454f3649e 统一升级Android依赖包,AndroidX 2021-09-06 15:28:35 +08:00
Arrow Em
ebd02b6a6d change the environment of demo 2021-08-04 18:40:06 +08:00
zhongchao
8e98f5bc61 upgrade version of protobuf 2021-05-26 11:23:04 +08:00
zhongchao
d157c6c95b downgrade the protoBuf version 2021-05-25 21:51:01 +08:00
zhongchao
43a463504d change the logic of socket service and stop the uploadService,but tanlu version can not upgrade 2021-05-20 17:47:22 +08:00
zhongchao
15e974cf13 fix bug 2021-04-28 19:33:10 +08:00
zhongchao
051f7745dc fix bug of data 2021-04-28 17:47:06 +08:00
zhongchao
e995b2f9d0 fixbug 2021-04-28 17:31:02 +08:00
zhongchao
4ecd920624 fix bug of road data 2021-04-28 16:52:22 +08:00