liujing
|
7957403a06
|
Merge branch 'dev_1.1.2' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev_1.1.2
* 'dev_1.1.2' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher:
opt
|
2020-08-11 19:18:10 +08:00 |
|
liujing
|
97ca46e688
|
Merge branch 'add' into dev_1.1.2
|
2020-08-11 19:17:29 +08:00 |
|
lixiaopeng
|
b2072767da
|
opt
|
2020-08-11 19:17:02 +08:00 |
|
liujing
|
a7eafc9809
|
时间戳转换格式
|
2020-08-11 19:16:51 +08:00 |
|
董宏宇
|
733efa82f9
|
完成了事件面板的视图更新
|
2020-08-11 19:12:13 +08:00 |
|
tongchenfei
|
294440bd5d
|
Merge remote-tracking branch 'origin/dev_1.1.2' into dev_1.1.2
|
2020-08-11 19:06:03 +08:00 |
|
tongchenfei
|
a11f74e334
|
添加EntranceFragment底层view增加方法
|
2020-08-11 19:05:50 +08:00 |
|
董宏宇
|
2367de4945
|
增加了响应求助的接口
|
2020-08-11 19:04:57 +08:00 |
|
董宏宇
|
d8f38dd90d
|
完成了周边事件的基础功能。还差数据通讯的功能
|
2020-08-11 18:46:40 +08:00 |
|
liujing
|
18aa31f304
|
Merge branch 'add' into dev_1.1.2
|
2020-08-11 16:05:42 +08:00 |
|
liujing
|
76ce548013
|
图片资源替换
|
2020-08-11 16:05:29 +08:00 |
|
liujing
|
65c7d31743
|
Merge branch 'add' into dev_1.1.2
|
2020-08-11 15:12:15 +08:00 |
|
liujing
|
b86844f1db
|
[add] 我的分享-图片资源
|
2020-08-11 15:11:57 +08:00 |
|
董宏宇
|
7d3e57858a
|
Merge remote-tracking branch 'origin/dev_1.1.2' into dev_1.1.2
|
2020-08-11 14:58:09 +08:00 |
|
董宏宇
|
40905b916c
|
完成了没有出行动态的时候的展示
|
2020-08-11 14:58:04 +08:00 |
|
董宏宇
|
3a7a84465a
|
完成了事件面板中的样式以及数量标记
|
2020-08-11 12:06:55 +08:00 |
|
tongchenfei
|
cdb48ea0d8
|
Merge remote-tracking branch 'origin/dev_1.1.2' into dev_1.1.2
|
2020-08-11 12:00:22 +08:00 |
|
tongchenfei
|
264faae1f1
|
将天气挪到了右边
|
2020-08-11 12:00:08 +08:00 |
|
董宏宇
|
8276c6a929
|
Merge remote-tracking branch 'origin/dev_1.1.2' into dev_1.1.2
|
2020-08-11 11:38:43 +08:00 |
|
董宏宇
|
b696445914
|
替换了关闭按钮
|
2020-08-11 11:38:33 +08:00 |
|
liujing
|
3fe74f8bce
|
Merge branch 'uii' into dev_1.1.2
|
2020-08-10 20:54:07 +08:00 |
|
liujing
|
e1443d7222
|
no message
|
2020-08-10 20:54:03 +08:00 |
|
liujing
|
f904f60abb
|
Merge branch 'uii' into dev_1.1.2
|
2020-08-10 20:50:43 +08:00 |
|
liujing
|
656ba6bcca
|
[add] 加载更多xml文件拆分
|
2020-08-10 20:50:39 +08:00 |
|
董宏宇
|
9dd559e3e6
|
Merge remote-tracking branch 'origin/dev_1.1.2' into dev_1.1.2
|
2020-08-10 20:14:15 +08:00 |
|
董宏宇
|
fb11aea16e
|
完成了出行面板列表的部分逻辑
|
2020-08-10 20:14:09 +08:00 |
|
lixiaopeng
|
6ac12a526c
|
fix conflict
|
2020-08-10 19:40:53 +08:00 |
|
liujing
|
98900b516a
|
Merge branch 'uii' into dev_1.1.2
|
2020-08-10 18:29:27 +08:00 |
|
liujing
|
9dea815ebd
|
加载更多动画
|
2020-08-10 18:29:25 +08:00 |
|
董宏宇
|
50800675ae
|
完成了事件面板中的ui
|
2020-08-10 18:01:12 +08:00 |
|
董宏宇
|
0d47a75eb9
|
Merge remote-tracking branch 'origin/dev_1.1.2' into dev_1.1.2
|
2020-08-10 17:56:44 +08:00 |
|
董宏宇
|
2a82dda450
|
完成了事件面板中的ui
|
2020-08-10 17:56:37 +08:00 |
|
liujing
|
4505c39454
|
Merge branch 'uii' into dev_1.1.2
|
2020-08-10 17:35:00 +08:00 |
|
liujing
|
446ebe9e12
|
no message
|
2020-08-10 17:34:57 +08:00 |
|
liujing
|
d8e3c803f3
|
Merge branch 'uii' into dev_1.1.2
|
2020-08-10 17:28:31 +08:00 |
|
liujing
|
fe8a0a8fb1
|
分享列表UI
|
2020-08-10 17:28:28 +08:00 |
|
董宏宇
|
715fe3e0a6
|
Merge remote-tracking branch 'origin/dev_1.1.2' into dev_1.1.2
|
2020-08-10 17:16:13 +08:00 |
|
董宏宇
|
585be68dab
|
优化了事件面板的整体展示tab切换功能
|
2020-08-10 17:16:06 +08:00 |
|
liujing
|
cb4b75de50
|
Merge branch 'uii' into dev_1.1.2
|
2020-08-10 17:12:58 +08:00 |
|
liujing
|
abef99be3d
|
UI
|
2020-08-10 17:12:45 +08:00 |
|
liujing
|
47a2792a44
|
Merge branch 'uii' into dev_1.1.2
|
2020-08-10 17:09:15 +08:00 |
|
liujing
|
373291558e
|
[add] 我的分享列表item-UI
|
2020-08-10 17:09:01 +08:00 |
|
tongchenfei
|
5616b6a829
|
Merge branch 'dev_1.1.2' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev_1.1.2
# Conflicts:
# app/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
# services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
# settings.gradle
|
2020-08-10 14:46:39 +08:00 |
|
tongchenfei
|
ec50a12a6c
|
添加探路api接口实现
|
2020-08-10 14:39:15 +08:00 |
|
liujing
|
8e975055cf
|
Merge branch 'uii' into dev_1.1.2
|
2020-08-10 11:47:03 +08:00 |
|
liujing
|
35fd5bfccd
|
[add] 我的分享-UI
|
2020-08-10 11:46:43 +08:00 |
|
tongchenfei
|
ee53d50cdb
|
迁移探路模块和tanlulib代码至此
|
2020-08-10 11:29:55 +08:00 |
|
董宏宇
|
811b9b93de
|
Merge branch 'dev' into dev_1.1.2
|
2020-08-10 11:24:47 +08:00 |
|
董宏宇
|
7fed343580
|
Merge branch 'qa_1.1' into dev
|
2020-08-10 11:24:32 +08:00 |
|
董宏宇
|
43188780f4
|
升级版本
|
2020-08-10 11:23:50 +08:00 |
|