1925 Commits

Author SHA1 Message Date
9aa8b22d99 修复测试反馈问题 2023-10-30 18:25:16 +08:00
hch
f36c4706e4 修复BUG 2023-10-30 13:15:58 +08:00
79e772ce4b Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊 2023-10-28 18:29:39 +08:00
f5849a3ca2 修复测试反馈问题 2023-10-28 18:29:30 +08:00
hch
cdc0211999 修复BUG 2023-10-28 18:26:39 +08:00
0d52db8edb 修复测试反馈问题 2023-10-28 18:13:23 +08:00
479a7b8d33 Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊 2023-10-28 09:49:06 +08:00
hch
eddf3a8fe2 修复关注数量刷新问题 2023-10-28 09:44:45 +08:00
f7b6f75865 Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊
# Conflicts:
#	OneToOne/src/main/res/values/strings.xml
2023-10-28 09:26:25 +08:00
ba456a007b Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊
# Conflicts:
#	OneToOne/src/main/res/values/strings.xml
2023-10-27 18:31:03 +08:00
a8462b385a 修复测试反馈问题 2023-10-27 18:30:29 +08:00
18401019693
4a09f629f3 一對一bug修復 2023-10-27 18:30:02 +08:00
hch
6c224d66ed 修復bug 2023-10-27 18:28:18 +08:00
e00df4d8e5 修复测试反馈问题 2023-10-27 18:05:06 +08:00
76afa04643 修复测试反馈问题 2023-10-27 18:00:19 +08:00
9d0f8cb060 修复测试反馈问题 2023-10-27 17:53:28 +08:00
hch
4bd1e8eccc 修复注册设置资料性别问题 2023-10-26 18:08:39 +08:00
430c24db05 修复测试反馈问题 2023-10-26 18:06:46 +08:00
aa6c06927b update 2023-10-25 22:37:10 +08:00
56dff48462 update 2023-10-25 18:31:09 +08:00
71147b655d Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊
# Conflicts:
#	OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java
#	OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java
2023-10-25 18:30:37 +08:00
hch
292dcaa9e4 我的页面,菜单全部改为webView跳转 2023-10-25 18:25:36 +08:00
hch
d0ae3c49d4 我的页面,菜单全部改为webView跳转 2023-10-25 17:43:56 +08:00
d34e30c291 update 2023-10-25 14:07:27 +08:00
06a2621e0f Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊 2023-10-24 18:28:15 +08:00
2e14f6979d update 2023-10-24 18:28:06 +08:00
hch
3735616af5 优化 2023-10-24 18:26:06 +08:00
2d456c0afd update 2023-10-24 17:37:03 +08:00
06f0e59c70 update 2023-10-24 17:20:38 +08:00
18401019693
07f7a28d0a 打包配置修改 2023-10-24 17:04:16 +08:00
ea44969bd7 Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊
# Conflicts:
#	OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java
#	OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java
2023-10-24 09:17:32 +08:00
307ec30807 update 2023-10-23 18:30:40 +08:00
hch
3189b39b97 檢查版本更新,版本號,清除緩存 2023-10-23 17:59:37 +08:00
18401019693
64fb7de187 设置页面消息通知 2023-10-23 17:51:08 +08:00
hch
617086cf40 Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊 2023-10-23 15:57:47 +08:00
hch
f7de908057 处理闪退,修改背景色 2023-10-23 15:57:40 +08:00
18401019693
d2ba1ed570 可提现接口数据添加 2023-10-23 15:27:19 +08:00
18401019693
b90a8a69f5 可提现接口数据添加 2023-10-23 15:24:38 +08:00
hch
758b87e426 设置-修改密码,黑名单 2023-10-23 15:08:13 +08:00
18401019693
d7e4ad9aca 金币兑换砖石,星币页面,消费记录页面 2023-10-23 14:35:18 +08:00
be02488180 update 2023-10-22 23:15:54 +08:00
hch
ebeb276bb1 達人認證 2023-10-20 18:26:51 +08:00
d3ab50e844 update 2023-10-20 18:25:06 +08:00
0935f76bac update 2023-10-20 18:07:39 +08:00
0b28dd94d1 update 2023-10-20 18:05:25 +08:00
18401019693
df20d942d5 Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊
# Conflicts:
#	OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java
#	OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java
2023-10-20 15:32:46 +08:00
18401019693
dff84a30e4 消费记录 2023-10-20 15:31:52 +08:00
hch
0287995bf9 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-19 18:28:24 +08:00
hch
bcfd1c22e6 真人认证 2023-10-19 18:27:39 +08:00
18142669586
38471cedc8 Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊 2023-10-19 15:15:30 +08:00