Commit Graph

168 Commits

Author SHA1 Message Date
oujunhui
db2096f4f9 聊天输入框背景 2020-05-14 15:18:42 +08:00
oujunhui
96d1ba7f8e 头饰动效 2020-05-14 15:08:53 +08:00
oujunhui
99b5c6a067 修改支付密码 2020-05-14 13:31:01 +08:00
memory
19ae70cebc Merge remote-tracking branch 'origin/develop_new' into develop_new 2020-05-13 23:46:00 +08:00
memory
1d03ba2c2e 进房扩展字段增加effect 2020-05-13 23:45:33 +08:00
oujunhui
f801a8f1bd 迁移首页bean到core 2020-05-13 23:10:23 +08:00
memory
7d741c305f Merge remote-tracking branch 'origin/develop_new' into develop_new 2020-05-13 23:07:31 +08:00
memory
102655dac9 实名认证SDK update 2020-05-13 23:07:23 +08:00
oujunhui
a3f0b6d472 去掉全部消息的性别年龄,修改私聊发送礼物的字体颜色 2020-05-13 22:19:30 +08:00
oujunhui
548a8486d8 网络实体类迁移到core 2020-05-13 21:22:45 +08:00
oujunhui
67ef646c1b 替换实名认证URL 2020-05-13 19:26:02 +08:00
huangjian
babf0caf24 Merge remote-tracking branch 'origin/develop_new' into develop_new 2020-05-13 19:24:08 +08:00
huangjian
74daeaffa6 删除 MeFragment的AuthModel.get().setThirdUserInfo(null);
不理解为什么要删除
2020-05-13 19:24:00 +08:00
oujunhui
3c52781c6f 适配AndroidQ打开房间闪退 2020-05-13 19:20:09 +08:00
huangjian
beb8233bc4 登录bug fix 2020-05-13 19:08:14 +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
f14bcb93f2 Merge branch 'develop_home' into develop_new 2020-05-13 17:27:11 +08:00
oujunhui
d452ca8569 Update AddUserInfoFragment.java 2020-05-13 17:26:56 +08:00
oujunhui
62437564af 首页返回房间不刷新 2020-05-13 17:01:59 +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
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