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 |
|
oujunhui
|
5687fc4aa5
|
Merge branch 'develop_new' into develop_home
|
2020-05-07 17:47:51 +08:00 |
|
oujunhui
|
c95def88c9
|
更换图标，随机昵称
|
2020-05-07 17:47:40 +08:00 |
|
huangjian
|
412b24e3a5
|
Merge remote-tracking branch 'origin/develop_new' into develop_new
|
2020-05-07 17:31:33 +08:00 |
|
oujunhui
|
bcd9e7d9aa
|
bugfix
|
2020-05-07 16:41:46 +08:00 |
|
huangjian
|
7514a6458f
|
1.bug fix
2.金币->钻石
|
2020-05-07 16:39:56 +08:00 |
|
oujunhui
|
3de0815ef3
|
搜索bugfix，客态个人直播中按钮
|
2020-05-07 16:14:39 +08:00 |
|
oujunhui
|
8283db79ca
|
Merge branch 'develop_new' into develop_home
|
2020-05-07 11:20:48 +08:00 |
|
oujunhui
|
c921249d73
|
bugfix
|
2020-05-07 11:20:34 +08:00 |
|
huangjian
|
2590fdeefa
|
Merge remote-tracking branch 'origin/develop_new' into develop_new
# Conflicts:
# app/src/main/java/com/yizhuan/erban/MainActivity.java
|
2020-05-07 11:17:01 +08:00 |
|
huangjian
|
4079a09ef5
|
bug fix
|
2020-05-07 11:16:01 +08:00 |
|
oujunhui
|
206102d88f
|
Merge branch 'develop_home' into develop_new
|
2020-05-06 21:33:48 +08:00 |
|
oujunhui
|
a7049ee9a8
|
替换logo
|
2020-05-06 21:33:27 +08:00 |
|
huangjian
|
e696ddd3da
|
许愿池UI修改
|
2020-05-06 19:49:34 +08:00 |
|
huangjian
|
f3ca1bfc6d
|
开箱子优化
|
2020-05-06 10:47:15 +08:00 |
|
oujunhui
|
5335285b93
|
bugfix
|
2020-05-05 20:49:13 +08:00 |
|
huangjian
|
d544c33d5f
|
Merge remote-tracking branch 'origin/develop_new' into develop_new
|
2020-05-05 19:47:00 +08:00 |
|
huangjian
|
aa9f8fa959
|
删除开箱子无用代码
|
2020-05-05 19:46:53 +08:00 |
|
oujunhui
|
a1bf90c939
|
Merge branch 'develop_home' into develop_new
|
2020-05-05 19:10:27 +08:00 |
|
oujunhui
|
47227d7169
|
首页，搜索页
|
2020-05-05 19:09:56 +08:00 |
|
huangjian
|
6031108bb5
|
宝箱更多弹窗增加打开获取66流星活动链接
|
2020-05-05 18:51:59 +08:00 |
|
huangjian
|
f6c908c215
|
增加获取66流星链接
|
2020-05-05 18:47:36 +08:00 |
|