Commit Graph

494 Commits

Author SHA1 Message Date
18401019693
8d98c6b5cc google支付修改 2022-09-28 13:43:53 +08:00
18401019693
0d473bdd9f 搜索进直播间 2022-09-28 11:45:55 +08:00
51c6ed3456 调整Glide设置高宽的方法
隐藏直播间右侧贵族头条之类的view
取消首页进入密码房输入密码,不然会弹两次密码输入框
密码输入框响应取消按钮
2022-09-27 17:38:12 +08:00
18401019693
79a4c560df 隐藏聊天界面 2022-09-27 16:35:43 +08:00
18142669586
cadbf53086 Merge remote-tracking branch 'origin/master' 2022-09-27 14:53:40 +08:00
18142669586
9e527d6a5d 1 2022-09-27 14:53:31 +08:00
18142669586
2490c6bdd1 1 2022-09-27 14:53:01 +08:00
25252b013b 恢复momo美颜
调整进场svga动画填充类型
2022-09-26 17:59:54 +08:00
683f1d5835 恢复momo美颜
调整进场svga动画填充类型
2022-09-26 17:55:49 +08:00
ec730e850a 恢复momo美颜
调整进场svga动画填充类型
2022-09-26 17:18:07 +08:00
18401019693
20bd0d884c 新增修改字体颜色的js接口 2022-09-26 12:00:04 +08:00
7f423a9ae2 Merge branch 'master' into dev_test 2022-09-22 15:27:41 +08:00
18142669586
f52e10b96f 谷歌敏感权限和新的更新包逻辑 2022-09-22 15:21:15 +08:00
ff7bfc040d Merge branch 'dev_Memory' into dev_test
# Conflicts:
#	app/src/main/java/com/shayu/phonelive/AppContext.java
#	common/src/main/java/com/yunbao/common/glide/ImgLoader.java
#	dependencies.gradle
#	live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java
#	live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
#	main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java
#	main/src/main/java/com/yunbao/main/adapter/MainListAdapter.java
2022-09-22 14:43:57 +08:00
0b0967f84d Merge branch 'dev_FaceUnity'
# Conflicts:
#	live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
#	live/src/main/res/layout/view_live_room.xml
2022-09-22 13:41:13 +08:00
1e98de9931 补充注释及移除部分未用到代码 2022-09-22 13:35:45 +08:00
18401019693
ab2991a999 网页标题兼容,周星榜图片样式裁剪,推荐卡加标签 2022-09-22 13:30:24 +08:00
18401019693
6bc3019b02 指导员背景文字改动 2022-09-22 10:39:34 +08:00
18401019693
f8826d0239 网页标题整改 2022-09-21 16:28:00 +08:00
18401019693
362dff002f 隱身榜單修改 2022-09-21 15:08:56 +08:00
18401019693
a5826b2dc3 新增h5功能全服喇叭修改 2022-09-21 14:55:24 +08:00
18401019693
83aed0bedb 新增h5功能 2022-09-21 14:13:59 +08:00
d1d31da6be 完成美颜UI 90% 2022-09-20 18:29:05 +08:00
18401019693
a555019561 直播间开通贵族结束 2022-09-19 18:20:29 +08:00
18401019693
1935ac14f0 直播间开通贵族结束 2022-09-19 17:07:59 +08:00
18401019693
f531fd4d0e 隐身榜单的更改 2022-09-19 16:22:57 +08:00
18401019693
0de802bf3c 贵族开通的动画横幅 2022-09-19 15:35:37 +08:00
333e4fc1e6 新接入FaceUnity美颜SDK 2022-09-17 16:54:58 +08:00
18401019693
0cafd76035 首页贡献榜添加隐身 2022-09-16 17:27:41 +08:00
18401019693
bebf19215e 首页贡献榜添加隐身 2022-09-16 17:04:45 +08:00
18142669586
5e581dd65e Merge remote-tracking branch 'origin/master' 2022-09-16 14:21:50 +08:00
18142669586
3225cf5d5f 首页皇帝推荐边框 2022-09-16 14:21:21 +08:00
18401019693
1c16a673fd 直播间开通贵族 2022-09-16 11:03:46 +08:00
18401019693
bf9d573727 直播间开通贵族 2022-09-16 11:02:54 +08:00
c6770c1d51 Merge remote-tracking branch 'origin/master' 2022-09-15 16:11:28 +08:00
18142669586
01ea24c66c 修复版本号有一些用户无上报的问题 2022-09-15 16:10:08 +08:00
56d790082a Merge branch 'dev_new_anchor' 2022-09-15 16:06:36 +08:00
18142669586
ada42b1981 修改充值的webview兼容性 2022-09-15 15:52:20 +08:00
7ef6c95c63 改版直播准备间UI
修复心愿单多出一个的BUG
2022-09-15 11:20:20 +08:00
18401019693
5bd0f455bb 待提交 2022-09-14 16:34:26 +08:00
7d72a65f89 替换优化后SVGA库
调整部分图片加载大小:如小图标没必要加载原图,设为32x32即可
更新kotlin和gradle依赖版本
2022-09-13 17:15:33 +08:00
dd39064ca5 update 2022-09-09 15:20:59 +08:00
89ed3f5121 update 2022-09-09 13:36:01 +08:00
18401019693
16bffa1f15 添加用戶刷新機制 2022-09-07 17:40:29 +08:00
18401019693
6c9ac9807f 添加用戶刷新機制 2022-09-07 16:42:53 +08:00
18401019693
5df1b21551 添加用戶刷新機制 2022-09-07 15:12:26 +08:00
18401019693
a4007e555b 測試問題修改 2022-09-07 13:37:59 +08:00
e7ac583f77 fix:去除【我的】红点提醒
fix:私信悬浮头像改为默认熊猫头
2022-09-07 13:35:25 +08:00
e8e1186498 fix:保留首次进入跳转直播间功能,但在弹对话框前判断Activity是否销毁 2022-09-07 13:27:56 +08:00
818e04c687 fix:修复首次进入随机进密码房弹dialog导致闪退问题 2022-09-07 13:09:40 +08:00
18401019693
8b626dedd8 修改消息中心红点 2022-09-07 10:27:55 +08:00
18401019693
2bc5c8aeb6 修改消息中心红点 2022-09-06 18:18:17 +08:00
18401019693
5d7370e5dc 界面修改,指导员可以点击头像进主页 2022-09-06 17:45:59 +08:00
4560c00810 fix:调整开启私聊浮窗时,下方私聊不显示红点
fix:调整新人任务布局间距
fix:修复搜索栏一直搜索会空指针闪退问题
2022-09-06 16:18:22 +08:00
18401019693
9b3483457f 修复遮罩问题 2022-09-06 15:53:42 +08:00
18401019693
cb50c00a06 私聊页面添加直播飞机票 2022-09-06 14:35:46 +08:00
64c37e6ff4 Merge branch 'master' into dev_room_chat
# Conflicts:
#	live/src/main/java/com/yunbao/live/activity/PDLIiveChatActivity.java
#	main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java
2022-09-05 17:54:51 +08:00
02af777192 add:新增悬浮窗开关设置 2022-09-05 17:46:43 +08:00
5bcbe7cd9a add:直播间新增私信悬浮窗
update:会话页面适配半屏模式
2022-09-05 16:49:10 +08:00
18401019693
a969abc2bf 直播间聊天框修改 2022-09-05 16:44:30 +08:00
18401019693
7281296d8e 消息中心遮罩修改 2022-09-05 15:57:43 +08:00
18401019693
7c287e2abf 清除全部未读数(隐藏图标,功能下线) 2022-09-05 15:23:03 +08:00
18401019693
ef9c218f87 清除全部未读数 2022-09-05 14:54:21 +08:00
18401019693
52363a887d 消息中心引导页面,清除全部未读数 2022-09-05 14:34:18 +08:00
18401019693
f1d49653b5 消息中心修改 2022-09-03 16:49:01 +08:00
18142669586
07ce36e549 111 2022-08-31 20:33:23 +08:00
ba92e34b7d update:调整Banner高度
update:调整守护席位置
update:调整观众边距
2022-08-31 14:31:51 +08:00
18142669586
736f448cf8 111 2022-08-30 10:09:50 +08:00
18142669586
49ef55bfee 111 2022-08-26 15:58:31 +08:00
18142669586
036f27a415 111 2022-08-26 13:00:45 +08:00
18401019693
97d7f23daf 网络请求报错提示去除 2022-08-24 11:33:58 +08:00
18401019693
b377d01ca3 修复:礼物,坐骑显示问题 2022-08-24 11:10:27 +08:00
18401019693
af396f9fa4 修复: 2022-08-23 16:25:17 +08:00
18401019693
80b5127832 修复:
首页或者搜索结果页面进入密码直播间要输两次密码
主播名称缩写错误
2022-08-23 14:45:22 +08:00
18142669586
c303ad1f83 111 2022-08-22 18:15:47 +08:00
18401019693
18d62e5d56 直播间的滚动 2022-08-20 15:33:41 +08:00
18142669586
3ae14ed506 111 2022-08-20 14:48:09 +08:00
18401019693
b5aa768f5b 界面修改 2022-08-19 10:04:50 +08:00
18142669586
2c248681ca 111 2022-08-17 13:34:29 +08:00
18401019693
121e07f915 直播间修改 2022-08-17 09:51:38 +08:00
18401019693
f8f1f4e647 直播间修改 2022-08-17 09:29:24 +08:00
18401019693
a453a526fa 防抖,主播私聊修复 2022-08-15 09:19:11 +08:00
18401019693
892aaab6c0 防抖,主播私聊修复 2022-08-12 15:58:09 +08:00
18401019693
0c4448f1f2 防抖 2022-08-12 13:26:21 +08:00
18142669586
8fb0f7a4e6 111 2022-08-12 11:25:22 +08:00
18401019693
f03a1a4eb1 首页推荐小点 2022-08-12 10:31:08 +08:00
18401019693
ac3f1cf846 Merge remote-tracking branch 'origin/master' 2022-08-11 18:06:12 +08:00
18401019693
ee410650f7 首页推荐优化 2022-08-11 18:06:01 +08:00
18142669586
c4e2e96185 111 2022-08-11 17:51:13 +08:00
18401019693
01d0def52d 修改测试问题,shouye ytuijian 2022-08-11 00:01:04 +08:00
18401019693
b1b5be9976 修改测试问题,shouye ytuijian 2022-08-10 23:49:46 +08:00
18401019693
743f06115d 修改测试问题,shouye ytuijian 2022-08-10 23:45:34 +08:00
18401019693
2279823780 修改测试问题,shouye ytuijian 2022-08-10 23:32:11 +08:00
18401019693
94b795213a 修改测试问题,shouye ytuijian 2022-08-10 22:51:40 +08:00
18401019693
425030cd47 修改测试问题,shouye ytuijian 2022-08-10 22:36:09 +08:00
18401019693
270bf2786e 修改测试问题,shouye ytuijian 2022-08-10 21:42:09 +08:00
18401019693
94343c17c6 修改测试问题,shouye ytuijian 2022-08-10 21:34:59 +08:00
18401019693
2016d43cb1 修改测试问题,shouye ytuijian 2022-08-10 20:51:33 +08:00
18401019693
89e725a73f 修改测试问题,shouye ytuijian 2022-08-10 19:36:15 +08:00
18401019693
2424fd1e06 修改测试问题,shouye ytuijian 2022-08-10 19:04:43 +08:00
18401019693
59678be822 修改测试问题,shouye ytuijian 2022-08-10 18:31:14 +08:00
18401019693
8330d7f808 修改测试问题,shouye ytuijian 2022-08-10 18:05:52 +08:00
18401019693
0643209e8e 修改测试问题,shouye ytuijian 2022-08-10 18:00:32 +08:00
18401019693
6f8768025c 修改测试问题,shouye ytuijian 2022-08-10 17:28:48 +08:00
18401019693
0a36dc99f3 修改测试问题,shouye ytuijian 2022-08-10 16:44:30 +08:00
18401019693
5b47d0b930 修改测试问题,shouye ytuijian 2022-08-10 16:21:38 +08:00
18401019693
7bb3f2d5f7 修改测试问题,shouye ytuijian 2022-08-10 15:29:41 +08:00
18401019693
8c6b04685a 修改测试问题,shouye ytuijian 2022-08-10 15:15:18 +08:00
18401019693
6c18b2f806 修改测试问题,shouye ytuijian 2022-08-10 15:09:47 +08:00
18401019693
9e5e998f70 修改测试问题,shouye ytuijian 2022-08-10 14:48:51 +08:00
18401019693
3efd35f897 修改测试问题,shouye ytuijian 2022-08-10 14:45:07 +08:00
18142669586
6b4bbcf93e 111 2022-08-10 14:29:34 +08:00
18142669586
dfe1cb4500 111 2022-08-10 14:25:56 +08:00
18401019693
28cd3e5798 修改测试问题,shouye ytuijian 2022-08-10 14:10:49 +08:00
18401019693
e96d0e7bf4 修改测试问题,shouye ytuijian 2022-08-10 13:40:58 +08:00
18401019693
2b5d3b51f4 修改测试问题,shouye ytuijian 2022-08-10 13:07:35 +08:00
18401019693
28a1169a89 修改测试问题,shouye ytuijian 2022-08-10 09:34:56 +08:00
18401019693
192e12fe19 修改测试问题,shouye ytuijian 2022-08-10 09:14:40 +08:00
18401019693
220ecebc4c 修改测试问题,shouye ytuijian 2022-08-10 08:56:51 +08:00
18401019693
aa3be0a4e9 修改测试问题,shouye ytuijian 2022-08-09 19:56:22 +08:00
18401019693
cec82501db 修改测试问题 2022-08-09 17:56:24 +08:00
18401019693
c3a4b57e18 修改测试问题 2022-08-09 17:44:44 +08:00
18401019693
a3e647d74b Merge remote-tracking branch 'origin/master' 2022-08-09 17:25:28 +08:00
18401019693
971feb9f18 修改测试问题 2022-08-09 17:25:15 +08:00
18142669586
74b3ec08d9 111 2022-08-09 17:18:31 +08:00
18401019693
2db6115534 直播关闭 2022-08-09 16:54:30 +08:00
18401019693
6ce970df07 完善搜索功能模块 2022-08-08 13:08:15 +08:00
18401019693
ea333b24a4 Merge remote-tracking branch 'origin/master' 2022-08-08 10:39:07 +08:00
18401019693
b05ab47822 删除历史记录,搜索优化完成 2022-08-08 10:38:47 +08:00
18142669586
0d38cd7c67 111 2022-08-08 10:37:23 +08:00
18401019693
04b720311c 猜你喜欢跳转 2022-08-08 10:33:57 +08:00
18401019693
76a0d9ec8c 历史检索记录完善 2022-08-08 10:26:45 +08:00
18401019693
90bc939a61 界面优化,数据整理 2022-08-08 09:51:47 +08:00
18401019693
43133e503d 关注主播 2022-08-06 18:18:48 +08:00
18401019693
ae9f15d963 界面优化,数据整理 2022-08-06 17:08:41 +08:00
18401019693
19dfe093af 滚动问题修复 2022-08-06 16:43:58 +08:00
18401019693
c15a420307 全部检索界面优化 2022-08-06 15:46:11 +08:00
18401019693
fadf7c5655 猜你喜欢功能完成 2022-08-06 14:58:25 +08:00
18401019693
b0a1014cf3 11111 2022-08-05 18:16:48 +08:00
18142669586
254f3af3c7 111 2022-08-04 13:30:22 +08:00
18401019693
805ca91637 喇叭,个人中心贵族添加中心 2022-08-03 18:24:52 +08:00
18401019693
84c8ecde30 新贵族喇叭 2022-08-01 17:28:21 +08:00
18401019693
5a5528594d 11111 2022-08-01 11:33:15 +08:00
18401019693
00de2169b9 11111 2022-07-29 16:04:12 +08:00
18142669586
41f07f2e3d 111 2022-07-29 15:58:18 +08:00
18401019693
0cb1ed9b71 11111 2022-07-28 11:22:16 +08:00
18142669586
1fc6a3adfe 111 2022-07-27 20:44:55 +08:00
18401019693
8b9d10ca92 11111 2022-07-27 18:48:22 +08:00
18142669586
28efafcd44 111 2022-07-27 17:53:23 +08:00
18142669586
966e8bbddb 111 2022-07-27 17:08:00 +08:00
18401019693
754b8639ae 11111 2022-07-27 16:47:12 +08:00
18401019693
28464d56a1 11111 2022-07-27 16:28:59 +08:00
18401019693
cc438af7ca 11111 2022-07-27 16:13:07 +08:00
18142669586
aac51d423c 111 2022-07-27 15:14:19 +08:00
18401019693
5c42767ea3 11111 2022-07-27 13:48:58 +08:00
18401019693
838ae0815b 11111 2022-07-27 13:18:32 +08:00
18142669586
133e45bc63 111 2022-07-27 11:21:34 +08:00
18401019693
d4cc6f747b 11111 2022-07-27 11:12:02 +08:00
18401019693
9f30e724e9 11111 2022-07-27 10:52:14 +08:00
18401019693
8216efaba6 11111 2022-07-27 10:12:41 +08:00
18401019693
69977483d2 11111 2022-07-27 09:37:17 +08:00
18401019693
4ea1758595 11111 2022-07-27 09:29:23 +08:00
18401019693
18cf3c9ba3 11111 2022-07-26 18:52:42 +08:00
18401019693
f00fcac663 11111 2022-07-26 18:28:47 +08:00
18142669586
a4153da415 111 2022-07-26 17:45:20 +08:00
18401019693
021429a60d 11111 2022-07-26 17:40:57 +08:00
18401019693
202c265e71 11111 2022-07-26 16:21:00 +08:00
18401019693
d3c37e4ec4 11111 2022-07-26 14:47:38 +08:00
18401019693
1b53016056 11111 2022-07-26 13:14:43 +08:00
18401019693
69ad6efb65 11111 2022-07-26 10:43:27 +08:00
18142669586
8a9083f9b5 Merge remote-tracking branch 'origin/master' 2022-07-26 10:01:46 +08:00
18142669586
01373a64af 111 2022-07-26 10:01:19 +08:00
18401019693
b6c80f095d 11111 2022-07-25 17:56:21 +08:00
18142669586
708257a289 111 2022-07-25 16:06:39 +08:00
18401019693
97660b2b04 11111 2022-07-25 16:04:16 +08:00
18401019693
b264001a44 11111 2022-07-25 15:54:47 +08:00
18401019693
1007e2ab20 11111 2022-07-25 14:06:35 +08:00
18401019693
47030425cd 11111 2022-07-23 18:14:42 +08:00
18401019693
cc35227b56 11111 2022-07-23 16:31:33 +08:00
18401019693
18aabb85a7 11111 2022-07-23 10:05:15 +08:00
18142669586
1219b77e2d 111 2022-07-23 09:46:55 +08:00
18401019693
a97dcbbb5b 11111 2022-07-22 18:51:07 +08:00
18142669586
701f1c6dc1 111 2022-07-22 17:49:50 +08:00
18401019693
cbf43a3aa3 11111 2022-07-22 16:27:19 +08:00
18401019693
0cd6ab5e9d 11111 2022-07-21 18:35:06 +08:00
18401019693
01bdab01f6 11111 2022-07-21 15:05:35 +08:00
18142669586
821bd863c8 111 2022-07-21 11:33:08 +08:00
18401019693
e1dbc9d38c 11111 2022-07-21 11:24:15 +08:00
18142669586
42138777e3 1 2022-07-20 18:03:51 +08:00
18142669586
31cf3c4e71 1 2022-07-20 16:57:42 +08:00
18142669586
d150d8d599 1 2022-07-20 15:18:42 +08:00
18142669586
c7e03f576c 1 2022-07-20 14:40:44 +08:00
18142669586
4490fb158d 1 2022-07-20 14:22:26 +08:00
18401019693
1791a114e3 androidx版本首次提交 2022-07-18 15:31:45 +08:00