Commit Graph

36 Commits

Author SHA1 Message Date
Martin
152848a04f Merge branch 'master' into dev_680_礼物展馆
# Conflicts:
#	common/src/main/res/values-zh-rHK/strings.xml
#	common/src/main/res/values-zh-rTW/strings.xml
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
#	gradle.properties
#	live/build.gradle
2024-07-17 09:53:22 +08:00
18142669586
4618c0a4f1 升级34 grd8.0 2024-07-13 10:37:37 +08:00
845b217c4d 新增礼物墙相关内容 2024-07-13 09:28:02 +08:00
e0669e98cf 新增上报日志功能 2024-06-29 10:11:42 +08:00
Martin
cbf517bed6 Merge branch 'master' into 声网升级
# Conflicts:
#	common/src/main/java/com/yunbao/common/event/SendBlindGiftEvent.java
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
#	common/src/main/java/com/yunbao/common/utils/DialogUitl.java
#	common/src/main/java/com/yunbao/common/utils/RouteUtil.java
#	live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java
#	live/src/main/java/com/yunbao/live/socket/SocketRyLinkMicPkUtil.java
#	main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java
2024-05-22 13:37:33 +08:00
e24805cf9b 移除友盟SDK 2024-05-08 11:34:56 +08:00
Martin
583740e866 add[声望升级-接入美颜] 2024-04-18 09:47:38 +08:00
20a6bae5ff 更新美颜中英文繁体 2023-08-24 13:34:08 +08:00
3f9e95ce7d 新增插件模块管理 2023-06-14 13:41:12 +08:00
7639a70887 update 机器人 2022-12-22 09:58:43 +08:00
e35eb5ac7f 修复一处回报的闪退异常 2022-11-26 10:57:31 +08:00
72ca2b7b04 修复美颜滤镜的bar显示导致对话框抖动问题 2022-11-23 16:49:01 +08:00
88e27df986 调整融云推流参数 2022-11-09 09:44:18 +08:00
18401019693
1075f7252a 修改主题颜色 2022-11-03 14:45:51 +08:00
a4c56c7e28 替换美颜key 2022-10-28 17:26:49 +08:00
003f6622b9 修复切换滤镜-其他-滤镜时,不会恢复拖动条的问题 2022-10-25 15:09:27 +08:00
b4e048bf74 根据需求修改美颜UI 2022-10-25 11:24:42 +08:00
3dd9f3f551 新增启动直播准备间时就加载上次美颜参数 2022-10-20 17:58:10 +08:00
ca03a8f23e 排除美颜so
压缩图片资源
2022-10-20 10:49:08 +08:00
97fc07db0c 调整选择了风格推荐的话,则不允许使用其他功能
替换风格推荐icon
2022-10-19 17:28:15 +08:00
00dfd38be5 重新启用美颜sdk
调整美颜sdk只使用美颜功能
2022-10-19 16:19:50 +08:00
ec730e850a 恢复momo美颜
调整进场svga动画填充类型
2022-09-26 17:18:07 +08:00
2fdc4001f4 美颜UI调整 2022-09-23 13:19:07 +08:00
04f0953cfa 美颜补充对比键功能 2022-09-23 10:43:34 +08:00
a9302d3e54 移除FaceUnity的日志输出 2022-09-22 15:25:48 +08:00
c0d0fed83a 解决冲突 2022-09-22 13:50:46 +08:00
1e98de9931 补充注释及移除部分未用到代码 2022-09-22 13:35:45 +08:00
d2bb4e4375 update 2022-09-22 13:02:53 +08:00
80c5609bb7 update 2022-09-22 00:02:45 +08:00
e29ecd2845 update 2022-09-21 18:31:07 +08:00
bdaa51dbb6 update ui 2022-09-20 22:21:38 +08:00
02206dc289 完成美颜UI 90% 2022-09-20 18:30:17 +08:00
d1d31da6be 完成美颜UI 90% 2022-09-20 18:29:05 +08:00
c634d29e79 补充美颜模型和美颜配置 2022-09-19 15:43:06 +08:00
8ef917ebb6 补充美颜模型和美颜配置 2022-09-17 18:21:53 +08:00
333e4fc1e6 新接入FaceUnity美颜SDK 2022-09-17 16:54:58 +08:00