|
|
0ea00b2b64
|
Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊
# Conflicts:
# OneToOne/src/main/java/com/shayu/onetoone/manager/RouteManager.java
|
2023-10-17 13:47:29 +08:00 |
|
|
|
6b992eefe4
|
update
|
2023-10-17 13:45:40 +08:00 |
|
hch
|
da6782c7b0
|
处理冲突
|
2023-10-17 11:19:46 +08:00 |
|
hch
|
52d565c4ee
|
Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊
# Conflicts:
# OneToOne/src/main/java/com/shayu/onetoone/manager/RouteManager.java
# OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java
|
2023-10-16 18:21:11 +08:00 |
|
hch
|
9ae47dffc2
|
设置基本资料
|
2023-10-16 18:18:35 +08:00 |
|
|
|
6211756744
|
update 排行榜 筛选 搜索
|
2023-10-14 18:23:08 +08:00 |
|
|
|
0c5533ffb3
|
update 对话框，相册相机
|
2023-10-14 10:55:14 +08:00 |
|
|
|
427d10158b
|
update
|
2023-10-13 18:29:38 +08:00 |
|
|
|
abeb92ab51
|
update
|
2023-10-13 09:57:35 +08:00 |
|
|
|
fb5fc83727
|
Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊
|
2023-10-12 18:12:48 +08:00 |
|
|
|
5ee72410b7
|
update
|
2023-10-12 18:12:34 +08:00 |
|
|
|
0706611df8
|
update 聊天长按气泡
|
2023-10-12 14:40:47 +08:00 |
|
|
|
095574296f
|
update
|
2023-10-11 21:43:26 +08:00 |
|
|
|
1424ff61e1
|
update
|
2023-10-11 18:28:33 +08:00 |
|
|
|
24d93f2604
|
update
|
2023-10-11 16:20:41 +08:00 |
|
|
|
729270c3d0
|
update
|
2023-10-11 16:18:36 +08:00 |
|
|
|
fd377b5280
|
update 送礼
|
2023-10-11 14:08:23 +08:00 |
|
|
|
6d495d11fd
|
update
|
2023-10-11 00:22:16 +08:00 |
|
|
|
da6ca4fbbb
|
update
|
2023-10-10 18:30:44 +08:00 |
|
|
|
676aba70e7
|
update
|
2023-10-10 00:35:38 +08:00 |
|
|
|
2bdc95b3b5
|
Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊
|
2023-10-09 18:31:28 +08:00 |
|
|
|
1950da12e6
|
update
|
2023-10-09 18:31:17 +08:00 |
|
18401019693
|
74ec0a8713
|
修改中英文
|
2023-10-09 17:41:55 +08:00 |
|
18401019693
|
26a4db55ed
|
弹窗创建
|
2023-10-09 16:43:53 +08:00 |
|
|
|
05d4f84844
|
update
|
2023-10-08 22:36:47 +08:00 |
|
|
|
e4cd95951c
|
update
|
2023-10-07 18:29:49 +08:00 |
|
18142669586
|
05f598fd22
|
Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊
|
2023-10-07 15:57:41 +08:00 |
|
18142669586
|
2db7cf9980
|
完善资料
|
2023-10-07 15:57:31 +08:00 |
|
18142669586
|
e4a5e4e814
|
完善资料
|
2023-10-07 15:53:59 +08:00 |
|
|
|
e7ce538d78
|
update
|
2023-10-07 14:59:21 +08:00 |
|
18142669586
|
cd74b7140e
|
个人页面
|
2023-10-07 14:11:12 +08:00 |
|
18142669586
|
e3fc7786a8
|
启动页 登录注册 个人页面
|
2023-10-07 09:55:17 +08:00 |
|
|
|
15d230e084
|
update
|
2023-10-05 18:29:45 +08:00 |
|
|
|
d82f89f11c
|
update
|
2023-10-05 14:12:03 +08:00 |
|
18142669586
|
41b5ab93dc
|
1
|
2023-10-05 12:26:22 +08:00 |
|
|
|
2602725320
|
update
|
2023-09-28 18:28:28 +08:00 |
|
|
|
2976177e92
|
初始化消息界面
|
2023-09-27 16:17:32 +08:00 |
|
|
|
93acf4c8c6
|
初始化1v1语聊项目
|
2023-09-27 14:37:28 +08:00 |
|
|
|
d74d8d7e2f
|
init语聊
|
2023-08-23 10:45:22 +08:00 |
|
18401019693
|
75b176a81e
|
6.5.4礼物冠名
|
2023-08-22 14:10:09 +08:00 |
|
18401019693
|
95252f2f02
|
6.5.4礼物冠名
|
2023-08-22 13:31:32 +08:00 |
|
18401019693
|
3b351ffad8
|
6.5.4礼物冠名
|
2023-08-22 10:13:57 +08:00 |
|
|
|
2332255b37
|
礼物栏等级页面补充中英文标识
|
2023-08-21 17:38:41 +08:00 |
|
18401019693
|
90c2f3e2da
|
6.5.4礼物冠名
|
2023-08-21 17:20:29 +08:00 |
|
18401019693
|
644615ffc0
|
6.5.4礼物冠名
|
2023-08-21 15:28:29 +08:00 |
|
18401019693
|
345c9067aa
|
6.5.4礼物冠名
|
2023-08-19 16:05:30 +08:00 |
|
18401019693
|
c20312b982
|
6.5.4礼物冠名
|
2023-08-18 18:43:47 +08:00 |
|
18401019693
|
643568f63b
|
6.5.4礼物冠名
|
2023-08-18 18:08:15 +08:00 |
|
18401019693
|
f03ba293b5
|
6.5.4礼物冠名
|
2023-08-18 17:43:13 +08:00 |
|
|
|
a2f954b28a
|
Merge remote-tracking branch 'origin/master'
|
2023-08-18 14:48:41 +08:00 |
|
