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 |
|
huangjian
|
996bb490ca
|
Merge branch 'room_gold_box' into develop_new
|
2020-05-05 17:06:45 +08:00 |
|
huangjian
|
72c6569fc1
|
1.宝箱相关逻辑
2.关闭第三方推送
3.去掉读取手机信息权限
|
2020-05-05 17:06:10 +08:00 |
|
oujunhui
|
6e81f683ca
|
Update HomeTabHomeFragment.java
|
2020-05-05 10:18:57 +08:00 |
|
oujunhui
|
18e3515cf7
|
首页房间随机逻辑
|
2020-04-30 21:10:25 +08:00 |
|
huangjian
|
3f8705a812
|
宝箱UI和动画
|
2020-04-30 20:56:49 +08:00 |
|
oujunhui
|
22f8a303e4
|
个人中心
|
2020-04-30 15:13:04 +08:00 |
|
oujunhui
|
ad5bec740d
|
缺省页UI
|
2020-04-30 10:25:00 +08:00 |
|
oujunhui
|
cef381ddde
|
个人中心
|
2020-04-29 21:20:32 +08:00 |
|
huangjian
|
5927355004
|
1.房间收藏公屏提示消息
2.被封号退出登录
|
2020-04-29 16:09:58 +08:00 |
|
oujunhui
|
b1cd288cc4
|
Merge remote-tracking branch 'origin/room_gold_box' into develop_new
|
2020-04-28 19:34:54 +08:00 |
|
oujunhui
|
bfbaeb331f
|
Merge branch 'develop_home' into develop_new
|
2020-04-28 19:34:25 +08:00 |
|
oujunhui
|
b4469fe600
|
bugfix
|
2020-04-28 19:34:01 +08:00 |
|
huangjian
|
88ce13a5da
|
linkedme key修改
|
2020-04-28 19:33:47 +08:00 |
|
huangjian
|
4dc57789f0
|
1.房间相关UI修改
2.分享房间更改
|
2020-04-28 19:07:40 +08:00 |
|
oujunhui
|
81ee4a685a
|
Update IUserModel.java
|
2020-04-28 15:09:19 +08:00 |
|
oujunhui
|
d158472e2b
|
首页房间item，去掉首页签到弹窗，青少年模式弹窗样式，钻石数量显示，替换applogo
|
2020-04-28 15:08:58 +08:00 |
|
oujunhui
|
e60230e35b
|
Merge branch 'develop_home' into develop_new
|
2020-04-27 17:47:10 +08:00 |
|
oujunhui
|
2b31767a80
|
首页
|
2020-04-27 17:46:30 +08:00 |
|
huangjian
|
542905101a
|
公屏获取历史记录
|
2020-04-27 16:00:06 +08:00 |
|
oujunhui
|
48ff7d09c8
|
首页房间
|
2020-04-26 21:36:02 +08:00 |
|
oujunhui
|
f86574b460
|
首页更多房间
|
2020-04-24 20:28:47 +08:00 |
|
oujunhui
|
808ebaf22f
|
迁移AndroidX
|
2020-04-24 15:14:59 +08:00 |
|
oujunhui
|
511d16e8e8
|
首页部分
|
2020-04-24 13:02:56 +08:00 |
|
oujunhui
|
ff134dfe52
|
我的账户
|
2020-04-22 12:00:54 +08:00 |
|
oujunhui
|
100e73555c
|
收藏房间
|
2020-04-20 20:57:12 +08:00 |
|
oujunhui
|
f7f06a3ee9
|
聊天页
|
2020-04-18 19:28:37 +08:00 |
|
oujunhui
|
285292a005
|
收藏房间，消息
|
2020-04-18 17:27:09 +08:00 |
|
oujunhui
|
c671ce02b9
|
铭牌
|
2020-04-17 15:51:21 +08:00 |
|
oujunhui
|
eeff4fa0a2
|
动态
|
2020-04-16 15:55:44 +08:00 |
|
oujunhui
|
755a735d7d
|
动态部分UI
|
2020-04-11 20:00:00 +08:00 |
|
oujunhui
|
be8394ba6e
|
登录页
|
2020-04-11 11:24:14 +08:00 |
|
oujunhui
|
9de0be4db2
|
登录页部分UI
|
2020-04-10 21:26:18 +08:00 |
|
oujunhui
|
71bff56b2a
|
登录页部分UI
|
2020-04-10 16:48:04 +08:00 |
|
oujunhui
|
2e673b2809
|
登录页部分UI
|
2020-04-09 21:29:09 +08:00 |
|
oujunhui
|
11319692e6
|
登录页部分UI
|
2020-04-09 15:57:14 +08:00 |
|
oujunhui
|
06bd068125
|
Revert "迁移Android X"
This reverts commit 6df2d64ddb.
|
2020-04-09 12:35:00 +08:00 |
|
oujunhui
|
c8b351c82e
|
Revert "AndroidX"
This reverts commit c126ca0392.
|
2020-04-09 12:34:55 +08:00 |
|