Commit Graph

141 Commits

Author SHA1 Message Date
72a18a0500 fix [热门-分享-站内好友-列表缺好友的头像] 2024-03-28 10:28:26 +08:00
hch
6b616a4ff8 fix [关注按钮修复,直播状态跳转直播间,首页精彩直播位置展示问题,社区图片5张图片展示问题] 2024-03-27 16:58:01 +08:00
79c691f5b2 Merge remote-tracking branch 'origin/dev_改版主分支-升级融云SDK&AGP8' into dev_改版主分支-升级融云SDK&AGP8 2024-03-27 16:13:49 +08:00
2c41e9418d fix [打招呼的弹窗出现时,只会闪一下就自动消失] 2024-03-27 16:09:33 +08:00
4451403f46 fix [消息页面按钮与ui不一致] 2024-03-27 14:10:54 +08:00
hch
b0a9ebe0f3 add [个人主页-页面跳转] 2024-03-27 13:08:16 +08:00
b3aed71dd6 Merge remote-tracking branch 'origin/dev_改版主分支-升级融云SDK&AGP8' into dev_改版主分支-升级融云SDK&AGP8 2024-03-27 10:32:12 +08:00
hch
d2f4bb3d4f fix [修改-自己的动态-不能拉黑,不感兴趣] 2024-03-27 10:17:53 +08:00
863aef9a20 Merge remote-tracking branch 'origin/dev_改版主分支-升级融云SDK&AGP8' into dev_改版主分支-升级融云SDK&AGP8 2024-03-27 10:11:21 +08:00
hch
9bb4ed1393 add [新增-个人主页-动态删除] 2024-03-26 18:20:48 +08:00
hch
e352e5692c Merge remote-tracking branch 'origin/dev_改版主分支-升级融云SDK&AGP8' into dev_改版主分支-升级融云SDK&AGP8 2024-03-26 17:51:47 +08:00
hch
c7a4c9f501 add [新增-个人主页-点击图片展示] 2024-03-26 17:51:23 +08:00
f2d7617ebe fix [修复直播数量不足且战令关闭情况下,显示角标Banner白屏问题]
update [替换战令角标]
add [从首页Banner进入战令入口]
add [从弹窗进入战令入口]
2024-03-26 17:47:19 +08:00
210d3a5184 Merge remote-tracking branch 'origin/dev_改版主分支-升级融云SDK&AGP8' into dev_改版主分支-升级融云SDK&AGP8 2024-03-26 17:39:10 +08:00
698b875a93 fix [打招呼弹窗被隐藏问题] 2024-03-26 16:52:31 +08:00
hch
e386fbfdbb fix [修复动态发布,时间选择问题] 2024-03-26 16:48:37 +08:00
7c669b338f fix [获取指导员备注信息 为空时的闪退问题] 2024-03-26 16:31:15 +08:00
7e6a296722 update 混淆配置 2024-03-26 16:30:48 +08:00
hch
80fd2a1bbc 三星SDK升级 2024-03-26 16:20:24 +08:00
9d528524be update 三星包 2024-03-26 15:25:23 +08:00
218b223320 Merge branch 'dev_改版主分支' into dev_改版主分支-升级融云SDK&AGP8 2024-03-26 13:46:38 +08:00
8c0398190e Merge remote-tracking branch 'origin/dev_改版主分支' into dev_改版主分支 2024-03-26 13:46:18 +08:00
460dfa87b3 升级融云sdk版本和APG版本 2024-03-26 13:43:13 +08:00
hch
b90d86d90f 修复bug 2024-03-26 10:43:02 +08:00
4337f0bdd6 升级融云sdk版本暂存 2024-03-26 10:35:53 +08:00
33b1f6101f Merge remote-tracking branch 'origin/dev_改版主分支' into dev_改版主分支 2024-03-26 09:37:13 +08:00
hch
0324b638fa 修复bug 2024-03-26 09:36:41 +08:00
f8c5b072af fix [分享直播和动态改成叫【站内分享】] 2024-03-25 18:05:59 +08:00
84520a4f2f fix [消息列表时间格式v2] 2024-03-25 16:50:38 +08:00
9a7054ce76 fix [一直存在草稿的问题]
fix [聊天通知改为可点击]
2024-03-25 16:38:47 +08:00
57333cdae8 update 气泡.9图格式 2024-03-25 13:51:25 +08:00
e50b00152d fix [消息列表时间格式] 2024-03-25 13:51:10 +08:00
253fe38067 Merge remote-tracking branch 'origin/dev_改版主分支' into dev_改版主分支 2024-03-25 13:07:34 +08:00
hch
28f00f1c8a 修复bug 2024-03-25 13:07:15 +08:00
511a354155 fix [消息设置-图片-选择图片-点击裁剪左边的×,回到消息设置页面后卡住] 2024-03-25 10:09:44 +08:00
dd582c10c7 update 補充翻譯 2024-03-23 17:50:11 +08:00
bd6ddf7153 fix [更新氣泡] 2024-03-23 17:49:59 +08:00
c20708d633 fix [私聊消息-直播中无正在直播标识] 2024-03-23 16:49:47 +08:00
77530340d0 fix [英文版年龄显示不正常] 2024-03-23 15:09:40 +08:00
578de1f101 fix [分享飞机票底部提示需去除] 2024-03-23 15:09:40 +08:00
434486387d fix [聊天界面-未关注的用户无关注按钮] 2024-03-23 15:09:40 +08:00
hch
9427fb8aaa 修復圖片刪除不了 2024-03-22 17:55:50 +08:00
hch
4d4d3d1bae 文字1 2024-03-22 17:47:12 +08:00
2cc58b920f update 調整定時器參數 2024-03-22 17:31:27 +08:00
3b4ffe8c51 update 補充翻譯 2024-03-22 16:53:36 +08:00
cd3a86c6b7 update 调整聊天页面UI
update 调整直播中英文
2024-03-22 15:27:35 +08:00
bd598176c1 update 调整隐藏性别
update 调整完善资料报错提醒
2024-03-22 14:08:44 +08:00
hch
5ebb97cd3c Merge remote-tracking branch 'origin/dev_改版主分支' into dev_改版主分支 2024-03-22 10:14:07 +08:00
hch
e9a3e8aa2f 文字11 2024-03-22 10:13:53 +08:00
61dcf0916d update 补充状态 2024-03-22 10:12:28 +08:00
7167ad8e97 update 補充翻譯 2024-03-22 09:53:39 +08:00
9992dec28e Merge remote-tracking branch 'origin/dev_改版主分支' into dev_改版主分支 2024-03-22 09:47:07 +08:00
04980cbb2f update 補充翻譯 2024-03-22 09:46:41 +08:00
hch
f2b2c39168 文字 2024-03-22 09:28:11 +08:00
d39facbcc7 update 修正聊天页在线离线状态
update 聊天页长按删除功能
2024-03-21 18:02:47 +08:00
hch
c3ca76df07 文字 2024-03-21 17:33:49 +08:00
34dae7d981 update 调整文案 2024-03-21 17:00:40 +08:00
ce568c6d87 Merge remote-tracking branch 'origin/dev_改版主分支' into dev_改版主分支 2024-03-21 16:39:49 +08:00
c7ba98acb4 add 屏蔽push列表
update 修改搜索文案
2024-03-21 16:17:17 +08:00
hch
f8cb1d0a4b 修复举报点不动 2024-03-21 16:14:05 +08:00
hch
94d05a3929 修复跳转 2024-03-21 16:02:31 +08:00
a5acbb0146 update 屏蔽看视频页面打招呼弹框 2024-03-21 15:11:48 +08:00
457e47e885 update 年齡標籤+歲 2024-03-21 15:09:11 +08:00
ab6d871b38 update 动态&视频分享功能 2024-03-21 14:48:10 +08:00
hch
434474bd98 迁移 2024-03-20 17:37:47 +08:00
bfa4a52dd4 Merge branch 'dev_聊天' into dev_改版主分支
# Conflicts:
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
2024-03-20 16:21:24 +08:00
hch
307ded37fc Merge branch 'pandorapan_社区相关' into dev_改版主分支 2024-03-20 16:17:32 +08:00
d17f89b5c1 update 完善资料 2024-03-20 16:11:38 +08:00
hch
04d3faa0cb 6- 2024-03-20 16:11:35 +08:00
938bee4fdb add 编辑资料-职业、身高、爱好 2024-03-20 11:03:29 +08:00
d130c1565c add 名片在列表上的表现 2024-03-18 10:57:42 +08:00
b3b46ccff3 add 分享
add 聊天页面右上角菜单
2024-03-16 17:50:16 +08:00
9c54cfca2a fix 修复空聊天信息从通讯录返回时闪退问题 2024-03-16 10:54:05 +08:00
hch
c30f18eaa9 5 2024-03-15 17:42:00 +08:00
hch
4de3dce2fd 4 2024-03-15 17:40:25 +08:00
hch
cdf5df119d 3 2024-03-15 17:39:19 +08:00
hch
ba7e59a946 Merge branch 'pandorapan_社区相关' into dev_改版主分支
# Conflicts:
#	common/build.gradle
#	common/src/main/java/com/yunbao/common/bean/MessageUserInfoBean.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/RouteUtil.java
#	common/src/main/res/values/strings.xml
#	main/src/main/java/com/yunbao/main/activity/MainActivity.java
2024-03-15 17:27:31 +08:00
hch
2a8f6d99a5 2 2024-03-15 17:21:14 +08:00
hch
e680ab7d87 个人主页数据对接 2024-03-15 16:33:43 +08:00
687d6e9bc0 add 分享
add 推送(搜索还没做、卡片还没做)
add 打招呼
2024-03-15 16:06:18 +08:00
hch
63669dbfa4 用户主页ui 2024-03-13 18:30:36 +08:00
z583819556
6c6f56f5a1 add 新增消息设置
add 新增消息-语音设置
add 新增接单设置
2024-03-13 16:11:53 +08:00
hch
aa1db981e8 视频播放UI
动态页面UI
2024-03-12 18:30:02 +08:00
z583819556
ee8f6baf02 update 聊天页面顶部信息 2024-03-09 16:23:57 +08:00
z583819556
f4210bf136 update用户信息 2024-03-09 13:41:32 +08:00
z583819556
0982b9554c update通讯录搜索 2024-03-09 13:37:59 +08:00
z583819556
5a866e5fc5 UPDATE聊天页面改版UI 2024-03-08 16:25:49 +08:00
hch
409e38e304 社区主要UI 2024-03-08 14:34:05 +08:00
z583819556
a22e600b52 新增消息-通讯录界面 2024-03-07 16:01:12 +08:00
z583819556
2c554dadef 改版消息主页面 2024-03-06 13:46:55 +08:00
18142669586
a02f7b2e22 1 2024-02-23 16:07:50 +08:00