Commit Graph

3671 Commits

Author SHA1 Message Date
董宏宇
ea6fd32ea8 删除测试数据 2020-11-02 21:05:22 +08:00
董宏宇
d4f13ab254 Merge remote-tracking branch 'origin/dev' into dev 2020-11-02 20:51:11 +08:00
董宏宇
023e53184c xiuga 2020-11-02 20:51:07 +08:00
lixiaopeng
dc169f53fe opt 2020-11-02 20:50:31 +08:00
lixiaopeng
56ce2a946e opt 2020-11-02 20:39:41 +08:00
lixiaopeng
c84fc33bf0 opt 2020-11-02 20:39:41 +08:00
lixiaopeng
7f5f19244e merge 2020-11-02 20:39:38 +08:00
董宏宇
80adfffd3c Merge remote-tracking branch 'origin/dev' into dev 2020-11-02 20:33:04 +08:00
董宏宇
c77ce39087 解决提示UGC不及时的bug 2020-11-02 20:33:00 +08:00
tongchenfei
ee85f5a36c Merge remote-tracking branch 'origin/dev' into dev 2020-11-02 19:51:07 +08:00
tongchenfei
d50df55bef 移除冗余模块:module-tanlu-api 2020-11-02 19:50:54 +08:00
wangcongtao
268fb9c068 Merge remote-tracking branch 'origin/dev' into dev 2020-11-02 19:49:59 +08:00
wangcongtao
35d8b05825 app列表优化 2020-11-02 19:49:52 +08:00
lixiaopeng
5307924e43 opt 2020-11-02 18:47:41 +08:00
董宏宇
9395de232c Merge remote-tracking branch 'origin/dev' into dev 2020-11-02 18:01:34 +08:00
董宏宇
e96126d840 修复因为测试改掉的直播地址的设置 2020-11-02 18:01:29 +08:00
tongchenfei
b51f3ac7c9 Merge remote-tracking branch 'origin/dev' into dev 2020-11-02 17:49:28 +08:00
tongchenfei
7d7688b793 添加故障求助通知提示 2020-11-02 17:49:17 +08:00
liujing
cbc575ccf3 v2x视频播放器白加黑 2020-11-02 17:25:27 +08:00
董宏宇
843adc527f Merge remote-tracking branch 'origin/dev' into dev 2020-11-02 16:47:37 +08:00
董宏宇
5dae299f87 优化页面UI 2020-11-02 16:47:33 +08:00
wangcongtao
f7a7994eeb 代码优化 2020-11-02 16:38:20 +08:00
董宏宇
2fb027a159 Merge remote-tracking branch 'origin/dev' into dev 2020-11-02 16:16:41 +08:00
董宏宇
866f919eb2 修改直播弹窗调用,增加了与导航布局无联动的弹窗组件调用 2020-11-02 16:16:36 +08:00
tongchenfei
788644b944 crash fix: try-catch住TopViewHelper里面一个ClassCastException 2020-11-02 15:41:32 +08:00
tongchenfei
be95baf109 Merge remote-tracking branch 'origin/dev' into dev 2020-11-02 15:37:03 +08:00
tongchenfei
77f957e88d 增加poi点服务端可配功能 2020-11-02 15:36:33 +08:00
lixiaopeng
17015329c2 opt 2020-11-02 15:15:47 +08:00
liujing
bcb507fe11 Merge branch 'lk' into dev 2020-11-02 15:07:31 +08:00
liujing
7776432519 [add] 事件弹框 点赞动画 2020-11-02 15:07:14 +08:00
董宏宇
ddbfd28b46 Merge remote-tracking branch 'origin/dev' into dev 2020-11-02 10:35:56 +08:00
董宏宇
a1f118990f 合并测试面板 2020-11-02 10:35:51 +08:00
lixiaopeng
597adb83d4 delete unused code 2020-11-02 10:21:06 +08:00
liujing
02e9533fbc Merge branch 'cc' into dev 2020-11-01 16:19:21 +08:00
liujing
238bd5e5a4 [fix]出行动态-白天模式UI 2020-11-01 16:19:07 +08:00
董宏宇
6615ffcb30 完成了测试控制面板的分段控制展示 2020-10-30 20:14:16 +08:00
liujing
943f6d53c6 播放器高度 2020-10-30 17:24:06 +08:00
liujing
2e69d630ca Merge branch 'pp' into dev 2020-10-30 16:14:46 +08:00
liujing
1eb7419b49 H5推送直播,暂无上滑关闭 2020-10-30 16:14:32 +08:00
liujing
206ee71f67 Merge branch 'pp' into dev 2020-10-30 13:45:40 +08:00
liujing
6e296b1de6 小心心图片替换 2020-10-30 13:45:24 +08:00
liujing
7aaa6cc3d5 弹框UI下沉commons 2020-10-30 11:31:38 +08:00
liujing
d0727f2254 推送直播,暂时保留了测试关闭按钮,暂时没有重复推送 2020-10-29 21:13:41 +08:00
liujing
7f9a336bc5 [add] 直播获取是把你 重试 白天模式 2020-10-29 20:49:28 +08:00
liujing
a22d9671c6 直播UI 2020-10-29 20:19:04 +08:00
liujing
681f7d7b6e Merge branch 'lk' into dev 2020-10-29 17:03:02 +08:00
liujing
ebce2c542b 去掉same判断 2020-10-29 17:03:00 +08:00
liujing
34718a8f6d Merge branch 'lk' into dev 2020-10-29 16:37:43 +08:00
liujing
a8728174b1 直播框高度调整,层级关系调整 2020-10-29 16:37:25 +08:00
unknown
8d71f0d0da upgrade callchat 2020-10-28 19:10:12 +08:00