yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/v1.0.0' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v1.0.0

Browse Source
This commit is contained in:
wangcongtao
2020-02-26 19:20:35 +08:00
parent f9e7638f9c 232daa0373
commit 4781b10eba
8 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
</project>

10
modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java
View File

@@ -64,6 +64,7 @@ public class MarkerNoveltyInfo {
private String gasPrices;
private boolean displayNavigation;
private boolean desplayHost;
private boolean fabulous;
private String styleType;
public String getContent() {
@@ -146,6 +147,14 @@ public class MarkerNoveltyInfo {
this.desplayHost = desplayHost;
}
public boolean isFabulous() {
return fabulous;
}
public void setFabulous(boolean fabulous) {
this.fabulous = fabulous;
}
@Override
public String toString() {
return "ContentData{" +
@@ -158,6 +167,7 @@ public class MarkerNoveltyInfo {
", gasPrices='" + gasPrices + '\'' +
", displayNavigation=" + displayNavigation +
", desplayHost=" + desplayHost +
", fabulous=" + fabulous +
", styleType='" + styleType + '\'' +
'}';
}

1
modules/mogo-module-extensions/src/main/res/layout/module_map_layout_navi_info_panel.xml
View File

@@ -22,6 +22,7 @@
android:layout_marginTop="@dimen/module_ext_navi_info_panel_next_info_distance_marginTop"
android:layout_toRightOf="@+id/module_map_id_navi_next_info_road_turn_icon"
android:textColor="#282828"
android:textStyle="bold"
android:textSize="@dimen/module_ext_navi_info_panel_next_info_distance_textSize"
tools:text="53" />

2
modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
View File

@@ -79,7 +79,7 @@
<dimen name="module_ext_navi_info_panel_turn_icon_height">159px</dimen>
<dimen name="module_ext_navi_info_panel_turn_icon_marginLeft">24px</dimen>
<dimen name="module_ext_navi_info_panel_turn_icon_marginTop">24px</dimen>
<dimen name="module_ext_navi_info_panel_next_info_distance_marginTop">20px</dimen>
<dimen name="module_ext_navi_info_panel_next_info_distance_marginTop">40px</dimen>
<dimen name="module_ext_navi_info_panel_next_info_distance_textSize">60px</dimen>
<dimen name="module_ext_navi_info_panel_next_info_distance_unit_marginLeft">12px</dimen>
<dimen name="module_ext_navi_info_panel_next_info_distance_unit_marginBottom">16px</dimen>

2
modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/base/BaseFragment.java
View File

@@ -92,7 +92,7 @@ public abstract class BaseFragment extends Fragment {
* 移动地图中心点到屏幕右侧
*/
protected void moveMapToRight(){
SearchServiceHolder.INSTANCE.getMapUIController().setPointToCenter(0.66145, 0.590688);
SearchServiceHolder.INSTANCE.getMapUIController().setPointToCenter(0.66145, 0.661094);
}
}

2
modules/mogo-module-search/src/main/java/com/mogo/module/navi/uitls/BitmapUtils.java
View File

@@ -55,7 +55,7 @@ public class BitmapUtils {
}
} else {
if (i == 1) {
canvas.drawText(text, (width - bounds.width()*1.5F) / 2.0F,
canvas.drawText(text, (width - bounds.width()*1.8F) / 2.0F,
(float) (bounds.height() * 1.9),
paint);
}else {

5
modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java
View File

@@ -1263,7 +1263,9 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo;
@Override
public void onSuccess(VoiceSearchResult o) {
String discription = o.getResult().getDescription();
Log.d(TAG, "getVoiceControlRoadData onSuccess ----1--->");
if (o.getResult().getInformations() != null && o.getResult().getInformations().size() > 0) {
Log.d(TAG, "getVoiceControlRoadData onSuccess ----2--->");
if (markerExploreWayList != null && markerExploreWayList.size() > 0) {
markerExploreWayList.clear(); //刷新之前先删除之前的，然后再添加成请求的
currentPosition = 0;
@@ -1283,7 +1285,6 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo;
if (informationList == null || (informationList != null && informationList.size() == 0)) {
return;
}
//清除探路之前的数据
mMarkerManager.removeMarkers(TanluConstants.MODEL_NAME);
//添加埋点数据
@@ -1322,8 +1323,10 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo;
} else {
if (!TextUtils.isEmpty(discription)) {
Log.d(TAG, "getVoiceControlRoadData discription != null else ----1--->");
AIAssist.getInstance(getContext()).speakTTSVoice(discription, null);
} else {
Log.d(TAG, "getVoiceControlRoadData discription == null else ----2--->");
AIAssist.getInstance(getContext()).speakTTSVoice("未找到其他车主分享的路况信息", null);
}
}

3
modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluServiceHandler.java
View File

@@ -37,7 +37,8 @@ public class TanluServiceHandler {
mMapService = ( IMogoMapService ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICES_MAP ).navigation( context );
mImageloader = ( IMogoImageloader ) ARouter.getInstance().build( MogoServicePaths.PATH_UTILS_IMAGE_LOADER ).navigation( context );
mPoiSearch = mMapService.getPoiSearch( context, new MogoPoiSearchQuery() );
mLocationClient = mMapService.getLocationClient( context );
// mLocationClient = mMapService.getLocationClient( context );
mLocationClient = mMapService.getSingletonLocationClient(context);
mMarkerManager = mMapService.getMarkerManager( context );
mNavi = mMapService.getNavi( context );
mMapUIController = mMapService.getMapUIController();