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

.idea

Merge branch 'demo/shunyi_v2v' into demo/shunyi_v2v_merge

2020-09-04 17:32:26 +08:00

app

Merge branch 'demo/shunyi_v2v' into demo/shunyi_v2v_merge

2020-09-04 17:32:26 +08:00

foudations

1. 不支持语音预激活

2020-08-17 16:58:49 +08:00

gradle

dev

2019-12-30 16:35:51 +08:00

keystore

dev

2019-12-24 15:49:57 +08:00

libraries

1. 整理依赖

2020-08-21 19:29:12 +08:00

main-extensions

1. merge

2020-08-21 21:23:51 +08:00

modules

Merge branch 'demo/shunyi_v2v' into demo/shunyi_v2v_merge

2020-09-04 17:32:26 +08:00

services

Merge branch 'demo/shunyi_v2v' into demo/shunyi_v2v_merge

2020-09-04 17:32:26 +08:00

.gitignore

修改了1024的适配方案

2020-01-19 13:34:40 +08:00

build.gradle

1. 整理依赖

2020-08-21 19:29:12 +08:00

config.gradle

Merge branch 'dev' into demo/shunyi_v2v_merge

2020-08-24 14:07:37 +08:00

gradle.properties

顺义分支和dev分支合并

2020-08-19 14:54:15 +08:00

gradlew

Initial commit

2019-12-23 15:08:04 +08:00

gradlew.bat

Initial commit

2019-12-23 15:08:04 +08:00

javadoc.gradle

dev

2019-12-30 16:35:51 +08:00

javadoc.sh

opt

2019-12-31 10:37:41 +08:00

map-upload.sh

opt

2020-04-26 14:06:57 +08:00

settings.gradle

抽离导航中的悬浮按钮逻辑

2020-08-12 15:13:02 +08:00

upload.sh

将推送代码接入主工程

2020-07-31 13:22:26 +08:00

Description

No description provided

1.1 GiB

Languages

Kotlin 59.4%

Java 40.3%

GLSL 0.2%