diff --git a/.idea/misc.xml b/.idea/misc.xml index 2dc54c489f..707ee6e613 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java index ff3e92177d..0ea6d4e7e9 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java @@ -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 + '\'' + '}'; } diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_map_layout_navi_info_panel.xml b/modules/mogo-module-extensions/src/main/res/layout/module_map_layout_navi_info_panel.xml index 72c31ddb81..e9791c0c7b 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_map_layout_navi_info_panel.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_map_layout_navi_info_panel.xml @@ -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" /> diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml index 6d93ddb575..05f3fc78bc 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml @@ -79,7 +79,7 @@ 159px 24px 24px - 20px + 40px 60px 12px 16px diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/base/BaseFragment.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/base/BaseFragment.java index 027aa724ce..d8f6584ede 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/base/BaseFragment.java +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/base/BaseFragment.java @@ -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); } } diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/uitls/BitmapUtils.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/uitls/BitmapUtils.java index 64600da9da..d5837536b3 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/uitls/BitmapUtils.java +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/uitls/BitmapUtils.java @@ -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 { diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java index e88909d290..32bb168011 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java @@ -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); } } diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluServiceHandler.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluServiceHandler.java index d93a4bec33..116483aed8 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluServiceHandler.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluServiceHandler.java @@ -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();