tongchenfei
|
b7092f5774
|
Merge branch 'demo/shunyi_v2v' into demo/shunyi_v2v_merge
# Conflicts:
# app/src/main/java/com/mogo/launcher/MogoApplication.java
# modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
# modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
# modules/mogo-module-search/build.gradle
# services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
# services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
|
2020-09-04 17:32:26 +08:00 |
|
tongchenfei
|
ef5c3d306e
|
添加钛方科技碰撞报警相关逻辑，主要增加碰撞阈值设置临时入口和碰撞报警事件转发
|
2020-09-04 16:56:07 +08:00 |
|
董宏宇
|
e02c26d492
|
Open h5 push server
|
2020-08-31 14:39:22 +08:00 |
|
unknown
|
b0b1556046
|
add log
|
2020-08-25 17:38:55 +08:00 |
|
unknown
|
1a1bda0054
|
fix bug of NPE
|
2020-08-25 17:37:13 +08:00 |
|
unknown
|
24988cce45
|
merge shunyi func
|
2020-08-25 17:27:56 +08:00 |
|
董宏宇
|
609aede0c6
|
合并了之前顺义新增需求
|
2020-08-25 11:49:36 +08:00 |
|
wangcongtao
|
51ead6cebf
|
Merge branch 'dev' into demo/shunyi_v2v_merge
|
2020-08-24 14:07:37 +08:00 |
|
liujing
|
b19d4e21e4
|
msg
|
2020-08-24 11:31:53 +08:00 |
|
wangcongtao
|
998eab6d8b
|
1. merge
2. bugfix
|
2020-08-21 21:23:51 +08:00 |
|
wangcongtao
|
95d282b377
|
1. 修改时间策略
|
2020-08-21 20:20:20 +08:00 |
|
wangcongtao
|
98445dec50
|
1. 整理依赖
2. 新增launcher1.0卡片刷新参数
|
2020-08-21 19:29:12 +08:00 |
|
wangcongtao
|
820e323a2e
|
1. 禁止分屏
|
2020-08-21 15:40:38 +08:00 |
|
wangcongtao
|
ceafa8ec70
|
Merge branch 'qa_1.1.2' into dev
# Conflicts:
# app/src/main/java/com/mogo/launcher/MogoApplication.java
|
2020-08-21 15:40:35 +08:00 |
|
tongchenfei
|
19a9e52612
|
crash fix
|
2020-08-20 16:58:55 +08:00 |
|
tongchenfei
|
b17392ce81
|
Merge remote-tracking branch 'origin/qa_1.1.2' into qa_1.1.2
|
2020-08-20 15:31:09 +08:00 |
|
tongchenfei
|
c73541dd10
|
添加Monitor为BaseModule
|
2020-08-20 15:30:50 +08:00 |
|
lixiaopeng
|
e6bc4a026f
|
Merge branch 'qa_1.1.2' into dev
|
2020-08-20 10:24:01 +08:00 |
|
lixiaopeng
|
7b3c69cb1a
|
opt
|
2020-08-20 09:51:29 +08:00 |
|
tongchenfei
|
ac72a04995
|
合并obu部分代码
|
2020-08-19 20:42:17 +08:00 |
|
董宏宇
|
e1bab17d19
|
Merge remote-tracking branch 'origin/qa_1.1.2' into qa_1.1.2
|
2020-08-19 19:29:09 +08:00 |
|
董宏宇
|
b56a5d71e9
|
剧中头像
|
2020-08-19 19:29:00 +08:00 |
|
liujing
|
7ef2d72f16
|
ui
|
2020-08-19 17:14:28 +08:00 |
|
lixiaopeng
|
58e5bb6b0d
|
opt ui
|
2020-08-19 17:08:09 +08:00 |
|
tongchenfei
|
5af67fecf4
|
Merge branch 'dev' into demo/shunyi_v2v_merge
|
2020-08-19 16:12:59 +08:00 |
|
tongchenfei
|
25a982337c
|
Merge branch 'qa_1.1.2' into dev
|
2020-08-19 15:47:55 +08:00 |
|
tongchenfei
|
65b251d020
|
Merge remote-tracking branch 'origin/qa_1.1.2' into qa_1.1.2
|
2020-08-19 15:07:02 +08:00 |
|
tongchenfei
|
b83bead690
|
增加日志抓取功能
|
2020-08-19 15:06:43 +08:00 |
|
wangcongtao
|
806d95a93b
|
顺义分支和dev分支合并
|
2020-08-19 14:54:15 +08:00 |
|
董宏宇
|
fc87a71579
|
Merge remote-tracking branch 'origin/qa_1.1.2' into qa_1.1.2
|
2020-08-19 14:53:20 +08:00 |
|
董宏宇
|
efa2ec578f
|
修改了关闭窗体后修改状态的时机
|
2020-08-19 14:53:12 +08:00 |
|
liujing
|
05285fa0b6
|
图片替换,无用代码删除
|
2020-08-19 14:21:03 +08:00 |
|
董宏宇
|
e89706a4d7
|
修改了关闭窗体后修改状态的时机
|
2020-08-19 14:15:12 +08:00 |
|
liujing
|
8544c19342
|
服务端返回字段大小写有误
|
2020-08-19 12:23:21 +08:00 |
|
wangcongtao
|
7727011de1
|
1. 1.1.3需求策略修改。
|
2020-08-19 11:48:25 +08:00 |
|
liujing
|
aa67ca085f
|
ui
|
2020-08-19 10:25:18 +08:00 |
|
liujing
|
7b796c65ba
|
UI
|
2020-08-18 21:28:22 +08:00 |
|
liujing
|
a45f82c70c
|
UI
|
2020-08-18 20:45:59 +08:00 |
|
liujing
|
1d7c902703
|
我的分享列表刷新时机
|
2020-08-18 19:55:24 +08:00 |
|
lixiaopeng
|
2b3a58361c
|
opt ui
|
2020-08-18 17:25:26 +08:00 |
|
lixiaopeng
|
1853f50bbc
|
opt ui
|
2020-08-18 17:04:08 +08:00 |
|
liujing
|
1af7263dad
|
[add] 部分UI
|
2020-08-18 16:43:30 +08:00 |
|
董宏宇
|
14d3ee444e
|
增加日志
|
2020-08-18 15:36:52 +08:00 |
|
董宏宇
|
d85c6c9d26
|
打开了日志输出
|
2020-08-18 15:29:45 +08:00 |
|
lixiaopeng
|
1b4c625dd9
|
opt
|
2020-08-18 14:48:29 +08:00 |
|
董宏宇
|
50e6eb5cf8
|
Merge branch 'dev_1.1.2' into dev
# Conflicts:
# modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorConst.java
# modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java
|
2020-08-18 14:19:13 +08:00 |
|
董宏宇
|
94e8807dfd
|
Merge remote-tracking branch 'origin/qa_1.1.2' into qa_1.1.2
|
2020-08-18 14:14:36 +08:00 |
|
董宏宇
|
11cf188cea
|
修复了调用接口addPoiInfoFabulous穿参数问题
|
2020-08-18 14:14:17 +08:00 |
|
tongchenfei
|
956330bf96
|
Merge remote-tracking branch 'origin/qa_1.1.2' into qa_1.1.2
|
2020-08-18 13:13:29 +08:00 |
|
tongchenfei
|
7ebc0b0862
|
opt
|
2020-08-18 13:11:07 +08:00 |
|