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 |
|
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 |
|
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
|
5335285b93
|
bugfix
|
2020-05-05 20:49:13 +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
|
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
|
18e3515cf7
|
首页房间随机逻辑
|
2020-04-30 21:10:25 +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 |
|
huangjian
|
542905101a
|
公屏获取历史记录
|
2020-04-27 16:00:06 +08:00 |
|
oujunhui
|
48ff7d09c8
|
首页房间
|
2020-04-26 21:36:02 +08:00 |
|
oujunhui
|
808ebaf22f
|
迁移AndroidX
|
2020-04-24 15:14:59 +08:00 |
|
oujunhui
|
511d16e8e8
|
首页部分
|
2020-04-24 13:02:56 +08:00 |
|
oujunhui
|
100e73555c
|
收藏房间
|
2020-04-20 20:57:12 +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
|
9de0be4db2
|
登录页部分UI
|
2020-04-10 21:26:18 +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 |
|
oujunhui
|
c126ca0392
|
AndroidX
|
2020-04-09 12:33:33 +08:00 |
|
oujunhui
|
6df2d64ddb
|
迁移Android X
|
2020-04-08 21:55:17 +08:00 |
|
oujunhui
|
01ea699722
|
升级SDK版本，替换云信secret key
|
2020-04-08 16:44:03 +08:00 |
|
oujunhui
|
0358ac2632
|
Merge branch 'develop_hui' into develop_new
|
2020-04-07 16:52:42 +08:00 |
|
oujunhui
|
9bbeb8e1f6
|
2020/4/7新包
|
2020-04-07 16:41:24 +08:00 |
|
oujunhui
|
8a922f39c6
|
“我的”页面修改。更换签名，包名，友盟统计、百度统计账号，
|
2020-04-03 16:54:53 +08:00 |
|
oujunhui
|
783bb08358
|
compileSdkVersion升级
|
2020-04-02 16:20:03 +08:00 |
|
oujunhui
|
2f9d26fd7e
|
66陪玩-origin
|
2020-04-02 10:43:40 +08:00 |
|