Commit Graph

1745 Commits

Author SHA1 Message Date
oujunhui
e64250151a 替换我的账户-我的收益H5链接 2020-05-13 15:13:48 +08:00
oujunhui
b021fb80fd Merge branch 'develop_new' into develop_home 2020-05-13 14:15:29 +08:00
oujunhui
df92f4cff7 Update .gitignore 2020-05-13 14:15:23 +08:00
oujunhui
037cb9d757 修改公参“app” 2020-05-13 14:02:07 +08:00
huangjian
00734faff5 轻寻图片域名替换为自己的 2020-05-13 11:19:54 +08:00
huangjian
77483c9471 Merge remote-tracking branch 'origin/develop_new' into develop_new 2020-05-13 11:10:06 +08:00
huangjian
8923c4b517 1.钻石宝箱去掉限时 2020-05-13 11:09:56 +08:00
oujunhui
5c1dcc10e7 替换默认头像链接 2020-05-13 10:17:46 +08:00
oujunhui
f72cf14c3a 更换正式服域名 2020-05-13 09:58:44 +08:00
huangjian
9b07d94a2d Merge remote-tracking branch 'origin/develop_new' into develop_new 2020-05-12 17:58:47 +08:00
huangjian
96d588e025 测试包增加打包时间 2020-05-12 17:58:42 +08:00
oujunhui
48440fdc36 房间tag大小调整 2020-05-12 17:52:35 +08:00
oujunhui
1370b6d998 第三方登录 2020-05-12 17:07:58 +08:00
huangjian
00af55e058 Merge remote-tracking branch 'origin/develop_new' into develop_new 2020-05-12 16:01:33 +08:00
huangjian
54fce0f4f6 打包配置 2020-05-12 16:01:27 +08:00
oujunhui
659124b0ce 第三方登录 2020-05-12 15:43:57 +08:00
oujunhui
f9e2ce9741 绑定手机 2020-05-12 14:59:57 +08:00
huangjian
7a3e1868cc 1.rxlifecycle升级到3
2.去掉支付宝沙盒模式
2020-05-12 12:31:13 +08:00
huangjian
2615da331b Merge remote-tracking branch 'origin/develop_new' into develop_new 2020-05-11 22:05:41 +08:00
huangjian
737e67c58b 开箱子消息增加点击事件 2020-05-11 22:05:35 +08:00
oujunhui
8a9419a558 绑定手机,氛围号登录 2020-05-11 21:50:31 +08:00
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