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

opt

Browse Source
This commit is contained in:
wangcongtao
2020-04-01 19:06:55 +08:00
parent e89629a3d3
commit b32663da91
11 changed files with 47 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/mogo/launcher/MogoApplication.java
View File

@@ -40,6 +40,8 @@ public class MogoApplication extends AbsMogoApplication {
@Override
public void onCreate() {
DebugConfig.setNetMode(BuildConfig.NET_ENV);
DebugConfig.setDebug(BuildConfig.DEBUG);
super.onCreate();
// Crash 日志收集
final long start = System.currentTimeMillis();
@@ -77,7 +79,5 @@ public class MogoApplication extends AbsMogoApplication {
protected void attachBaseContext(Context base) {
super.attachBaseContext(base);
MultiDex.install(base);
DebugConfig.setNetMode(BuildConfig.NET_ENV);
DebugConfig.setDebug(BuildConfig.DEBUG);
}
}

38
gradle.properties
View File

@@ -27,24 +27,24 @@ PASSWORD=xintai2018
RELEASE=false
# 模块版本
## 工程内模块
MOGO_MODULE_SHARE_VERSION=1.0.3-SNAPSHOT
MOGO_COMMONS_VERSION=1.0.3-SNAPSHOT
MOGO_UTILS_VERSION=1.0.3-SNAPSHOT
MAP_AMAP_VERSION=1.0.3-SNAPSHOT
MOGO_MAP_VERSION=1.0.3-SNAPSHOT
MOGO_MAP_API_VERSION=1.0.3-SNAPSHOT
MOGO_MODULE_COMMON_VERSION=1.0.3-SNAPSHOT
MOGO_MODULE_MAIN_VERSION=1.0.3-SNAPSHOT
MOGO_MODULE_MAP_VERSION=1.0.3-SNAPSHOT
MOGO_SERVICE_VERSION=1.0.3-SNAPSHOT
MOGO_SERVICE_API_VERSION=1.0.3-SNAPSHOT
MOGO_MODULE_APPS_VERSION=1.0.3-SNAPSHOT
MOGO_CONNECTION_VERSION=1.0.3-SNAPSHOT
MOGO_MODULE_NAVI_VERSION=1.0.3-SNAPSHOT
MOGO_MODULE_SERVICE_VERSION=1.0.3-SNAPSHOT
MOGO_MODULE_EXTENSIONS_VERSION=1.0.3-SNAPSHOT
MOGO_MODULE_SEARCH_VERSION=1.0.3-SNAPSHOT
MOGO_MODULE_BACK_VERSION=1.0.3-SNAPSHOT
MOGO_MODULE_SHARE_VERSION=1.0.3.1-SNAPSHOT
MOGO_COMMONS_VERSION=1.0.3.1-SNAPSHOT
MOGO_UTILS_VERSION=1.0.3.1-SNAPSHOT
MAP_AMAP_VERSION=1.0.3.1-SNAPSHOT
MOGO_MAP_VERSION=1.0.3.1-SNAPSHOT
MOGO_MAP_API_VERSION=1.0.3.1.1-SNAPSHOT
MOGO_MODULE_COMMON_VERSION=1.0.3.1-SNAPSHOT
MOGO_MODULE_MAIN_VERSION=1.0.3.1-SNAPSHOT
MOGO_MODULE_MAP_VERSION=1.0.3.1-SNAPSHOT
MOGO_SERVICE_VERSION=1.0.3.1-SNAPSHOT
MOGO_SERVICE_API_VERSION=1.0.3.1-SNAPSHOT
MOGO_MODULE_APPS_VERSION=1.0.3.1-SNAPSHOT
MOGO_CONNECTION_VERSION=1.0.3.1-SNAPSHOT
MOGO_MODULE_NAVI_VERSION=1.0.3.1-SNAPSHOT
MOGO_MODULE_SERVICE_VERSION=1.0.3.1-SNAPSHOT
MOGO_MODULE_EXTENSIONS_VERSION=1.0.3.1-SNAPSHOT
MOGO_MODULE_SEARCH_VERSION=1.0.3.1-SNAPSHOT
MOGO_MODULE_BACK_VERSION=1.0.3.1-SNAPSHOT
MOGO_MODULE_AUTHORIZE_VERSION=1.0.0-SNAPSHOT
MOGO_MODULE_GUIDE_VERSION=1.0.0-SNAPSHOT
@@ -60,7 +60,7 @@ MOGO_MODULE_GUIDESHOW_VERSION=1.0.2-SNAPSHOT
# 视频引导接口
MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT
# 在线车辆F
MOGO_MODULE_ONLINECAR_VERSION=1.0.3-SNAPSHOT
MOGO_MODULE_ONLINECAR_VERSION=1.0.3.1-SNAPSHOT
# v2x
MOGO_MODULE_V2X_VERSION=1.0.3-SNAPSHOT
# 媒体卡片

1
libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java
View File

@@ -41,6 +41,7 @@ public class NaviClient implements IMogoNavi {
/**
* 导航策略配置
*/
private MogoNaviConfig mMogoNaviConfig = new MogoNaviConfig();
private static volatile NaviClient sInstance;

11
libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java
View File

@@ -158,6 +158,7 @@ public class NaviListenerAdapter extends AMapNaviListenerAdapter {
@Override
public void onStartNavi( int type ) {
Logger.d( TAG, "onStartNavi type = %s", type );
// 巡航
if ( type != NaviType.CRUISE ) {
setStopped( false );
@@ -223,13 +224,9 @@ public class NaviListenerAdapter extends AMapNaviListenerAdapter {
super.onCalculateRouteSuccess( aMapCalcRouteResult );
Logger.i( TAG, "导航规划成功" );
setStopped( false );
WorkThreadHandler.getInstance().post( ()->{
mNaviOverlayHelper.showCalculatedPaths(()->{
UiThreadHandler.post( ()->{
MogoNaviListenerHandler.getInstance().onCalculateSuccess();
AMapMessageManager.getInstance().postCalculateSuccess();
} );
});
mNaviOverlayHelper.showCalculatedPaths( () -> {
AMapMessageManager.getInstance().postCalculateSuccess();
MogoNaviListenerHandler.getInstance().onCalculateSuccess();
} );
}

10
libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviOverlayHelper.java
View File

@@ -170,6 +170,7 @@ public class NaviOverlayHelper implements OnCalculatePathItemClickInteraction {
}
public void showBounds() {
Logger.d( TAG, "showBounds" );
showPathsBound( getBounds(), null );
}
@@ -187,11 +188,9 @@ public class NaviOverlayHelper implements OnCalculatePathItemClickInteraction {
mBoundRect.right,
mBoundRect.top,
mBoundRect.bottom ));
UiThreadHandler.postDelayed( ()->{
if ( after != null ) {
after.run();
}
}, 2000 );
if ( after != null ) {
after.run();
}
}
private void checkAMapInstance() {
@@ -218,6 +217,7 @@ public class NaviOverlayHelper implements OnCalculatePathItemClickInteraction {
//wrapper.setStartBitmap( R.drawable.ic_navi_start )
// .setEndBitmap( R.drawable.ic_navi_target );
mAMapNavi.selectRouteId( item.getId() );
Logger.d( TAG, "renderPathOverlay set default path" );
}
wrapper.addToMap();
wrapper.setTransparency( i == 0 ? AMAP_ROUTE_OVERLAY_TRANSPARENCY_SELECTED : AMAP_ROUTE_OVERLAY_TRANSPARENCY_UNSELECTED );

6
modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java
View File

@@ -43,9 +43,9 @@ public class AppFilterImpl implements AppFilter {
if ( !AppEnumHelper.isCustomizedApp( packageInfo.packageName ) ) {
return true;
}
if ( noLaunchIntent( packageInfo ) ) {
return true;
}
// if ( noLaunchIntent( packageInfo ) ) {
// return true;
// }
return false;
}

5
modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java
View File

@@ -65,7 +65,7 @@ public enum AppEnum {
AUX( "AUX", "com.nwd.auxin", R.drawable.module_apps_ic_aux ),
//FM
FM( "FM", "com.nwd.radio", R.drawable.module_apps_ic_fm ),
FM( "FM收音机", "com.nwd.radio", R.drawable.module_apps_ic_fm ),
// 新鲜事
FreshThings( "新鲜事", "com.zhidao.fresh.things", R.drawable.module_apps_ic_fresh_things ),
@@ -78,6 +78,9 @@ public enum AppEnum {
// 车辆信息
CanBus( "车辆信息", "com.zd.canbus", R.drawable.module_apps_ic_canbus ),
// 蓝牙电话
BT_PHONE( "蓝牙电话", "com.nwd.android.phone", R.drawable.module_apps_ic_bt_phone ),
;
private String mName;

2
modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java
View File

@@ -122,7 +122,7 @@ public class AppsModel {
private String getApplicationName( PackageManager packageManager, PackageInfo packageInfo ) {
String name = packageManager.getApplicationLabel( packageInfo.applicationInfo ).toString();
if ( name.startsWith( "com." ) || name.split( "." ).length > 3 ) {
if ( AppEnumHelper.isCustomizedApp( packageInfo.packageName ) ) {
return AppEnumHelper.getTargetName( packageInfo.packageName );
}
return name;

BIN
modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_bt_phone.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.3 KiB

BIN
modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_bt_phone.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

15
modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeManagerImpl.kt
View File

@@ -18,13 +18,14 @@ open abstract class MogoAuthorizeManagerImpl : IMogoAuthorizeInvoke {
private val baseController: IMogoAuthorizeController by lazy { IMogoAuthorizeController() }
override fun needAuthorize(tag: String): Boolean {
return if (isDeviceOfD()) {
Logger.d(TAG, "needAuthorize update agreement in background")
baseController.updateAgreementVersion(tag.toAuthorizeType())
needAuthorization(tag.toAuthorizeType())
} else {
false
}
// return if (isDeviceOfD()) {
// Logger.d(TAG, "needAuthorize update agreement in background")
// baseController.updateAgreementVersion(tag.toAuthorizeType())
// needAuthorization(tag.toAuthorizeType())
// } else {
// false
// }
return false
}
override fun invokeAuthorizeContent(tag: String) {