Commit Graph

81 Commits

Author SHA1 Message Date
oujunhui
67ef646c1b 替换实名认证URL 2020-05-13 19:26:02 +08:00
oujunhui
4ca689c8a3 七牛正式和测试环境URL区分 2020-05-13 18:13:24 +08:00
oujunhui
b0ec8d492e 举报页H5 2020-05-13 17:33:41 +08:00
oujunhui
ee6f6b80a1 一键登录按键后端配 2020-05-13 16:02:20 +08:00
huangjian
c2f244e618 Merge remote-tracking branch 'origin/develop_new' into develop_new 2020-05-13 15:30:24 +08:00
huangjian
addb1e7149 登录流程修改 2020-05-13 15:30:15 +08:00
oujunhui
e64250151a 替换我的账户-我的收益H5链接 2020-05-13 15:13:48 +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
f72cf14c3a 更换正式服域名 2020-05-13 09:58:44 +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
oujunhui
8a9419a558 绑定手机,氛围号登录 2020-05-11 21:50:31 +08:00
oujunhui
eff18cf474 Merge branch 'develop_home' into develop_new 2020-05-11 19:53:48 +08:00
oujunhui
142a774e75 绑定手机 2020-05-11 19:53:01 +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
a5c00b1576 七牛 QINIU_SECRET_KEY 修改 2020-05-11 14:03:19 +08:00
oujunhui
30715b5b85 bugfix 2020-05-11 13:49:57 +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
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
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
6a4ebdd2e0 bugfix登录页 2020-05-09 13:01:19 +08:00
huangjian
106c6eb722 增加微信小程序支付(草莓的逻辑) 2020-05-08 19:36:26 +08:00
oujunhui
1ad5fb1eb2 首页UI调整 2020-05-08 16:24:31 +08:00
oujunhui
22631f4cfb 完善资料页 2020-05-08 11:00:20 +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
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