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

rc

Browse Source
This commit is contained in:
wangcongtao
2020-06-10 19:11:07 +08:00
parent cd0d15b1b6 7ab058a8f5
commit 1faef8ed75
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -86,9 +86,9 @@ android {
// 是否启动位置服务
buildConfigField 'boolean', 'LAUNCH_LOCATION_SERVICE', 'true'
// 是否使用自定义导航
buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'true'
// 是否作为 launcher 运行
buildConfigField 'boolean', 'IS_LAUNCHER', 'true'
buildConfigField 'boolean', 'IS_LAUNCHER', 'false'
}
// f系列-分体机全系列，未细分
f8xx{

6
gradle.properties
View File

@@ -60,9 +60,9 @@ MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.0.0.1
# 探路
MOGO_MODULE_TANLU_VERSION=1.1.0.1-SNAPSHOT
# 车聊聊
CARCHATTING_VERSION=1.0.4-SNAPSHOT
CARCHATTING_VERSION=1.0.6-SNAPSHOT
# 车聊聊接口
CARCHATTINGPROVIDER_VERSION=1.0.4-SNAPSHOT
CARCHATTINGPROVIDER_VERSION=1.0.6-SNAPSHOT
# 视频引导
MOGO_MODULE_GUIDESHOW_VERSION=1.0.2-SNAPSHOT
# 视频引导接口
@@ -70,7 +70,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT
# 在线车辆F
MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2
# v2x
MOGO_MODULE_V2X_VERSION=1.0.32
MOGO_MODULE_V2X_VERSION=1.0.35
# 媒体卡片
MOGO_MODULE_MEDIA_VERSION=1.0.4.11
# 推送

9
libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/RoadSearchClient.java
View File

@@ -59,9 +59,10 @@ public class RoadSearchClient implements IMogoRoadSearch, RouteSearch.OnRouteSea
}
}
RouteSearch.DriveRouteQuery searchQuery = new RouteSearch.DriveRouteQuery( fromAndTo, RouteSearch.DRIVING_SINGLE_SHORTEST, latLonPointWays, null, "" );
RouteSearch.DriveRouteQuery searchQuery = new RouteSearch.DriveRouteQuery( fromAndTo, RouteSearch.DRIVING_MULTI_CHOICE_AVOID_CONGESTION, latLonPointWays, null, "" );
if ( mRouteSearch == null ) {
mRouteSearch = new RouteSearch( context );
mRouteSearch.setRouteSearchListener(this);
}
mRouteSearch.calculateDriveRouteAsyn( searchQuery );
}
@@ -94,14 +95,18 @@ public class RoadSearchClient implements IMogoRoadSearch, RouteSearch.OnRouteSea
return;
}
List< MogoLatLng > points = new ArrayList<>();
Logger.d(TAG,"onDriveRouteSearched i : " + i);
if ( driveRouteResult == null
|| driveRouteResult.getPaths() == null
|| driveRouteResult.getPaths().isEmpty() ) {
Logger.d(TAG,"onDriveRouteSearched result is null");
mListener.onDrivePathSearched( null );
return;
}
DrivePath drivePath = driveRouteResult.getPaths().get( 0 );
int size = driveRouteResult.getPaths().size();
Logger.d(TAG,"onDriveRouteSearched driveRouteResult size : " + size);
List< DriveStep > steps = drivePath.getSteps();
if ( steps == null || steps.isEmpty() ) {
mListener.onDrivePathSearched( null );

9
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsFragment.java
View File

@@ -17,6 +17,8 @@ import com.mogo.utils.LaunchUtils;
import com.mogo.utils.glide.GlideApp;
import com.mogo.utils.logger.Logger;
import retrofit2.http.HEAD;
/**
* 天气，消息，个人头像
*
@@ -116,10 +118,9 @@ public class ExtensionsFragment extends MvpFragment< ExtensionsView, ExtensionsP
@Override
public void renderUserInfo(UserInfo userInfo) {
Logger.d(TAG, "renderUserInfo: " + userInfo);
if ( userInfo == null ) {
return;
if(userInfo != null){
Logger.d(TAG, "renderUserInfo: " + userInfo);
GlideApp.with(getContext()).load(userInfo.getHeadImgurl()).circleCrop().into(mUserHeadImg);
}
GlideApp.with(getContext()).load(userInfo.getHeadImgurl()).circleCrop().into(mUserHeadImg);
}
}