huangjian
|
560f989b62
|
Merge remote-tracking branch 'origin/develop_new' into develop_new
|
2020-05-11 20:23:10 +08:00 |
|
huangjian
|
4d4d2596d6
|
1.开箱子去掉钻石数量展示
2.礼物弹窗全麦UI修改
|
2020-05-11 20:23:04 +08:00 |
|
oujunhui
|
eff18cf474
|
Merge branch 'develop_home' into develop_new
|
2020-05-11 19:53:48 +08:00 |
|
oujunhui
|
8bf37880b7
|
绑定手机
|
2020-05-11 19:53:30 +08:00 |
|
oujunhui
|
142a774e75
|
绑定手机
|
2020-05-11 19:53:01 +08:00 |
|
huangjian
|
a69b886aaf
|
删除魅力值背景
|
2020-05-11 19:33:40 +08:00 |
|
huangjian
|
be20a39faf
|
Merge remote-tracking branch 'origin/develop_new' into develop_new
# Conflicts:
# app/src/main/res/drawable/shape_bg_of_mic_charm.xml
|
2020-05-11 19:31:56 +08:00 |
|
huangjian
|
b19e6ae1b9
|
Revert "魅力值背景更改"
This reverts commit f490dc7700.
|
2020-05-11 19:31:36 +08:00 |
|
huangjian
|
f490dc7700
|
魅力值背景更改
|
2020-05-11 19:16:32 +08:00 |
|
huangjian
|
7173343f0a
|
1.开箱子页面钻石去掉小数
2.分享房间域名修改
|
2020-05-11 19:06:15 +08:00 |
|
huangjian
|
90ee357fb6
|
Merge remote-tracking branch 'origin/develop_new' into develop_new
|
2020-05-11 18:52:00 +08:00 |
|
huangjian
|
ed0ddf04c1
|
钱包通知字段更新
|
2020-05-11 18:51:53 +08:00 |
|
huangjian
|
0ebcc679dd
|
1.宝箱逻辑修改
2.添加音乐去掉共享音乐
|
2020-05-11 16:42:44 +08:00 |
|
oujunhui
|
0e525f4c25
|
获取首页刷新频率，装饰天数99+
|
2020-05-11 15:17:39 +08:00 |
|
huangjian
|
88844c3a70
|
房间默认背景修改
|
2020-05-11 14:13:32 +08:00 |
|
huangjian
|
a5c00b1576
|
七牛 QINIU_SECRET_KEY 修改
|
2020-05-11 14:03:19 +08:00 |
|
oujunhui
|
bb2b21e268
|
Merge branch 'develop_home' into develop_new
|
2020-05-11 13:50:14 +08:00 |
|
oujunhui
|
30715b5b85
|
bugfix
|
2020-05-11 13:49:57 +08:00 |
|
huangjian
|
177bb1568c
|
Matisse适配Android Q
|
2020-05-11 11:50:03 +08:00 |
|
oujunhui
|
196f25f85e
|
去掉引导页
|
2020-05-11 10:29:04 +08:00 |
|
oujunhui
|
f2e65c622c
|
搜索用户直播中
|
2020-05-09 20:08:10 +08:00 |
|
oujunhui
|
555aa5947d
|
Update UserInfo.java
|
2020-05-09 19:11:35 +08:00 |
|
oujunhui
|
038e3b2ba4
|
Update UserInfoDynamicAdapter.java
|
2020-05-09 19:04:32 +08:00 |
|
oujunhui
|
65ed047f4c
|
Merge branch 'develop_new' into develop_home
|
2020-05-09 19:03:28 +08:00 |
|
huangjian
|
a05e148cb3
|
上坑逻辑优化
|
2020-05-09 18:52:00 +08:00 |
|
oujunhui
|
cfdc618e4a
|
Merge branch 'develop_new' into develop_home
|
2020-05-09 18:51:35 +08:00 |
|
oujunhui
|
a2cf18a840
|
替换SDK key，UI调整
|
2020-05-09 18:51:26 +08:00 |
|
huangjian
|
28f5695329
|
开箱子UI修改(本来要改高度了改成宽了...)
|
2020-05-09 17:11:23 +08:00 |
|
huangjian
|
84cdbd9e1f
|
1.房间活动接口更改
2.开箱子去掉黑色蒙层
|
2020-05-09 16:56:07 +08:00 |
|
oujunhui
|
b7f9fb75e5
|
升级窗口，更换H5链接
|
2020-05-09 16:19:56 +08:00 |
|
huangjian
|
9cd069a1fc
|
Merge remote-tracking branch 'origin/develop_new' into develop_new
# Conflicts:
# app/src/main/res/layout/fragment_game_home.xml
|
2020-05-09 14:16:50 +08:00 |
|
huangjian
|
a3530f1b54
|
bug fix
|
2020-05-09 14:15:30 +08:00 |
|
oujunhui
|
e2c68edb9c
|
验证码bugfix
|
2020-05-09 13:22:19 +08:00 |
|
oujunhui
|
6a4ebdd2e0
|
bugfix登录页
|
2020-05-09 13:01:19 +08:00 |
|
huangjian
|
3f797d8c1f
|
Merge remote-tracking branch 'origin/develop_new' into develop_new
|
2020-05-08 19:36:33 +08:00 |
|
huangjian
|
106c6eb722
|
增加微信小程序支付(草莓的逻辑)
|
2020-05-08 19:36:26 +08:00 |
|
oujunhui
|
c775533aea
|
搜索
|
2020-05-08 18:28:54 +08:00 |
|
huangjian
|
cc966c613c
|
首页刷新逻辑修改
|
2020-05-08 18:24:30 +08:00 |
|
huangjian
|
855fd94477
|
Merge remote-tracking branch 'origin/develop_new' into develop_new
|
2020-05-08 16:32:04 +08:00 |
|
huangjian
|
ac05829dad
|
bug fix
|
2020-05-08 16:31:56 +08:00 |
|
oujunhui
|
43d3eef17c
|
Merge branch 'develop_home' into develop_new
|
2020-05-08 16:24:58 +08:00 |
|
oujunhui
|
1ad5fb1eb2
|
首页UI调整
|
2020-05-08 16:24:31 +08:00 |
|
huangjian
|
753d1650cb
|
集成OPPO推送
|
2020-05-08 15:59:14 +08:00 |
|
huangjian
|
bf1c7b07b3
|
开箱子UI适配
|
2020-05-08 14:56:38 +08:00 |
|
huangjian
|
9ec916c53f
|
bug fix
|
2020-05-08 11:14:12 +08:00 |
|
oujunhui
|
22631f4cfb
|
完善资料页
|
2020-05-08 11:00:20 +08:00 |
|
oujunhui
|
fb53a5dd1c
|
bugfix
|
2020-05-07 20:21:24 +08:00 |
|
huangjian
|
c96c4a7cf7
|
BaseRecyclerViewAdapterHelper 升级到androidx版本
|
2020-05-07 20:18:34 +08:00 |
|
huangjian
|
b2f23f4f6f
|
Merge remote-tracking branch 'origin/develop_new' into develop_new
|
2020-05-07 18:51:38 +08:00 |
|
huangjian
|
2b6a59c296
|
1.送礼物展示特效逻辑修改
2.开放OPPO推送
|
2020-05-07 18:51:04 +08:00 |
|