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

merge

Browse Source
This commit is contained in:
unknown
2020-11-13 17:36:37 +08:00
parent cc6f07544a 0402012140
commit b0b72d5823
515 changed files with 13820 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@@ -4,7 +4,7 @@
<asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
<groovy codeStyle="LEGACY" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
</project>

29
app/build.gradle
View File

@@ -88,7 +88,6 @@ android {
buildConfigField 'String', 'SOCKET_APP_ID', '\"com.mogo.launcher\"'
// 是否支持目的地导航策略
buildConfigField 'boolean', 'IS_SUPPORT_SCHEDULE_CALCULATE_NOT_HOME_COMPANY_DISTANCE_FOR_PUSH', 'true'
}
// launcher app
launcher {
@@ -118,6 +117,8 @@ android {
buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true'
// 是否支持桌面卡片刷新
buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false'
// 是否基于地图
buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
}
// f系列-分体机
f80x {
@@ -136,6 +137,8 @@ android {
buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true'
// 是否支持桌面卡片刷新
buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false'
// 是否基于地图
buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
}
// e系列，采用Launcher方案
e8xx {
@@ -154,6 +157,8 @@ android {
buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true'
// 是否支持桌面卡片刷新
buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false'
// 是否基于地图
buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
}
// 同上
em4 {
@@ -172,6 +177,8 @@ android {
buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true'
// 是否支持桌面卡片刷新
buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false'
// 是否基于地图
buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
}
// e系列-2+32，对标D系列2+32，采用独立app的形式
em3 {
@@ -190,6 +197,8 @@ android {
buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true'
// 是否支持桌面卡片刷新
buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'true'
// 是否基于地图
buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
}
// e系列-1+16，对标D系列1+16，采用独立app形式
em1 {
@@ -208,6 +217,8 @@ android {
buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true'
// 是否支持桌面卡片刷新
buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'true'
// 是否基于地图
buildConfigField 'boolean', 'IS_MAP_BASED', 'false'
}
// d系列
d8xx {
@@ -226,6 +237,8 @@ android {
buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true'
// 是否支持桌面卡片刷新
buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'true'
// 是否基于地图
buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
}
// d系列 2 + 32
d80x {
@@ -244,6 +257,8 @@ android {
buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true'
// 是否支持桌面卡片刷新
buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'true'
// 是否基于地图
buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
}
// d系列 1+16 版本
d82x {
@@ -262,6 +277,8 @@ android {
buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true'
// 是否支持桌面卡片刷新
buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'true'
// 是否基于地图
buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
}
// 比亚迪
bydauto {
@@ -280,6 +297,8 @@ android {
buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'false'
// 是否支持桌面卡片刷新
buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false'
// 是否基于地图
buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
}
qa {
dimension "env"
@@ -339,13 +358,15 @@ dependencies {
implementation rootProject.ext.dependencies.modulemedia
implementation rootProject.ext.dependencies.moduleservice
implementation rootProject.ext.dependencies.modulesplash
implementation rootProject.ext.dependencies.mogoservice
implementation rootProject.ext.dependencies.moduleV2x
implementation rootProject.ext.dependencies.moduleshare
implementation rootProject.ext.dependencies.tanluupload
implementation rootProject.ext.dependencies.mogomonitor
implementation rootProject.ext.dependencies.mogomoduleback
implementation rootProject.ext.dependencies.guideshow
implementation rootProject.ext.dependencies.moduleextensions
implementation rootProject.ext.dependencies.modulemap
} else {
implementation project(':foudations:mogo-commons')
implementation project(':modules:mogo-module-common')
@@ -354,13 +375,15 @@ dependencies {
implementation project(':modules:mogo-module-media')
implementation project(':modules:mogo-module-service')
implementation project(':modules:mogo-module-splash')
implementation project(':modules:mogo-module-service')
implementation project(':modules:mogo-module-v2x')
implementation project(':modules:mogo-module-share')
implementation project(':libraries:tanlulib')
implementation project(':modules:mogo-module-monitor')
implementation project(':modules:mogo-module-back')
implementation project(':modules:mogo-module-guide')
implementation project(':modules:mogo-module-extensions')
implementation project(':modules:mogo-module-map')
}
apply from: "./functions/perform.gradle"

6
app/functions/perform.gradle
View File

@@ -4,8 +4,14 @@ project.dependencies {
if (Boolean.valueOf(RELEASE)) {
launcherImplementation rootProject.ext.dependencies.modulemainlauncher
independentImplementation rootProject.ext.dependencies.modulemainindependent
// 仅launcher需要引入该模块
launcherImplementation rootProject.ext.dependencies.moduleapps
} else {
launcherImplementation project(':main-extensions:mogo-module-main-launcher')
independentImplementation project(':main-extensions:mogo-module-main-independent')
// 仅launcher需要引入该模块
launcherImplementation project(':modules:mogo-module-apps')
}
}

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

@@ -131,6 +131,7 @@ public class MogoApplication extends AbsMogoApplication {
DebugConfig.setSupportedSearchDestinationOnlineCarList( BuildConfig.IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST );
DebugConfig.setScheduleCalculateNotHomeCompanyDistanceForPush( BuildConfig.IS_SUPPORT_SCHEDULE_CALCULATE_NOT_HOME_COMPANY_DISTANCE_FOR_PUSH );
DebugConfig.setSupportLauncherCardRefreshStrategy( BuildConfig.IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY );
DebugConfig.setMapBased( BuildConfig.IS_MAP_BASED );
}
@Override
@@ -143,7 +144,6 @@ public class MogoApplication extends AbsMogoApplication {
super.init();
final IMogoServiceApis apis = MogoApisHandler.getInstance().getApis();
prepareBaseService( apis, 2_000L );
// installSkinManager( this, apis );
}
/**

17
foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
View File

@@ -143,16 +143,13 @@ public class AbsMogoApplication extends Application {
NetConfig.instance().setSignaturePrefix( Constants.SIGN_PREFIX )
.setPublicParams( ParamsUtil.getStaticParams() )
.setHostnameVerifier( new AllAllowedHostnameVerifier() )
.addNetworkInterceptor( new Interceptor() {
@Override
public Response intercept( Chain chain ) throws IOException {
Request original = chain.request();
Request request = original.newBuilder()
.header( "token", SpStorage.getTicket() )
.method( original.method(), original.body() )
.build();
return chain.proceed( request );
}
.addNetworkInterceptor( chain -> {
Request original = chain.request();
Request request = original.newBuilder()
.header( "token", SpStorage.getTicket() )
.method( original.method(), original.body() )
.build();
return chain.proceed( request );
} )
.setLoggable( DebugConfig.isDebug() );
}

26
foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
View File

@@ -282,4 +282,30 @@ public class DebugConfig {
public static boolean isIsSupportLauncherCardRefreshStrategy() {
return isSupportLauncherCardRefreshStrategy;
}
/**
* 是否需要刷新个人信息
*/
private static boolean needRequestUserInfo = false;
public static void setNeedRequestUserInfo( boolean needRequestUserInfo ) {
DebugConfig.needRequestUserInfo = needRequestUserInfo;
}
public static boolean isNeedRequestUserInfo() {
return needRequestUserInfo;
}
/**
* 是否基于地图
*/
private static boolean isMapBased = true;
public static boolean isMapBased() {
return isMapBased;
}
public static void setMapBased( boolean isMapBased ) {
DebugConfig.isMapBased = isMapBased;
}
}

27
libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
View File

@@ -439,9 +439,6 @@ public class AMapNaviViewWrapper implements IMogoMapView,
@Override
public MapControlResult changeZoom( float zoom ) {
Logger.d( TAG, "changeZoom %s", zoom );
if ( DebugConfig.isDebug() ) {
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
}
getMap().changeZoom( zoom );
return MapControlResult.SUCCESS;
}
@@ -520,9 +517,6 @@ public class AMapNaviViewWrapper implements IMogoMapView,
Logger.e( TAG, "latlng = null or is illegal" );
return;
}
if ( DebugConfig.isDebug() ) {
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
}
loseLockMode();
if ( animate ) {
mMapView.getMap().animateCamera( CameraUpdateFactory.newLatLng( new LatLng( latLng.lat, latLng.lng ) ) );
@@ -537,9 +531,6 @@ public class AMapNaviViewWrapper implements IMogoMapView,
if ( visible && NaviClient.getInstance( getContext() ).isNaviing() ) {
return;
}
if ( DebugConfig.isDebug() ) {
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
}
if ( checkAMapView() ) {
MyLocationStyle style = getMyLocationStyle();
if ( style == null ) {
@@ -565,9 +556,6 @@ public class AMapNaviViewWrapper implements IMogoMapView,
if ( NaviClient.getInstance( getContext() ).isNaviing() ) {
return;
}
if ( DebugConfig.isDebug() ) {
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
}
if ( checkAMapView() ) {
MyLocationStyle style = getMyLocationStyle();
if ( style == null ) {
@@ -647,9 +635,6 @@ public class AMapNaviViewWrapper implements IMogoMapView,
@Override
public void recoverLockMode() {
if ( checkAMapView() ) {
if ( DebugConfig.isDebug() ) {
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
}
Logger.d( TAG, "锁车" );
mMapView.recoverLockMode();
changeMyLocationType2Follow();
@@ -659,9 +644,6 @@ public class AMapNaviViewWrapper implements IMogoMapView,
@Override
public void loseLockMode() {
if ( DebugConfig.isDebug() ) {
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
}
Logger.d( TAG, "解锁锁车" );
mIsCarLocked = false;
mockTouchEvent();
@@ -683,9 +665,6 @@ public class AMapNaviViewWrapper implements IMogoMapView,
@Override
public void setLockZoom( int var1 ) {
if ( checkAMapView() ) {
if ( DebugConfig.isDebug() ) {
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
}
Logger.d( TAG, "Zoom锁定锁车比例尺 %s", var1 );
// mMapView.setLockZoom( var1 );
}
@@ -787,9 +766,6 @@ public class AMapNaviViewWrapper implements IMogoMapView,
@Override
public void setPointToCenter( double mapCenterX, double mapCenterY ) {
if ( checkAMapView() ) {
if ( DebugConfig.isDebug() ) {
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
}
Logger.d( TAG, "setPointToCenter(%s, %s)", mapCenterX, mapCenterY );
AMapNaviViewOptions options = mMapView.getViewOptions();
options.setPointToCenter( mapCenterX, mapCenterY );
@@ -866,9 +842,6 @@ public class AMapNaviViewWrapper implements IMogoMapView,
return;
}
try {
if ( DebugConfig.isDebug() ) {
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
}
LatLngBounds latLngBounds = MogoMapUtils.getLatLngBounds( carPosition, lonLats, lockCarPosition );
if ( !lockCarPosition ) {
loseLockMode();

29
libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java
View File

@@ -204,7 +204,6 @@ public class AMapViewWrapper implements IMogoMapView,
@Override
public void onCreate( Bundle bundle ) {
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
if ( mMapView != null ) {
mMapView.onCreate( bundle );
Logger.d( TAG, "map onCreate" );
@@ -218,7 +217,6 @@ public class AMapViewWrapper implements IMogoMapView,
public void onResume() {
if ( mMapView != null ) {
mMapView.onResume();
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
Logger.d( TAG, "map onResume" );
}
}
@@ -352,9 +350,6 @@ public class AMapViewWrapper implements IMogoMapView,
@Override
public MapControlResult changeZoom( float zoom ) {
Logger.d( TAG, "changeZoom %s", zoom );
if ( DebugConfig.isDebug() ) {
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
}
getMap().changeZoom( zoom );
return MapControlResult.SUCCESS;
}
@@ -403,9 +398,6 @@ public class AMapViewWrapper implements IMogoMapView,
Logger.e( TAG, "latlng = null or is illegal" );
return;
}
if ( DebugConfig.isDebug() ) {
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
}
loseLockMode();
if ( animate ) {
mMapView.getMap().animateCamera( CameraUpdateFactory.newLatLng( new LatLng( latLng.lat, latLng.lng ) ) );
@@ -420,9 +412,6 @@ public class AMapViewWrapper implements IMogoMapView,
if ( visible && NaviClient.getInstance( getContext() ).isNaviing() ) {
return;
}
if ( DebugConfig.isDebug() ) {
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
}
if ( checkMapView() ) {
MyLocationStyle style = getMyLocationStyle();
if ( style == null ) {
@@ -442,9 +431,6 @@ public class AMapViewWrapper implements IMogoMapView,
if ( NaviClient.getInstance( getContext() ).isNaviing() ) {
return;
}
if ( DebugConfig.isDebug() ) {
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
}
if ( checkMapView() ) {
MyLocationStyle style = getMyLocationStyle();
if ( style == null ) {
@@ -487,9 +473,6 @@ public class AMapViewWrapper implements IMogoMapView,
@Override
public void recoverLockMode() {
if ( checkMapView() ) {
if ( DebugConfig.isDebug() ) {
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
}
Logger.d( TAG, "锁车" );
Location target = NaviClient.getInstance( getContext() ).getCarLocation2();
if ( target != null ) {
@@ -528,9 +511,6 @@ public class AMapViewWrapper implements IMogoMapView,
@Override
public void loseLockMode() {
if ( DebugConfig.isDebug() ) {
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
}
Logger.d( TAG, "解锁锁车" );
MyLocationStyle style = getMyLocationStyle();
style.myLocationType( MyLocationStyle.LOCATION_TYPE_FOLLOW_NO_CENTER );
@@ -554,9 +534,6 @@ public class AMapViewWrapper implements IMogoMapView,
@Override
public void setLockZoom( int var1 ) {
if ( checkMapView() ) {
if ( DebugConfig.isDebug() ) {
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
}
Logger.d( TAG, "Zoom锁定锁车比例尺 %s", var1 );
// mMapView.setLockZoom( var1 );
}
@@ -656,9 +633,6 @@ public class AMapViewWrapper implements IMogoMapView,
@Override
public void setPointToCenter( double mapCenterX, double mapCenterY ) {
if ( checkMapView() ) {
if ( DebugConfig.isDebug() ) {
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
}
Logger.d( TAG, "setPointToCenter(%s, %s)", mapCenterX, mapCenterY );
mMapView.getMap().setPointToCenter( ( ( int ) ( mapCenterX * WindowUtils.getScreenWidth( getContext() ) ) ),
( ( int ) ( mapCenterY * WindowUtils.getScreenHeight( getContext() ) ) ) );
@@ -734,9 +708,6 @@ public class AMapViewWrapper implements IMogoMapView,
return;
}
try {
if ( DebugConfig.isDebug() ) {
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
}
LatLngBounds latLngBounds = MogoMapUtils.getLatLngBounds( carPosition, lonLats, lockCarPosition );
if ( !lockCarPosition ) {
loseLockMode();

2
libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/AimlessClient.java
View File

@@ -57,7 +57,7 @@ public class AimlessClient implements IMogoAimless {
mAMapNavi = AMapNavi.getInstance(mContext);
mAMapNavi.setEmulatorNaviSpeed(120);
mAMapNavi.setUseInnerVoice(true, true);
// mAMapNavi.stopSpeak();
mAMapNavi.stopSpeak();
mAimlessModeListener = new AimlessModeListenerAdapter() {
};
mAMapNavi.addAimlessModeListener(mAimlessModeListener);

4
libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java
View File

@@ -53,7 +53,6 @@ public class MogoMarkerManager implements IMogoMarkerManager {
try {
return MogoMap.getInstance().getMogoMap().addMarker( tag, options );
} catch ( Exception e ) {
Logger.e( TAG, Log.getStackTraceString( e ) );
return null;
}
}
@@ -70,13 +69,11 @@ public class MogoMarkerManager implements IMogoMarkerManager {
@Override
public void removeMarkers( String tag ) {
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
MogoMarkersHandler.getInstance().remove( tag );
}
@Override
public void removeMarkers() {
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
MogoMarkersHandler.getInstance().removeAll();
}
@@ -92,7 +89,6 @@ public class MogoMarkerManager implements IMogoMarkerManager {
@Override
public void removeMarkersExcept( String tag ) {
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
MogoMarkersHandler.getInstance().deleteAllExcept( tag );
}

18
libraries/mogo-tanlu-api/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlulib.java Normal file
View File

@@ -0,0 +1,18 @@
package com.alibaba.android.arouter.routes;
import com.alibaba.android.arouter.facade.enums.RouteType;
import com.alibaba.android.arouter.facade.model.RouteMeta;
import com.alibaba.android.arouter.facade.template.IRouteGroup;
import com.zhidao.mogo.tanlu.api.MogoTanluApiProvider;
import java.lang.Override;
import java.lang.String;
import java.util.Map;
/**
* DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
public class ARouter$$Group$$tanlulib implements IRouteGroup {
@Override
public void loadInto(Map<String, RouteMeta> atlas) {
atlas.put("/tanlulib/api", RouteMeta.build(RouteType.PROVIDER, MogoTanluApiProvider.class, "/tanlulib/api", "tanlulib", null, -1, -2147483648));
}
}

18
libraries/mogo-tanlu-api/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogotanluapi.java Normal file
View File

@@ -0,0 +1,18 @@
package com.alibaba.android.arouter.routes;
import com.alibaba.android.arouter.facade.enums.RouteType;
import com.alibaba.android.arouter.facade.model.RouteMeta;
import com.alibaba.android.arouter.facade.template.IProviderGroup;
import com.zhidao.mogo.tanlu.api.MogoTanluApiProvider;
import java.lang.Override;
import java.lang.String;
import java.util.Map;
/**
* DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
public class ARouter$$Providers$$mogotanluapi implements IProviderGroup {
@Override
public void loadInto(Map<String, RouteMeta> providers) {
providers.put("com.mogo.service.share.IMogoTanluProvider", RouteMeta.build(RouteType.PROVIDER, MogoTanluApiProvider.class, "/tanlulib/api", "tanlulib", null, -1, -2147483648));
}
}

17
libraries/mogo-tanlu-api/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Root$$mogotanluapi.java Normal file
View File

@@ -0,0 +1,17 @@
package com.alibaba.android.arouter.routes;
import com.alibaba.android.arouter.facade.template.IRouteGroup;
import com.alibaba.android.arouter.facade.template.IRouteRoot;
import java.lang.Class;
import java.lang.Override;
import java.lang.String;
import java.util.Map;
/**
* DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
public class ARouter$$Root$$mogotanluapi implements IRouteRoot {
@Override
public void loadInto(Map<String, Class<? extends IRouteGroup>> routes) {
routes.put("tanlulib", ARouter$$Group$$tanlulib.class);
}
}

18
libraries/mogo-tanlu-api/build/generated/source/buildConfig/debug/com/zhidao/mogo/tanlu/api/BuildConfig.java Normal file
View File

@@ -0,0 +1,18 @@
/**
* Automatically generated file. DO NOT MODIFY
*/
package com.zhidao.mogo.tanlu.api;
public final class BuildConfig {
public static final boolean DEBUG = Boolean.parseBoolean("true");
public static final String LIBRARY_PACKAGE_NAME = "com.zhidao.mogo.tanlu.api";
/**
* @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
*/
@Deprecated
public static final String APPLICATION_ID = "com.zhidao.mogo.tanlu.api";
public static final String BUILD_TYPE = "debug";
public static final String FLAVOR = "";
public static final int VERSION_CODE = 1;
public static final String VERSION_NAME = "2.0.0";
}

12
libraries/mogo-tanlu-api/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.zhidao.mogo.tanlu.api"
android:versionCode="1"
android:versionName="2.0.0" >
<uses-sdk
android:minSdkVersion="19"
android:targetSdkVersion="22" />
/
</manifest>

1
libraries/mogo-tanlu-api/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json Normal file
View File

@@ -0,0 +1 @@
[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"2.0.0","enabled":true,"outputFile":"mogo-tanlu-api-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.zhidao.mogo.tanlu.api","split":""}}]

1
libraries/mogo-tanlu-api/build/intermediates/annotation_processor_list/debug/annotationProcessors.json Normal file
View File

@@ -0,0 +1 @@
{"jetified-arouter-compiler-1.2.2.jar (com.alibaba:arouter-compiler:1.2.2)":false,"auto-service-1.0-rc2.jar (com.google.auto.service:auto-service:1.0-rc2)":false}

0
libraries/mogo-tanlu-api/build/intermediates/annotations_typedef_file/debug/extractDebugAnnotations/typedefs.txt Normal file
View File

BIN
libraries/mogo-tanlu-api/build/intermediates/compile_library_classes/debug/classes.jar Normal file
View File

Binary file not shown.

BIN
libraries/mogo-tanlu-api/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar Normal file
View File

Binary file not shown.

0
libraries/mogo-tanlu-api/build/intermediates/consumer_proguard_file/debug/proguard.txt Normal file
View File

BIN
libraries/mogo-tanlu-api/build/intermediates/incremental/debug-mergeJavaRes/merge-state Normal file
View File

Binary file not shown.

BIN
libraries/mogo-tanlu-api/build/intermediates/incremental/debug-mergeNativeLibs/merge-state Normal file
View File

Binary file not shown.

2
libraries/mogo-tanlu-api/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/debug/jniLibs"/></dataSet></merger>

2
libraries/mogo-tanlu-api/build/intermediates/incremental/mergeDebugShaders/merger.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/debug/shaders"/></dataSet></merger>

2
libraries/mogo-tanlu-api/build/intermediates/incremental/packageDebugAssets/merger.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/assets"/><source path="/Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/build/intermediates/shader_assets/debug/compileDebugShaders/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/debug/assets"/></dataSet></merger>

1
libraries/mogo-tanlu-api/build/intermediates/incremental/packageDebugResources/compile-file-map.properties Normal file
View File

@@ -0,0 +1 @@
#Fri Nov 13 11:02:48 CST 2020

2
libraries/mogo-tanlu-api/build/intermediates/incremental/packageDebugResources/merger.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/res"/><source path="/Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/build/generated/res/rs/debug"/><source path="/Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/res"/><source path="/Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/build/generated/res/rs/debug"/><source path="/Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/debug/res"/></dataSet><mergedItems/></merger>

BIN
libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlulib.class Normal file
View File

Binary file not shown.

BIN
libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogotanluapi.class Normal file
View File

Binary file not shown.

BIN
libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Root$$mogotanluapi.class Normal file
View File

Binary file not shown.

BIN
libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/zhidao/mogo/tanlu/api/BuildConfig.class Normal file
View File

Binary file not shown.

BIN
libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/zhidao/mogo/tanlu/api/MogoTanluApiProvider.class Normal file
View File

Binary file not shown.

BIN
libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/zhidao/mogo/tanlu/api/TanluApiConst.class Normal file
View File

Binary file not shown.

BIN
libraries/mogo-tanlu-api/build/intermediates/library_java_res/debug/res.jar Normal file
View File

Binary file not shown.

12
libraries/mogo-tanlu-api/build/intermediates/library_manifest/debug/AndroidManifest.xml Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.zhidao.mogo.tanlu.api"
android:versionCode="1"
android:versionName="2.0.0" >
<uses-sdk
android:minSdkVersion="19"
android:targetSdkVersion="22" />
/
</manifest>

2
libraries/mogo-tanlu-api/build/intermediates/local_only_symbol_list/debug/parseDebugLibraryResources/R-def.txt Normal file
View File

@@ -0,0 +1,2 @@
R_DEF: Internal format may change without notice
local

14
libraries/mogo-tanlu-api/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt Normal file
View File

@@ -0,0 +1,14 @@
1<?xml version="1.0" encoding="utf-8"?>
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 package="com.zhidao.mogo.tanlu.api"
4 android:versionCode="1"
5 android:versionName="2.0.0" >
6
7 <uses-sdk
8 android:minSdkVersion="19"
8-->/Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml
9 android:targetSdkVersion="22" />
9-->/Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml
10 /
11
12</manifest>

BIN
libraries/mogo-tanlu-api/build/intermediates/merged_java_res/debug/out.jar Normal file
View File

Binary file not shown.

1
libraries/mogo-tanlu-api/build/intermediates/merged_manifests/debug/output.json Normal file
View File

@@ -0,0 +1 @@
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"2.0.0","enabled":true,"outputFile":"mogo-tanlu-api-debug.aar","fullName":"debug","baseName":"debug"},"path":"../../library_manifest/debug/AndroidManifest.xml","properties":{"packageId":"com.zhidao.mogo.tanlu.api","split":""}}]

BIN
libraries/mogo-tanlu-api/build/intermediates/packaged-classes/debug/classes.jar Normal file
View File

Binary file not shown.

2745
libraries/mogo-tanlu-api/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
libraries/mogo-tanlu-api/build/intermediates/runtime_library_classes/debug/classes.jar Normal file
View File

Binary file not shown.

3411
libraries/mogo-tanlu-api/build/intermediates/symbols/debug/R.txt Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
libraries/mogo-tanlu-api/build/outputs/aar/mogo-tanlu-api-debug.aar Normal file
View File

Binary file not shown.

37
libraries/mogo-tanlu-api/build/outputs/logs/manifest-merger-debug-report.txt Normal file
View File

@@ -0,0 +1,37 @@
-- Merging decision tree log ---
manifest
ADDED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml:1:1-5:12
INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml:1:1-5:12
INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml:1:1-5:12
INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml:1:1-5:12
INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml:1:1-5:12
INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml:1:1-5:12
INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml:1:1-5:12
package
ADDED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml:2:5-40
INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml
INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml
android:versionName
INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml
ADDED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml:1:1-5:12
INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml
android:versionCode
INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml
ADDED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml:1:1-5:12
INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml
xmlns:android
ADDED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml:1:11-69
uses-sdk
INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml reason: use-sdk injection requested
INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml
INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml
INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml
INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml
android:targetSdkVersion
INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml
ADDED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml
INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml
android:minSdkVersion
INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml
ADDED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml
INJECTED from /Users/admin/Android/ADAS/Launcher/libraries/mogo-tanlu-api/src/main/AndroidManifest.xml

13
libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
View File

@@ -146,20 +146,9 @@ class CosStatusController : CosStatusCallback {
Log.d(TAG, "videoAndThumbMap.size == 2 ")
var locationInfo = LocationUtil.getInstance().getLocationInfo()
val locationStr: String = Gson().toJson(locationInfo)
Log.d(TAG, "locationStr = " + locationStr)
//如果失败，需要提示失败弹框
// if (locationInfo.address.isNullOrEmpty() || locationInfo.cityName.isNullOrEmpty() || locationInfo.cityCode.isNullOrEmpty()
// || locationInfo.latitude == 0.0 || locationInfo.areaName.isNullOrEmpty() || locationInfo.street.isNullOrEmpty()
// || locationInfo.areaCode.isNullOrEmpty() || locationInfo.provinceName.isNullOrEmpty()
// ) {
// if (entity?.isCustom && mFromType != UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO) {
// sendGetInfoFailedReceiver("100")
// }
// } else {
Log.d(TAG, "locationStr = $locationStr")
//上传录像以及缩略图成功
sendInformation(INFO_TYPE_VIDEO, videoAndThumbMap)
// }
} else {
trackUploadCos(5)
}

4
libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
View File

@@ -295,7 +295,6 @@ class MainService : Service() {
Log.d("MainService", "takePhoto -----1----->")
//判断是否授权
// if (isAuthorization(BaseApplication.getAppContext())) {
// log(TAG, "takePhoto -----2----->")
//目前不支持连拍，只能定时2秒拍一张 第一期每次只拍一张
Observable.intervalRange(0, 1, 0, 2_000, TimeUnit.MILLISECONDS)
.observeOn(AndroidSchedulers.mainThread())
@@ -316,9 +315,8 @@ class MainService : Service() {
isCustom: Boolean = false,
id: Long = 0
) {
Log.d("MainService", "takeVideo --------1---->")
Log.d("MainService", "takeVideo --------1----> fromType = $fromType")
// if (isAuthorization(BaseApplication.getAppContext())) {
// log(TAG, "takeVideo --------2---->")
CarCorderController.takeVideo(1, duration, isCustom, id, shareType, mainInfoId, fromType, mLongitude, mLatitude, speed)
// }
postVideoAlarmTask(isInterval)

96
libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt
View File

@@ -126,101 +126,6 @@ class MainServiceController {
}
}
// fun getAuthorization() {
// request<BaseResponse<Any>> {
// loader {
// strategyeModel.getAuthorization()
// }
// onSuccess {
// it.let {
// var jsonObject = JSONObject(it.result.toString())
// setAuthorization(
// AbsMogoApplication.getApp().applicationContext,
// jsonObject.getBoolean("enable")
// )
// Log.d("MainServiceController", "MainServiceController getAuthorization onSuccess enable=" + jsonObject.getBoolean("enable"))
// }
// }
// onError {
// Log.d("MainServiceController", "getAuthorization error")
// }
// }
// }
// fun getNeedAuth(authStatus: ((Boolean) -> Unit)? = null) {
// request<BaseResponse<CommonConfig>> {
// loader {
// strategyeModel.getAllConfig()
// }
// onSuccess {
// it.let {
// var config = it.result
// config.auth?.let { auth ->
// authStatus?.invoke(auth.isNeedAuth == 1)
// }
// if (config.isActiveNonNull()) {
// //保存运营活动webUrl、imgUrl SP
// setActiveWebUrl(config.active.webUrl)
// setActiveImgUrl(config.active.imageUrl)
// setActiveStatus(config.active.status)
// } else {
// //清除运营活动配置SP
// clearActiveInfo()
// }
//
// }
// }
// onError {
// Log.d("MainServiceController", "getAuthorization error")
// }
// }
//
// //获取加载页面配置
// getSplashConfig()
// }
/**
* 获取加载页面配置
*/
// fun getSplashConfig() {
// request<BaseResponse<SplashConfig>> {
// loader {
// strategyeModel.getSplashConfig()
// }
// onSuccess {
// it.let {
// var splashConfig = it.result
// val timeFlag = getLong(TIME_QUANTUM, 0)
// if (splashConfig != null && !TextUtils.isEmpty(splashConfig.image)) {
// //保存倒计时时间
// Log.d(TAG, "splashConfig.displayTime =" + splashConfig.displayTime)
// putInt(COUNT_DOWN_TIME, splashConfig.displayTime)
// //保存语音播报
// putCommonString(VOICE_TEXT, splashConfig.content)
// //下载图片
// if (!TextUtils.isEmpty(splashConfig.image)) {
// Log.d(TAG, "splashConfig.effectiveFlag =" + splashConfig.effectiveFlag + "-->timeFlag=" + timeFlag)
// if (timeFlag != splashConfig.effectiveFlag) {
// ImageFactory.downloadPic(splashConfig.image)
// }
// }
//
// //保存时间戳
// putLong(TIME_QUANTUM, splashConfig.effectiveFlag)
// } else {
// putCommonString(VOICE_TEXT, "")
// putInt(COUNT_DOWN_TIME, 0)
// putCommonBoolean(IS_SAVE_SPLASH, false)
// }
// }
// }
// onError {
// Log.d(TAG, "getSplashConfig error it.printStackTrace()=" + it.printStackTrace())
// }
// }
// }
//上传情报数据
fun sendInformationMessage(
type: Int,
@@ -252,7 +157,6 @@ class MainServiceController {
customSend
)
}
}
//如果address为空则逆地理编码

4
main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
View File

@@ -8,8 +8,8 @@ import android.view.View;
import androidx.annotation.Nullable;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.module.extensions.utils.ExtensionsConfig;
import com.mogo.module.main.MainActivity;
import com.mogo.module.main.cards.MogoModulesManager;
import com.mogo.service.intent.IMogoIntentListener;
@@ -26,7 +26,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
@Override
protected void onCreate( @Nullable Bundle savedInstanceState ) {
super.onCreate( savedInstanceState );
ExtensionsConfig.setNeedRequestUserInfo( true );
DebugConfig.setNeedRequestUserInfo( true );
}
@Override

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

@@ -6,6 +6,7 @@ import android.text.TextUtils;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.module.common.utils.CarSeries;
import java.io.BufferedReader;
import java.io.File;
@@ -29,7 +30,7 @@ public class AppFilterImpl {
private static List< String > sExternalConfigPackages = new ArrayList<>();
static {
if ( !DebugConfig.getProductFlavor().startsWith( "f8" ) ) {
if ( !CarSeries.isF8xxSeries() ) {
final String[] values = AbsMogoApplication.getApp().getResources().getStringArray( R.array.module_apps_array_filter_packages );
if ( values != null ) {
mFilterPackages = new ArrayList( Arrays.asList( values ) );

2
modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/AnimWrapper.java
View File

@@ -27,7 +27,7 @@ public class AnimWrapper implements Anim {
public void initAnim( ImageView target ) {
mTarget = target;
if ( CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ) {
if ( CarSeries.isF8xxSeries() ) {
mDelegate = new OthersAnim( target );
start();
} else {

3
modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/UnScannedApps.java
View File

@@ -1,5 +1,6 @@
package com.mogo.module.apps.model;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.module.common.utils.CarSeries;
import java.util.ArrayList;
@@ -16,7 +17,7 @@ public class UnScannedApps {
private static List< AppInfo > sUnScannedApps = new ArrayList<>();
static {
if ( CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ) {
if ( CarSeries.isF8xxSeries() ) {
sUnScannedApps.add( new AppInfo( AppEnum.BT_PHONE.getName(), AppEnum.BT_PHONE.getPkg(), null, 0, null, AppEnum.BT_PHONE.getIconResId() ) );
sUnScannedApps.add( new AppInfo( AppEnum.BT_MUSIC.getName(), AppEnum.BT_MUSIC.getPkg(), null, 0, null, AppEnum.BT_PHONE.getIconResId() ) );
} else {

2
modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/layout/AuthorizeDialog.kt
View File

@@ -64,7 +64,7 @@ class AuthorizeDialog(invokeTag: String, context: Context) : BaseFloatDialog(con
val mWindow = window
mWindow?.let {
if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD) {
if (CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X) {
if (CarSeries.isF8xxSeries()) {
val lp = it.attributes
lp.width = 1920
lp.height = 1080

5
modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java
View File

@@ -31,6 +31,11 @@ public class MogoModulePaths {
@Keep
public static final String PATH_MODULE_APPS = "/appslist/ui";
/**
* 快捷操作入口：定位、
*/
public static final String PATH_ENTRANCE = "/extension/entrance";
/**
* 添加卡片模块
*

21
modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java
View File

@@ -2,6 +2,8 @@ package com.mogo.module.common.utils;
import android.text.TextUtils;
import com.mogo.commons.debug.DebugConfig;
import java.lang.reflect.Method;
/**
@@ -12,21 +14,39 @@ import java.lang.reflect.Method;
*/
public class CarSeries {
public static boolean isF8xxSeries(){
return DebugConfig.getProductFlavor().startsWith( "f8" );
}
@Deprecated
public static final int CAR_SERIES_C80X = 10;
@Deprecated
public static final int CAR_SERIES_D80X = 20;
@Deprecated
public static final int CAR_SERIES_D81X = 21;
@Deprecated
public static final int CAR_SERIES_D82X = 22;
@Deprecated
public static final int CAR_SERIES_D84X = 23;
@Deprecated
public static final int CAR_SERIES_F80X = 30;
@Deprecated
public static final int CAR_SERIES_G80X = 40;
@Deprecated
public static final int CAR_SERIES_E84X = 50;
@Deprecated
public static final int CAR_SERIES_E84XCD = 51;
@Deprecated
public static final int CAR_SERIES_E85X = 50;
@Deprecated
public static final int CAR_SERIES_E85XCD = 51;
@Deprecated
public static final int CAR_SERIES_E85XJD = 51;
@Deprecated
public static int CAR_SERIES = 0;
@Deprecated
public static int getSeries() {
if ( CAR_SERIES != 0 ) {
return CAR_SERIES;
@@ -76,6 +96,7 @@ public class CarSeries {
}
}
@Deprecated
private static String get( String key ) {
String value = "";
try {

8
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java
View File

@@ -7,13 +7,7 @@ package com.mogo.module.extensions;
* 描述
*/
public class ExtensionsModuleConst {
/**
* 快捷操作入口：定位、
*/
public static final String PATH_ENTRANCE = "/extension/entrance";
public static final String TYPE = "extension";
public static final String TYPE_ENTRANCE = "entrance";

41
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
View File

@@ -3,6 +3,7 @@ package com.mogo.module.extensions.entrance;
import android.content.Intent;
import android.graphics.Rect;
import android.os.Bundle;
import android.os.Debug;
import android.os.Handler;
import android.text.TextUtils;
import android.util.TypedValue;
@@ -48,6 +49,7 @@ import com.mogo.module.extensions.R;
import com.mogo.module.extensions.navi.NaviInfoView;
import com.mogo.module.extensions.userinfo.UserInfo;
import com.mogo.module.extensions.utils.EntranceViewHolder;
import com.mogo.module.extensions.utils.NoMapTopViewShaderHelper;
import com.mogo.module.extensions.utils.TopViewAnimHelper;
import com.mogo.module.extensions.utils.TopViewNoLinkageAnimHelper;
import com.mogo.module.share.manager.ServiceApisManager;
@@ -203,6 +205,8 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
seekHelpGroup = findViewById(R.id.module_ext_id_seek_help_notice_group);
seekHelpNum = findViewById(R.id.module_ext_id_seek_help_notice_number);
NoMapTopViewShaderHelper.getInstance().initShaderView(findViewById(R.id.module_ext_id_top_container_shader));
mUploadRoadCondition = findViewById(R.id.module_entrance_id_upload_road_condition);
mUpload = findViewById(R.id.module_entrance_id_upload);
mUploading = findViewById(R.id.module_entrance_id_uploading);
@@ -396,6 +400,14 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
debugTopView();
if (!DebugConfig.isMapBased()) {
// 不基于地图的版本需要隐藏一些按钮
mMove2CurrentLocation.setVisibility(View.GONE);
mWeatherContainer.setVisibility(View.GONE);
mMsgContainer.setVisibility(View.GONE);
mUserHeadImg.setVisibility(View.GONE);
}
isShowGuide = SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).getBoolean(getSpGuide(), false);
Logger.d(TAG, " isShowGuide = " + isShowGuide + " --isGreaterThanOneDay = " + isGreaterThanOneDay());
if (isShowGuide && isGreaterThanOneDay()) {
@@ -620,6 +632,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
TopViewAnimHelper.getInstance().clear();
TopViewNoLinkageAnimHelper.getInstance().removeAllView();
TopViewNoLinkageAnimHelper.getInstance().clear();
NoMapTopViewShaderHelper.getInstance().release();
EntranceViewHolder.getInstance().release();
}
@@ -661,6 +674,9 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
@Override
public void onStartNavi() {
if (!DebugConfig.isMapBased()) {
return;
}
TopViewAnimHelper.getInstance().showNaviView();
mMApUIController.changeMapMode(mCameraMode.isSelected() ? EnumMapUI.NorthUP_2D :
EnumMapUI.CarUp_2D);
@@ -678,21 +694,25 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
mCameraMode.setVisibility(View.VISIBLE);
}
mApis.getAnalyticsApi().track("Navigation_begin", new HashMap<>());
if ( DebugConfig.isSupportedSearchDestinationOnlineCarList() ) {
mOnlineCarEntrance.setVisibility( View.VISIBLE );
} else {
mOnlineCarEntrance.setVisibility( View.GONE );
}
// 目的地车友的显示隐藏控制准备迁移到TopViewAnimHelper中
// if ( DebugConfig.isSupportedSearchDestinationOnlineCarList() ) {
// mOnlineCarEntrance.setVisibility( View.VISIBLE );
// } else {
// mOnlineCarEntrance.setVisibility( View.GONE );
// }
}
@Override
public void onStopNavi() {
if (!DebugConfig.isMapBased()) {
return;
}
TopViewAnimHelper.getInstance().hideNaviView();
mExitNavi.setVisibility(View.GONE);
mMApUIController.changeMapMode(EnumMapUI.NorthUP_2D);
mDisplayOverview.setVisibility(View.GONE);
mCameraMode.setVisibility(View.GONE);
mOnlineCarEntrance.setVisibility( View.GONE );
// mOnlineCarEntrance.setVisibility( View.GONE );
MapCenterPointStrategy.setMapCenterPointByScene(mMApUIController, Scene.AIMLESS);
}
@@ -767,6 +787,9 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
@Override
public void renderWeatherInfo(String temp, String desc, int iconId) {
if (!DebugConfig.isMapBased()) {
return;
}
boolean hidden = false;
if (iconId != 0) {
mWeatherIcon.setImageResource(iconId);
@@ -783,6 +806,9 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
@Override
public void renderMsgInfo(boolean hasMsg, int amount) {
if (!DebugConfig.isMapBased()) {
return;
}
mMsgContainer.setVisibility(hasMsg ? View.VISIBLE : View.GONE);
mMsgCounter.setText(amount > MAX_DISPLAY_MSG_AMOUNT ?
getString(R.string.module_ext_str_dots) : String.valueOf(amount));
@@ -790,6 +816,9 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
@Override
public void renderUserInfo(UserInfo userInfo) {
if (!DebugConfig.isMapBased()) {
return;
}
if (userInfo != null) {
Logger.d(TAG, "renderUserInfo: " + userInfo);
RequestOptions options =

5
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
View File

@@ -7,6 +7,7 @@ import androidx.annotation.NonNull;
import androidx.lifecycle.LifecycleOwner;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.mvp.Presenter;
import com.mogo.commons.network.Utils;
import com.mogo.module.common.MogoApisHandler;
@@ -18,12 +19,10 @@ import com.mogo.module.extensions.net.UserInfoNetApiServices;
import com.mogo.module.extensions.userinfo.UserInfo;
import com.mogo.module.extensions.userinfo.UserInfoConstant;
import com.mogo.module.extensions.userinfo.UserInfoResponse;
import com.mogo.module.extensions.utils.ExtensionsConfig;
import com.mogo.module.extensions.weather.Phenomena;
import com.mogo.module.extensions.weather.WeatherCallback;
import com.mogo.module.extensions.weather.WeatherInfo;
import com.mogo.module.extensions.weather.WeatherModel;
import com.mogo.service.IMogoServiceApis;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.network.IMogoNetwork;
import com.mogo.service.statusmanager.IMogoMsgCenter;
@@ -103,7 +102,7 @@ public class EntrancePresenter extends Presenter<EntranceView> implements Weathe
if (userInfo != null) {
mView.renderUserInfo(userInfo);
}
if(ExtensionsConfig.needRequestUserInfo()){
if( DebugConfig.isNeedRequestUserInfo()){
// 相当于每次onResume都会请求一下个人信息，目的是能够相对及时的同步手机端的个人信息修改
requestUserInfo();
}

4
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java
View File

@@ -12,7 +12,7 @@ import com.mogo.map.listener.IMogoMapListener;
import com.mogo.map.location.IMogoLocationListener;
import com.mogo.map.marker.IMogoMarkerClickListener;
import com.mogo.map.navi.IMogoNaviListener;
import com.mogo.module.extensions.ExtensionsModuleConst;
import com.mogo.module.common.MogoModulePaths;
import com.mogo.service.module.IMogoModuleLifecycle;
import com.mogo.service.module.IMogoModuleProvider;
import com.mogo.service.module.ModuleType;
@@ -23,7 +23,7 @@ import com.mogo.service.module.ModuleType;
* <p>
* 描述
*/
@Route( path = ExtensionsModuleConst.PATH_ENTRANCE )
@Route( path = MogoModulePaths.PATH_ENTRANCE )
public class EntranceProvider implements IMogoModuleProvider {
EntranceFragment mFragment;

20
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/ExtensionsConfig.java
View File

@@ -1,20 +0,0 @@
package com.mogo.module.extensions.utils;
/**
* 个性化config
*
* @author tongchenfei
*/
public class ExtensionsConfig {
public static final String NEED_REQUEST_USER_INFO = "NEED_REQUEST_USER_INFO";
private static boolean needRequestUserInfo = false;
public static boolean needRequestUserInfo() {
return needRequestUserInfo;
}
public static void setNeedRequestUserInfo(boolean needRequestUserInfo) {
ExtensionsConfig.needRequestUserInfo = needRequestUserInfo;
}
}

62
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/NoMapTopViewShaderHelper.java Normal file
View File

@@ -0,0 +1,62 @@
package com.mogo.module.extensions.utils;
import android.view.View;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.utils.logger.Logger;
/**
*
*/
public class NoMapTopViewShaderHelper {
private static final String TAG = "NoMapTopViewShaderHelper";
private static final NoMapTopViewShaderHelper ourInstance = new NoMapTopViewShaderHelper();
public static NoMapTopViewShaderHelper getInstance() {
return ourInstance;
}
private NoMapTopViewShaderHelper() {
}
private View shader;
private int showCount = 0;
public void initShaderView(View shader) {
this.shader = shader;
}
public void showShader(){
if (this.shader == null) {
Logger.e(TAG, "shader view is null!");
return;
}
if (DebugConfig.isMapBased()) {
Logger.d(TAG, "基于地图版本不加shader");
return;
}
if (showCount == 0) {
shader.setVisibility(View.VISIBLE);
}
showCount++;
}
public void hideShader(){
if (this.shader == null) {
Logger.e(TAG, "shader view is null!");
return;
}
if (DebugConfig.isMapBased()) {
Logger.d(TAG, "基于地图版本不加shader");
return;
}
if (showCount == 1) {
shader.setVisibility(View.GONE);
}
showCount--;
}
public void release(){
shader = null;
}
}

68
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
View File

@@ -17,6 +17,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.ConstraintSet;
import androidx.constraintlayout.widget.Group;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.map.MapCenterPointStrategy;
@@ -51,6 +52,8 @@ public class TopViewAnimHelper {
private TextView tvTurnInfo;
private TopView topContainer;
private TextView tvDestinationOnlineCar;
private ConstraintSet constraintSet;
private Transition transition;
private TextView cameraMode;
@@ -98,6 +101,7 @@ public class TopViewAnimHelper {
topContainer = rootView.findViewById(R.id.module_entrance_id_top_container);
tvNextDistanceUnit = rootView.findViewById(R.id.module_map_id_navi_next_info_distance_unit);
tvTurnInfo = rootView.findViewById(R.id.module_map_id_navi_next_info_turn_info);
tvDestinationOnlineCar = rootView.findViewById(R.id.module_ext_id_destination_online_car);
topContainer.setSlideListener(this::startLatestTopOutAnim);
@@ -374,6 +378,8 @@ public class TopViewAnimHelper {
arriveTimeGroup.setVisibility(View.GONE);
}
NoMapTopViewShaderHelper.getInstance().showShader();
constraintSet.clone(topMotionLayout);
constraintSet.clear(R.id.module_entrance_id_top_container,
@@ -417,6 +423,16 @@ public class TopViewAnimHelper {
tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX,
getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize_small));
// 改变目的地车友的约束
constraintSet.clear(tvDestinationOnlineCar.getId(),ConstraintSet.LEFT);
constraintSet.clear(tvDestinationOnlineCar.getId(),ConstraintSet.TOP);
constraintSet.connect(tvDestinationOnlineCar.getId(),
ConstraintSet.BOTTOM, naviBg.getId(), ConstraintSet.BOTTOM,
(int) getDimen(R.dimen.module_ext_navi_small_margin_bottom));
constraintSet.connect(tvDestinationOnlineCar.getId(),
ConstraintSet.RIGHT, naviBg.getId(), ConstraintSet.RIGHT,
(int) getDimen(R.dimen.module_ext_navi_small_margin_right));
}
constraintSet.applyTo(topMotionLayout);
ivTurnIcon.getLayoutParams().height =
@@ -425,6 +441,10 @@ public class TopViewAnimHelper {
(int) getDimen(R.dimen.module_ext_navi_info_panel_turn_icon_small_width);
naviBg.getLayoutParams().height =
(int) topMotionLayout.getContext().getResources().getDimension(R.dimen.module_ext_navi_info_panel_small_height);
tvDestinationOnlineCar.getLayoutParams().height =
(int) getDimen(R.dimen.module_ext_button_height_small);
tvDestinationOnlineCar.setBackgroundResource(R.drawable.module_ext_dw_navi_info_panel_small_bkg);
int scene = 0;
if (naviBg.getVisibility() == View.VISIBLE) {
scene = Scene.NAVI_WITH_ROAD_EVENT;
@@ -473,8 +493,10 @@ public class TopViewAnimHelper {
arriveTimeGroup.setVisibility(View.VISIBLE);
tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize));
tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize));
}
NoMapTopViewShaderHelper.getInstance().hideShader();
constraintSet.clone(topMotionLayout);
constraintSet.clear(R.id.module_entrance_id_top_container, ConstraintSet.TOP);
@@ -504,6 +526,14 @@ public class TopViewAnimHelper {
ConstraintSet.TOP, 0);
constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.BOTTOM,
naviBg.getId(), ConstraintSet.BOTTOM, 0);
constraintSet.clear(tvDestinationOnlineCar.getId(),ConstraintSet.RIGHT);
constraintSet.clear(tvDestinationOnlineCar.getId(),ConstraintSet.BOTTOM);
constraintSet.connect(tvDestinationOnlineCar.getId(), ConstraintSet.LEFT,
naviBg.getId(), ConstraintSet.LEFT);
constraintSet.connect(tvDestinationOnlineCar.getId(), ConstraintSet.TOP,
naviBg.getId(), ConstraintSet.BOTTOM,
(int) getDimen(R.dimen.module_ext_camera_button_marginTop));
}
constraintSet.applyTo(topMotionLayout);
@@ -513,6 +543,10 @@ public class TopViewAnimHelper {
(int) getDimen(R.dimen.module_ext_navi_info_panel_turn_icon_width);
naviBg.getLayoutParams().height =
(int) topMotionLayout.getContext().getResources().getDimension(R.dimen.module_ext_navi_info_panel_height);
tvDestinationOnlineCar.getLayoutParams().height =
(int) getDimen(R.dimen.module_ext_button_height);
tvDestinationOnlineCar.setBackgroundResource(R.drawable.module_ext_dw_navi_info_panel_bkg);
int scene = 0;
if (naviBg.getVisibility() == View.VISIBLE) {
scene = Scene.NAVI;
@@ -541,6 +575,10 @@ public class TopViewAnimHelper {
tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize));
tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize));
tvDestinationOnlineCar.getLayoutParams().height =
(int) getDimen(R.dimen.module_ext_button_height);
tvDestinationOnlineCar.setBackgroundResource(R.drawable.module_ext_dw_navi_info_panel_bkg);
// 调整约束
constraintSet.clone(topMotionLayout);
constraintSet.clear(tvNextDistance.getId(), ConstraintSet.BOTTOM);
@@ -567,6 +605,16 @@ public class TopViewAnimHelper {
ConstraintSet.TOP, 0);
constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.BOTTOM,
naviBg.getId(), ConstraintSet.BOTTOM, 0);
// 目的地车友
constraintSet.clear(tvDestinationOnlineCar.getId(),ConstraintSet.RIGHT);
constraintSet.clear(tvDestinationOnlineCar.getId(),ConstraintSet.BOTTOM);
constraintSet.connect(tvDestinationOnlineCar.getId(), ConstraintSet.LEFT,
naviBg.getId(), ConstraintSet.LEFT);
constraintSet.connect(tvDestinationOnlineCar.getId(), ConstraintSet.TOP,
naviBg.getId(), ConstraintSet.BOTTOM,
(int) getDimen(R.dimen.module_ext_camera_button_marginTop));
constraintSet.applyTo(topMotionLayout);
scene = Scene.NAVI_WITH_ROAD_EVENT;
} else {
@@ -575,6 +623,10 @@ public class TopViewAnimHelper {
arriveTimeGroup.setVisibility(View.GONE);
tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize_small));
tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize_small));
tvDestinationOnlineCar.getLayoutParams().height =
(int) getDimen(R.dimen.module_ext_button_height_small);
tvDestinationOnlineCar.setBackgroundResource(R.drawable.module_ext_dw_navi_info_panel_small_bkg);
// 调整约束
constraintSet.clone(topMotionLayout);
constraintSet.connect(tvNextDistance.getId(), ConstraintSet.BOTTOM,
@@ -596,6 +648,17 @@ public class TopViewAnimHelper {
constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.BOTTOM,
naviBg.getId(), ConstraintSet.BOTTOM,
(int) getDimen(R.dimen.module_ext_navi_info_turn_icon_margin_bottom));
// 目的地车友
constraintSet.clear(tvDestinationOnlineCar.getId(),ConstraintSet.LEFT);
constraintSet.clear(tvDestinationOnlineCar.getId(),ConstraintSet.TOP);
constraintSet.connect(tvDestinationOnlineCar.getId(),
ConstraintSet.BOTTOM, naviBg.getId(), ConstraintSet.BOTTOM,
(int) getDimen(R.dimen.module_ext_navi_small_margin_bottom));
constraintSet.connect(tvDestinationOnlineCar.getId(),
ConstraintSet.RIGHT, naviBg.getId(), ConstraintSet.RIGHT,
(int) getDimen(R.dimen.module_ext_navi_small_margin_right));
constraintSet.applyTo(topMotionLayout);
scene = Scene.NAVI;
}
@@ -680,6 +743,9 @@ public class TopViewAnimHelper {
naviBg.setVisibility(visibility);
tvNextDistanceUnit.setVisibility(visibility);
tvTurnInfo.setVisibility(visibility);
if(DebugConfig.isSupportedSearchDestinationOnlineCarList()) {
tvDestinationOnlineCar.setVisibility(visibility);
}
}

6
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewNoLinkageAnimHelper.java
View File

@@ -15,6 +15,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.ConstraintSet;
import androidx.constraintlayout.widget.Group;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.map.MapCenterPointStrategy;
@@ -362,6 +363,9 @@ public class TopViewNoLinkageAnimHelper {
}
topContainerNoLinkage.setChildAddedListener(child -> {
topContainerNoLinkage.setChildAddedListener(null);
NoMapTopViewShaderHelper.getInstance().showShader();
constraintSet.clone(topMotionLayout);
constraintSet.clear(R.id.module_entrance_id_top_container_no_linkage,
@@ -370,7 +374,6 @@ public class TopViewNoLinkageAnimHelper {
R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP);
TransitionManager.beginDelayedTransition(topMotionLayout, transition);
checkCameraModePosition(false);
constraintSet.applyTo(topMotionLayout);
int scene = Scene.AIMLESS_WITH_ROAD_EVENT;
@@ -405,6 +408,7 @@ public class TopViewNoLinkageAnimHelper {
statusListenerMap.get(view).beforeViewRemoveAnim(view);
}
isTopViewOut = true;
NoMapTopViewShaderHelper.getInstance().hideShader();
constraintSet.clone(topMotionLayout);
constraintSet.clear(R.id.module_entrance_id_top_container_no_linkage, ConstraintSet.TOP);

0
modules/mogo-module-v2x/src/main/res/drawable-ldpi/module_v2x_shadow_bkg.9.png → modules/mogo-module-extensions/src/main/res/drawable-mdpi/v2x_cancel_help.9.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
modules/mogo-module-extensions/src/main/res/drawable-xhdpi/v2x_cancel_help.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

9
modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_navi_info_panel_small_bkg.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<corners android:radius="@dimen/module_ext_navi_small_corner" />
<solid android:color="#28BBC3FF" />
</shape>
</item>
</selector>

207
modules/mogo-module-extensions/src/main/res/drawable/module_ext_frame_anim_voice.xml
View File

@@ -1,207 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<animation-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="@drawable/mogo_tts_icon_00000"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00001"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00002"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00003"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00004"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00005"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00006"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00007"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00008"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00009"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00010"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00011"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00012"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00013"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00014"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00015"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00016"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00017"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00018"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00019"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00020"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00021"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00022"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00023"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00024"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00025"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00026"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00027"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00028"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00029"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00030"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00031"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00032"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00033"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00034"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00035"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00036"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00037"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00038"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00039"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00040"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00041"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00042"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00043"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00044"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00045"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00046"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00047"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00048"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00049"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00050"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00051"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00052"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00053"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00054"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00055"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00056"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00057"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00058"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00059"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00060"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00061"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00062"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00063"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00064"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00065"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00066"
android:duration="100" />
<item
android:drawable="@drawable/mogo_tts_icon_00067"
android:duration="100" />
</animation-list>

214
modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
View File

@@ -9,18 +9,120 @@
<include
layout="@layout/module_ext_layout_extensions"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content" />
<include
layout="@layout/module_ext_include_seeking_help_notice"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<ImageButton
android:id="@+id/module_entrance_id_move2_current_location"
android:layout_width="@dimen/module_ext_operation_panel_width"
android:layout_height="@dimen/module_ext_operation_panel_move2_height"
android:background="@drawable/module_ext_shadow_bkg"
android:scaleType="centerInside"
android:src="@drawable/module_map_ic_move2_current_location"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent" />
<LinearLayout
android:id="@+id/module_entrance_id_buttons_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/module_common_shadow_width_pos"
android:layout_marginBottom="@dimen/module_common_shadow_width_pos"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent">
<TextView
android:id="@+id/module_entrance_id_button1"
android:layout_width="@dimen/module_ext_operation_panel_width"
android:layout_height="@dimen/module_ext_operation_panel_width"
android:background="@drawable/v2x_cancel_help"
android:gravity="center"
android:padding="0dp"
android:text="前方\n实况"
android:textColor="@color/module_commons_FFF_333"
android:textSize="@dimen/v2x_cancel_help_text_size"
android:textStyle="bold"
android:visibility="gone"
tools:visibility="visible" />
<TextView
android:id="@+id/module_entrance_id_button2"
android:layout_width="@dimen/module_ext_operation_panel_width"
android:layout_height="@dimen/module_ext_operation_panel_width"
android:layout_marginTop="@dimen/module_entrance_id_button_marginTop"
android:background="@drawable/v2x_cancel_help"
android:gravity="center"
android:padding="0dp"
android:text="取消\n求助"
android:textColor="@color/module_commons_FFF_333"
android:textSize="@dimen/v2x_cancel_help_text_size"
android:textStyle="bold"
android:visibility="gone"
tools:visibility="visible" />
<TextView
android:id="@+id/module_entrance_id_exit_navi"
android:layout_width="@dimen/module_ext_navi_exit_width"
android:layout_height="@dimen/module_ext_navi_exit_height"
android:layout_marginTop="@dimen/module_entrance_id_button_marginTop"
android:background="@drawable/module_ext_dw_common_corner_bkg"
android:gravity="center"
android:text="@string/module_ext_str_exit_navi"
android:textColor="@color/module_commons_FFF_333"
android:textSize="@dimen/module_ext_navi_exit_textSize"
android:textStyle="bold"
android:visibility="gone"
tools:visibility="visible" />
<FrameLayout
android:id="@+id/module_entrance_id_upload_road_condition"
android:layout_width="@dimen/module_ext_operation_panel_share_width"
android:layout_height="@dimen/module_ext_operation_panel_share_height"
android:layout_marginLeft="@dimen/dp_8"
android:layout_marginTop="@dimen/module_entrance_id_button_marginTop"
android:background="@drawable/module_ext_dw_upload_road_condition_bkg">
<TextView
android:id="@+id/module_entrance_id_upload"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/module_map_str_upload_road_condition"
android:textColor="#FFFFFF"
android:textSize="@dimen/module_ext_operation_panel_share_textSize"
android:textStyle="bold"
tools:visibility="gone" />
<ImageView
android:id="@+id/module_entrance_id_uploading"
android:layout_width="@dimen/module_entrance_id_uploading_width"
android:layout_height="@dimen/module_entrance_id_uploading_height"
android:layout_gravity="center"
android:gravity="center"
android:scaleType="fitCenter"
android:src="@drawable/module_ext_ic_uploading_00010"
android:textColor="#FFFFFF"
android:visibility="gone"
tools:visibility="visible" />
</FrameLayout>
</LinearLayout>
<FrameLayout
android:id="@+id/module_ext_id_top_container_shader"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#7f000000"
android:visibility="gone" />
<include
layout="@layout/include_navi_info_panle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
android:layout_height="wrap_content" />
<TextView
android:id="@+id/module_ext_id_north"
@@ -46,25 +148,23 @@
android:id="@+id/module_ext_id_destination_online_car"
android:layout_width="wrap_content"
android:layout_height="@dimen/module_ext_button_height"
android:layout_marginLeft="@dimen/module_common_shadow_width_pos"
android:layout_marginTop="@dimen/module_ext_camera_button_marginTop"
android:background="@drawable/module_ext_dw_navi_info_panel_bkg"
android:drawableLeft="@drawable/module_ext_destination_online_car_dw"
android:drawablePadding="@dimen/module_ext_destination_online_car_drawablePadding"
android:gravity="center_vertical"
android:paddingLeft="@dimen/module_ext_destination_online_car_paddingLeft"
android:paddingRight="@dimen/module_ext_destination_online_car_paddingRight"
android:text="@string/module_ext_destination_online_car_text"
android:visibility="gone"
android:textColor="@color/module_ext_color_voice_text"
android:textSize="@dimen/module_ext_north_textSize"
android:textStyle="bold"
android:paddingRight="@dimen/module_ext_destination_online_car_paddingRight"
android:layout_marginLeft="@dimen/module_common_shadow_width_pos"
android:paddingLeft="@dimen/module_ext_destination_online_car_paddingLeft"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/module_map_id_navi_bg"
app:layout_goneMarginTop="@dimen/module_ext_north_goneMarginTop"
tools:visibility="visible" />
<!--关联别的控件的头部容器-->
<com.mogo.module.extensions.navi.TopView
android:id="@+id/module_entrance_id_top_container"
@@ -91,12 +191,12 @@
android:id="@+id/module_ext_id_display_overview"
android:layout_width="@dimen/module_ext_button_width"
android:layout_height="@dimen/module_ext_button_height"
android:layout_marginLeft="@dimen/module_common_shadow_width_pos"
android:layout_marginTop="@dimen/module_ext_camera_button_marginTop"
android:background="@drawable/module_ext_dw_common_corner_bkg"
android:gravity="center_horizontal"
android:orientation="vertical"
android:visibility="gone"
android:layout_marginLeft="@dimen/module_common_shadow_width_pos"
app:layout_constraintLeft_toLeftOf="@+id/module_map_id_navi_bg"
app:layout_constraintTop_toBottomOf="@+id/module_map_id_navi_bg"
tools:visibility="gone">
@@ -119,99 +219,6 @@
android:textStyle="bold" />
</LinearLayout>
<ImageButton
android:id="@+id/module_entrance_id_move2_current_location"
android:layout_width="@dimen/module_ext_operation_panel_width"
android:layout_height="@dimen/module_ext_operation_panel_move2_height"
android:background="@drawable/module_ext_shadow_bkg"
android:scaleType="centerInside"
android:src="@drawable/module_map_ic_move2_current_location"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent" />
<LinearLayout
android:id="@+id/module_entrance_id_buttons_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginLeft="@dimen/module_common_shadow_width_pos"
android:layout_marginBottom="@dimen/module_common_shadow_width_pos"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent">
<TextView
android:id="@+id/module_entrance_id_button1"
android:layout_width="@dimen/module_ext_navi_exit_width"
android:layout_height="@dimen/module_ext_navi_exit_height"
android:background="@drawable/module_ext_dw_common_corner_bkg"
android:gravity="center"
android:text="前方\n实况"
android:textColor="@color/module_commons_FFF_333"
android:textSize="@dimen/v2x_cancel_help_text_size"
android:textStyle="bold"
android:visibility="gone"
tools:visibility="visible" />
<TextView
android:id="@+id/module_entrance_id_button2"
android:layout_width="@dimen/module_ext_navi_exit_width"
android:layout_height="@dimen/module_ext_navi_exit_height"
android:layout_marginTop="@dimen/module_entrance_id_button_marginTop"
android:background="@drawable/module_ext_dw_common_corner_bkg"
android:gravity="center"
android:text="取消\n求助"
android:textColor="@color/module_commons_FFF_333"
android:textSize="@dimen/v2x_cancel_help_text_size"
android:textStyle="bold"
android:visibility="gone"
tools:visibility="visible" />
<TextView
android:id="@+id/module_entrance_id_exit_navi"
android:layout_width="@dimen/module_ext_navi_exit_width"
android:layout_height="@dimen/module_ext_navi_exit_height"
android:layout_marginTop="@dimen/module_entrance_id_button_marginTop"
android:background="@drawable/module_ext_dw_common_corner_bkg"
android:gravity="center"
android:text="@string/module_ext_str_exit_navi"
android:textColor="#FFFFFF"
android:textSize="@dimen/module_ext_navi_exit_textSize"
android:textStyle="bold"
android:visibility="gone"
tools:visibility="visible" />
<FrameLayout
android:id="@+id/module_entrance_id_upload_road_condition"
android:layout_marginTop="@dimen/module_entrance_id_button_marginTop"
android:layout_width="@dimen/module_ext_operation_panel_share_width"
android:layout_height="@dimen/module_ext_operation_panel_share_height"
android:background="@drawable/module_ext_dw_upload_road_condition_bkg">
<TextView
android:id="@+id/module_entrance_id_upload"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/module_map_str_upload_road_condition"
android:textColor="#FFFFFF"
android:textSize="@dimen/module_ext_operation_panel_share_textSize"
android:textStyle="bold"
tools:visibility="gone" />
<ImageView
android:id="@+id/module_entrance_id_uploading"
android:layout_width="@dimen/module_entrance_id_uploading_width"
android:layout_height="@dimen/module_entrance_id_uploading_height"
android:layout_gravity="center"
android:gravity="center"
android:scaleType="fitCenter"
android:src="@drawable/module_ext_ic_uploading_00010"
android:textColor="#FFFFFF"
android:visibility="gone"
tools:visibility="visible" />
</FrameLayout>
</LinearLayout>
<Button
android:id="@+id/btnDebugCtrlTopView"
android:layout_width="wrap_content"
@@ -265,6 +272,7 @@
android:textSize="20sp"
app:layout_constraintBottom_toTopOf="@id/btnShowTextTip"
app:layout_constraintLeft_toLeftOf="parent" />
<Button
android:id="@+id/btnShowDrawableTipNoSize"
android:layout_width="wrap_content"

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

@@ -132,6 +132,7 @@
<dimen name="module_ext_common_corner">30px</dimen>
<dimen name="module_ext_button_width">120px</dimen>
<dimen name="module_ext_button_height">120px</dimen>
<dimen name="module_ext_button_height_small">80px</dimen>
<dimen name="module_ext_camera_button_marginTop">10px</dimen>
<dimen name="module_ext_display_overview_textSize">22px</dimen>
<dimen name="module_ext_display_overview_textSize_large">28px</dimen>

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

@@ -138,6 +138,7 @@
<dimen name="module_ext_north_goneMarginTop">142px</dimen>
<dimen name="module_ext_button_width">66px</dimen>
<dimen name="module_ext_button_height">66px</dimen>
<dimen name="module_ext_button_height_small">44px</dimen>
<dimen name="module_ext_camera_button_marginTop">10px</dimen>
<dimen name="module_ext_display_overview_textSize">12px</dimen>
<dimen name="module_ext_display_overview_textSize_large">14px</dimen>
@@ -173,4 +174,8 @@
<dimen name="module_ext_seek_help_notice_number_text_size">22px</dimen>
<dimen name="module_ext_seek_help_notice_bg_margin_top">16px</dimen>
<dimen name="module_ext_navi_small_corner">11px</dimen>
<dimen name="module_ext_navi_small_margin_bottom">11px</dimen>
<dimen name="module_ext_navi_small_margin_right">10px</dimen>
</resources>

8
modules/mogo-module-main/build.gradle
View File

@@ -46,23 +46,15 @@ dependencies {
api rootProject.ext.dependencies.mogoutils
api rootProject.ext.dependencies.mogocommons
api rootProject.ext.dependencies.modulecommon
api rootProject.ext.dependencies.modulemap
api rootProject.ext.dependencies.mogoserviceapi
api rootProject.ext.dependencies.mogoservice
api rootProject.ext.dependencies.moduleservice
api rootProject.ext.dependencies.moduleapps
api rootProject.ext.dependencies.moduleextensions
compileOnly rootProject.ext.dependencies.skinsupport
} else {
api project(":foudations:mogo-utils")
api project(":foudations:mogo-commons")
api project(':modules:mogo-module-common')
api project(':modules:mogo-module-map')
api project(':modules:mogo-module-service')
api project(':services:mogo-service-api')
api project(':services:mogo-service')
api project(':modules:mogo-module-apps')
api project(':modules:mogo-module-extensions')
compileOnly project(':skin:mogo-skin-support')
}
}

93
modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
View File

@@ -18,7 +18,6 @@ import com.mogo.map.location.MogoLocation;
import com.mogo.map.marker.IMogoMarker;
import com.mogo.map.marker.IMogoMarkerClickListener;
import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.map.MapCenterPointStrategy;
import com.mogo.module.common.map.Scene;
@@ -28,7 +27,6 @@ import com.mogo.module.main.windowview.FloatingViewHandler;
import com.mogo.service.IMogoServiceApis;
import com.mogo.service.adas.IMogoADASControlStatusChangedListener;
import com.mogo.service.fragmentmanager.IMogoFragmentManager;
import com.mogo.service.map.IMogoMapService;
import com.mogo.service.module.IMogoModuleProvider;
import com.mogo.service.statusmanager.IMogoStatusManager;
import com.mogo.skin.support.SkinMode;
@@ -53,12 +51,9 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
protected static final String TAG = MainActivity.class.getSimpleName();
protected IMogoServiceApis mServiceApis;
protected IMogoMapService mMogoMapService;
protected IMogoMapUIController mMogoMapUIController;
protected IMogoFragmentManager mMogoFragmentManager;
protected IMogoStatusManager mMogoStatusManager;
// protected View mHeader;
protected View mApps;
protected View mEntrance;
protected View mEventPanel;
@@ -70,6 +65,9 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
@Override
protected int getLayoutId() {
if ( !DebugConfig.isMapBased() ) {
return R.layout.module_main_activity_main_no_map;
}
return R.layout.module_main_activity_main;
}
@@ -95,7 +93,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
getWindow().setBackgroundDrawable( null );
// mHeader = findViewById( R.id.module_main_id_header_fragment_container );
mApps = findViewById( R.id.module_main_id_apps_fragment_container );
mEntrance = findViewById( R.id.module_main_id_entrance_fragment_container );
mEventPanel = findViewById( R.id.module_main_id_event_panel_fragment_container );
@@ -115,7 +112,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
// 隐藏布局
protected void hideLayout() {
// mHeader.setVisibility( View.GONE );
mEntrance.setVisibility( View.GONE );
mEventPanel.setVisibility( View.GONE );
mFloatingLayout.setVisibility( View.GONE );
@@ -123,7 +119,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
// 显示布局
protected void showLayout() {
// mHeader.setVisibility( View.VISIBLE );
mEntrance.setVisibility( View.VISIBLE );
mEventPanel.setVisibility( View.VISIBLE );
mFloatingLayout.setVisibility( View.VISIBLE );
@@ -132,7 +127,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
@Override
protected void onCreate( @Nullable Bundle savedInstanceState ) {
super.onCreate( savedInstanceState );
ContextHolderUtil.holdContext(this);
ContextHolderUtil.holdContext( this );
mPresenter.postLoadModuleMsg();
}
@@ -154,41 +149,32 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
MogoModulesManager.getInstance().init( this );
loadSplash();
mMogoMapService = mServiceApis.getMapServiceApi();
if ( mMogoMapService != null ) {
mMogoMapService.getHostListenerRegister().registerHostMapListener( EventDispatchCenter.getInstance() );
mMogoMapService.getHostListenerRegister().registerHostNaviListener( EventDispatchCenter.getInstance() );
mMogoMapService.getHostListenerRegister().registerHostAimlessModeListener( EventDispatchCenter.getInstance() );
mMogoMapService.getHostListenerRegister().registerMarkerClickListener( this );
}
// IMogoObuManager obuManager = mServiceApis.getObuManager();
// if(obuManager!=null) {
// obuManager.registerObuDataChangedListener(EventDispatchCenter.getInstance());
// }
if ( DebugConfig.isMapBased() ) {
if ( mServiceApis.getMapServiceApi() != null ) {
mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostMapListener( EventDispatchCenter.getInstance() );
mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostNaviListener( EventDispatchCenter.getInstance() );
mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostAimlessModeListener( EventDispatchCenter.getInstance() );
mServiceApis.getMapServiceApi().getHostListenerRegister().registerMarkerClickListener( this );
}
}
if ( DebugConfig.isSkinSupported() ) {
initAdasControlStatusListener();
}
EventDispatchCenter.getInstance().setMapLoadedCallback( () -> {
Logger.d( TAG, "map loaded." + Thread.currentThread().getName() );
// 右移地图中心点
mMogoMapUIController = mMogoMapService.getMapUIController();
MapCenterPointStrategy.init();
MapCenterPointStrategy.setMapCenterPointByScene( mMogoMapUIController, Scene.AIMLESS );
// 加载地图，触发地图加载完毕回调，在初始化其他卡片模块，保证卡片模块可以正确获取地图相关服务。
loadContainerModules();
MogoModulesManager.getInstance().loadModules();
mPresenter.delayOperations();
// 启动一些基本的服务：定位等
startBaseService();
Log.i( "timer", "cost " + ( System.currentTimeMillis() - start ) + "ms" );
} );
MogoModulesManager.getInstance().loadMapModule( R.id.module_main_id_map_fragment_container );
if ( DebugConfig.isMapBased() ) {
EventDispatchCenter.getInstance().setMapLoadedCallback( () -> {
Logger.d( TAG, "map loaded." + Thread.currentThread().getName() );
resetMapCenterPoint();
loadOthersModules();
Log.i( "timer", "cost " + ( System.currentTimeMillis() - start ) + "ms" );
} );
MogoModulesManager.getInstance().loadMapModule( R.id.module_main_id_map_fragment_container );
} else {
loadOthersModules();
}
mMogoFragmentManager = mServiceApis.getFragmentManagerApi();
mMogoFragmentManager.init( this, R.id.module_main_id_search_fragment );
@@ -201,9 +187,22 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
}
} );
// 初始化MonitorModule
// IMogoMonitorProvider monitorProvider = (IMogoMonitorProvider) ARouter.getInstance().build(MogoServicePaths.PATH_MOGO_MONITOR).navigation(this);
// monitorProvider.resetActivityContext(this);
}
private void resetMapCenterPoint() {
// 右移地图中心点
MapCenterPointStrategy.init();
MapCenterPointStrategy.setMapCenterPointByScene( mServiceApis.getMapServiceApi().getMapUIController(), Scene.AIMLESS );
}
private void loadOthersModules() {
// 加载地图，触发地图加载完毕回调，在初始化其他卡片模块，保证卡片模块可以正确获取地图相关服务。
loadContainerModules();
MogoModulesManager.getInstance().loadModules();
mPresenter.delayOperations();
// 启动一些基本的服务：定位等
startBaseService();
}
private void initAdasControlStatusListener() {
@@ -220,7 +219,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
}
protected void loadContainerModules() {
// MogoModulesManager.getInstance().loadExtensionsModule( R.id.module_main_id_header_fragment_container );
MogoModulesManager.getInstance().loadEntrancesModule( R.id.module_main_id_entrance_fragment_container );
MogoModulesManager.getInstance().loadEventPanelModule( R.id.module_main_id_event_panel_fragment_container );
MogoModulesManager.getInstance().loadLeftPanelModule( R.id.module_main_id_left_panel_fragment_container );
@@ -228,6 +226,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
@Override
public void hideCoverUpLayout() {
Logger.d( TAG, "隐藏遮罩" );
mCoverUpLayout.setVisibility( View.GONE );
mServiceApis.getAdasControllerApi().showADAS();
}
@@ -345,13 +344,11 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
@Override
protected void onDestroy() {
super.onDestroy();
mMogoMapService.getHostListenerRegister().unregisterMarkerClickListener();
mMogoMapService.getHostListenerRegister().unregisterHostAimlessModeListener();
mMogoMapService.getHostListenerRegister().unregisterHostNaviListener();
mMogoMapService.getHostListenerRegister().unregisterHostMapListener();
mServiceApis.getMapServiceApi().getHostListenerRegister().unregisterMarkerClickListener();
mServiceApis.getMapServiceApi().getHostListenerRegister().unregisterHostAimlessModeListener();
mServiceApis.getMapServiceApi().getHostListenerRegister().unregisterHostNaviListener();
mServiceApis.getMapServiceApi().getHostListenerRegister().unregisterHostMapListener();
mMogoStatusManager.setMainPageLaunchedStatus( TAG, false );
mMogoMapService = null;
mMogoMapUIController = null;
mMogoFragmentManager.unregisterMainFragmentStackTransactionListener();
mMogoFragmentManager = null;
mServiceApis.getMapServiceApi().getMapViewInstanceHandler().destroy();

5
modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
View File

@@ -6,12 +6,9 @@ import android.content.Context;
import androidx.fragment.app.Fragment;
import com.alibaba.android.arouter.launcher.ARouter;
import com.alibaba.idst.nls.internal.utils.L;
import com.mogo.module.common.MogoModule;
import com.mogo.module.common.MogoModulePaths;
import com.mogo.module.extensions.ExtensionsModuleConst;
import com.mogo.module.main.MainActivity;
import com.mogo.service.IMogoServiceApis;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.module.IMogoModuleProvider;
import com.mogo.utils.ResourcesHelper;
@@ -123,7 +120,7 @@ public class MogoModulesManager implements MogoModulesHandler {
@Override
public void loadEntrancesModule( int containerId ) {
IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance()
.build( ExtensionsModuleConst.PATH_ENTRANCE )
.build( MogoModulePaths.PATH_ENTRANCE )
.navigation( getContext() );
addFragment( provider, containerId );
}

3
modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
View File

@@ -79,8 +79,7 @@
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:background="@drawable/main_bitmap_splash_bg"
android:visibility="visible"
/>
android:visibility="visible" />
<FrameLayout
android:id="@+id/module_main_id_splash_container"

90
modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml Normal file
View File

@@ -0,0 +1,90 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<!-- 地图-->
<FrameLayout
android:id="@+id/module_main_id_map_fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<FrameLayout
android:id="@+id/module_main_id_map_left_shadow_frame"
android:layout_width="@dimen/module_main_map_left_shadow_frame_width"
android:layout_height="match_parent"
android:background="@drawable/module_main_dw_left_frame_bkg"
android:visibility="gone"
tools:visibility="visible" />
<!-- 左边按钮 -->
<FrameLayout
android:id="@+id/module_main_id_apps_fragment_container"
android:layout_width="@dimen/module_main_apps_fragment_container_width"
android:layout_height="match_parent"
android:paddingLeft="@dimen/module_main_apps_fragment_container_padding"
android:paddingRight="@dimen/module_main_apps_fragment_container_padding"
android:paddingTop="@dimen/module_main_apps_fragment_container_paddingTop"
android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop"/>
<!-- 左侧浮层,布局位置目前只考虑了1+16独立app情况 -->
<FrameLayout
android:id="@+id/module_main_id_left_panel_fragment_container"
android:layout_width="@dimen/module_main_id_left_panel_fragment_container_width"
android:layout_height="match_parent" />
<!-- 浮层-->
<FrameLayout
android:id="@+id/module_main_id_floating_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<FrameLayout
android:id="@+id/module_main_id_event_panel_fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft"
android:paddingLeft="@dimen/module_main_apps_fragment_container_padding"
android:paddingRight="@dimen/module_main_apps_fragment_container_padding"
android:paddingTop="@dimen/module_main_apps_fragment_container_paddingTop"
android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop" />
<!--快捷操作浮层-->
<FrameLayout
android:id="@+id/module_main_id_entrance_fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft"
android:paddingLeft="@dimen/module_main_apps_fragment_container_padding"
android:paddingRight="@dimen/module_main_apps_fragment_container_padding"
android:paddingTop="@dimen/module_main_apps_fragment_container_paddingTop"
android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop" />
<FrameLayout
android:id="@+id/module_main_id_message_history_fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft"/>
<FrameLayout
android:id="@+id/module_main_id_search_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<ImageView
android:id="@+id/module_main_id_cover_up"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:background="@drawable/main_bitmap_splash_bg"
android:visibility="visible" />
<FrameLayout
android:id="@+id/module_main_id_splash_container"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>

4
modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/AnimCircleImageView.java
View File

@@ -63,8 +63,8 @@ public class AnimCircleImageView extends ImageView implements IMogoSkinCompatSup
mDrawbleSrc = getDrawable();
isRotateEnable = false;
isRotating = false;
delayMilliseconds = CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ? 10 : 450;
mRotateAngleStep = CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ? 1 : 3;
delayMilliseconds = CarSeries.isF8xxSeries() ? 10 : 450;
mRotateAngleStep = CarSeries.isF8xxSeries() ? 1 : 3;
}
@Override

3
modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt
View File

@@ -7,6 +7,7 @@ import android.os.Bundle
import android.view.View
import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.LinearLayoutManager
import com.mogo.commons.debug.DebugConfig
import com.mogo.commons.voice.AIAssist
import com.mogo.commons.voice.IMogoVoiceCmdCallBack
import com.mogo.map.MogoLatLng
@@ -189,7 +190,7 @@ class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBa
arrayList[mAdapter.current].icon(getMarkerIcon(mAdapter.current))
if (moveToCenter) {
SearchApisHolder.getStatusManager().setUserInteractionStatus(TAG, true, false)
SearchApisHolder.getUiControllerApis().moveToCenter(current.position, CarSeries.CAR_SERIES_F80X == CarSeries.getSeries())
SearchApisHolder.getUiControllerApis().moveToCenter(current.position, CarSeries.isF8xxSeries())
}
}

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

@@ -8,6 +8,7 @@ import android.graphics.Rect;
import androidx.core.content.ContextCompat;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.module.common.utils.CarSeries;
/**
@@ -55,7 +56,7 @@ public class BitmapUtils {
} else {
x = ( width - bounds.width() ) / 2;
}
if ( CarSeries.CAR_SERIES_F80X == CarSeries.getSeries() ) {
if ( CarSeries.isF8xxSeries() ) {
y = ( height - bounds.height() ) / 2 + bounds.height() - 5.5f;
} else {
y = ( height - bounds.height() ) / 2 + bounds.height() - 2.5f;

12
modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
View File

@@ -594,9 +594,6 @@ public class MogoServices implements IMogoMapListener,
}
private void stopAutoRefreshStrategy( boolean stopOnlineCarRefresh ) {
if ( DebugConfig.isDebug() ) {
Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
}
Logger.d( TAG, "stop auto refresh strategy" );
mHandler.removeMessages( ServiceConst.MSG_TYPE_REFRESH_DECREASE );
if ( stopOnlineCarRefresh ) {
@@ -712,6 +709,10 @@ public class MogoServices implements IMogoMapListener,
@Override
public void onLocationChanged( MogoLocation location ) {
if ( !DebugConfig.isMapBased() ) {
return;
}
if ( !mStatusManager.isMainPageLaunched() ) {
return;
}
@@ -777,6 +778,11 @@ public class MogoServices implements IMogoMapListener,
* 刷新数据
*/
private void notifyRefreshData( MogoLatLng latLng, int radius, RefreshCallback callback ) {
if ( !DebugConfig.isMapBased() ) {
return;
}
if ( !mStatusManager.isMainPageLaunched() ) {
return;
}

5
modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java
View File

@@ -3,6 +3,7 @@ package com.mogo.module.service.intent;
import android.content.Context;
import android.content.Intent;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.module.common.utils.CarSeries;
import com.mogo.module.service.MarkerServiceHandler;
import com.mogo.module.service.ServiceConst;
@@ -50,12 +51,12 @@ class AccStatusIntentHandler implements IntentHandler {
public void handle( Context context, Intent intent ) {
String action = intent.getAction();
if ( Intent.ACTION_POWER_CONNECTED.equals( action ) ) {
if ( CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ) {
if ( CarSeries.isF8xxSeries() ) {
MarkerServiceHandler.getMogoStatusManager().setAccStatus( ServiceConst.TYPE, true );
Logger.d( TAG, "acc status: %s", true );
}
} else if ( Intent.ACTION_POWER_DISCONNECTED.equals( action ) ) {
if ( CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ) {
if ( CarSeries.isF8xxSeries() ) {
MarkerServiceHandler.getMogoStatusManager().setAccStatus( ServiceConst.TYPE, false );
Logger.d( TAG, "acc status: %s", false );
}

3
modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java
View File

@@ -6,6 +6,7 @@ import android.os.Handler;
import android.os.Message;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.map.marker.IMogoMarker;
import com.mogo.map.marker.MogoMarkerOptions;
import com.mogo.map.uicontroller.CarCursorOption;
@@ -128,7 +129,7 @@ public class CarIconDisplayStrategy {
private CarCursorOption mOption;
public void changeCarIconStatus( boolean seekHelpingStatus ) {
if ( CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ) {
if ( CarSeries.isF8xxSeries() ) {
if ( seekHelpingStatus ) {
playSeekHelpingAnim();
} else {

2
modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt
View File

@@ -35,7 +35,7 @@ class GridFixableShareDialog(context: Context) : BaseFloatDialog(context) {
private fun setWrapContent() {
val window = window
if (CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X) {
if (CarSeries.isF8xxSeries()) {
if (window != null) {
val lp = window.attributes
lp.width = 1920

2
modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java
View File

@@ -84,7 +84,7 @@ public class LaucherShareDialog extends BaseFloatDialog implements View.OnClickL
lp.height = 600;
window.setAttributes(lp);
}
}else if(CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X){
}else if(CarSeries.isF8xxSeries()){
if (window != null) {
WindowManager.LayoutParams lp = window.getAttributes();
lp.width = 1920;

2
modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt
View File

@@ -52,7 +52,7 @@ object UploadHelper {
val location = ServiceApisManager.serviceApis.mapServiceApi.getSingletonLocationClient(context).lastKnowLocation
val latLon = MogoLatLng(location.latitude, location.longitude)
type.location = latLon
Logger.d("UploadHelper", "upload ----> $type")
Logger.d("UploadHelper", "upload type----> $type")
ServiceApisManager.serviceApis.tanluApi.uploadRoadCondition(type)
//语音播报
showVoiceTip(context, type.eventType)

18
modules/mogo-module-tanlu/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlu.java Normal file
View File

@@ -0,0 +1,18 @@
package com.alibaba.android.arouter.routes;
import com.alibaba.android.arouter.facade.enums.RouteType;
import com.alibaba.android.arouter.facade.model.RouteMeta;
import com.alibaba.android.arouter.facade.template.IRouteGroup;
import com.mogo.module.tanlu.fragment.TanluCardViewProvider;
import java.lang.Override;
import java.lang.String;
import java.util.Map;
/**
* DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
public class ARouter$$Group$$tanlu implements IRouteGroup {
@Override
public void loadInto(Map<String, RouteMeta> atlas) {
atlas.put("/tanlu/ui", RouteMeta.build(RouteType.PROVIDER, TanluCardViewProvider.class, "/tanlu/ui", "tanlu", null, -1, -2147483648));
}
}

18
modules/mogo-module-tanlu/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomoduletanlu.java Normal file
View File

@@ -0,0 +1,18 @@
package com.alibaba.android.arouter.routes;
import com.alibaba.android.arouter.facade.enums.RouteType;
import com.alibaba.android.arouter.facade.model.RouteMeta;
import com.alibaba.android.arouter.facade.template.IProviderGroup;
import com.mogo.module.tanlu.fragment.TanluCardViewProvider;
import java.lang.Override;
import java.lang.String;
import java.util.Map;
/**
* DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
public class ARouter$$Providers$$mogomoduletanlu implements IProviderGroup {
@Override
public void loadInto(Map<String, RouteMeta> providers) {
providers.put("com.mogo.service.share.IMogoTanluUiProvider", RouteMeta.build(RouteType.PROVIDER, TanluCardViewProvider.class, "/tanlu/ui", "tanlu", null, -1, -2147483648));
}
}

17
modules/mogo-module-tanlu/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomoduletanlu.java Normal file
View File

@@ -0,0 +1,17 @@
package com.alibaba.android.arouter.routes;
import com.alibaba.android.arouter.facade.template.IRouteGroup;
import com.alibaba.android.arouter.facade.template.IRouteRoot;
import java.lang.Class;
import java.lang.Override;
import java.lang.String;
import java.util.Map;
/**
* DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
public class ARouter$$Root$$mogomoduletanlu implements IRouteRoot {
@Override
public void loadInto(Map<String, Class<? extends IRouteGroup>> routes) {
routes.put("tanlu", ARouter$$Group$$tanlu.class);
}
}

18
modules/mogo-module-tanlu/build/generated/source/buildConfig/debug/com/mogo/module/tanlu/BuildConfig.java Normal file
View File

@@ -0,0 +1,18 @@
/**
* Automatically generated file. DO NOT MODIFY
*/
package com.mogo.module.tanlu;
public final class BuildConfig {
public static final boolean DEBUG = Boolean.parseBoolean("true");
public static final String LIBRARY_PACKAGE_NAME = "com.mogo.module.tanlu";
/**
* @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
*/
@Deprecated
public static final String APPLICATION_ID = "com.mogo.module.tanlu";
public static final String BUILD_TYPE = "debug";
public static final String FLAVOR = "";
public static final int VERSION_CODE = 1;
public static final String VERSION_NAME = "2.0.0";
}

56
modules/mogo-module-tanlu/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml Normal file
View File

@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mogo.module.tanlu"
android:versionCode="1"
android:versionName="2.0.0" >
<uses-sdk
android:minSdkVersion="19"
android:targetSdkVersion="22" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<application>
<activity
android:name="com.mogo.module.tanlu.video.FullMediaActivity"
android:hardwareAccelerated="true" >
</activity>
<receiver android:name="com.mogo.module.tanlu.receiver.MarkerInfoReceiver" >
<intent-filter>
<action android:name="com.zhidao.roadcondition.marker.info" />
<category android:name="android.intent.category.HOME" />
</intent-filter>
</receiver>
<receiver android:name="com.mogo.module.tanlu.receiver.GetInfoFailedReceiver" >
<intent-filter>
<action android:name="com.zhidao.roadcondition.getinfo.failed" />
<category android:name="android.intent.category.HOME" />
</intent-filter>
</receiver>
<receiver android:name="com.mogo.module.tanlu.receiver.PushReceiver" >
<intent-filter>
<action android:name="com.zhidao.roadcondition.split" />
<category android:name="android.intent.category.HOME" />
</intent-filter>
</receiver>
<receiver android:name="com.mogo.module.tanlu.receiver.ShareDialogReceiver" >
<intent-filter>
<action android:name="com.zhidao.sharedialog" />
<category android:name="android.intent.category.HOME" />
</intent-filter>
</receiver>
<receiver android:name="com.mogo.module.tanlu.receiver.DataErrorReceiver" >
<intent-filter>
<action android:name="com.zhidao.tanlu.dataerror" />
<category android:name="android.intent.category.HOME" />
</intent-filter>
</receiver>
</application>
</manifest>

1
modules/mogo-module-tanlu/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json Normal file
View File

@@ -0,0 +1 @@
[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"2.0.0","enabled":true,"outputFile":"mogo-module-tanlu-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.mogo.module.tanlu","split":""}}]

1
modules/mogo-module-tanlu/build/intermediates/annotation_processor_list/debug/annotationProcessors.json Normal file
View File

@@ -0,0 +1 @@
{"jetified-arouter-compiler-1.2.2.jar (com.alibaba:arouter-compiler:1.2.2)":false,"auto-service-1.0-rc2.jar (com.google.auto.service:auto-service:1.0-rc2)":false}

0
modules/mogo-module-tanlu/build/intermediates/annotations_typedef_file/debug/extractDebugAnnotations/typedefs.txt Normal file
View File

BIN
modules/mogo-module-tanlu/build/intermediates/compile_library_classes/debug/classes.jar Normal file
View File

Binary file not shown.

BIN
modules/mogo-module-tanlu/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar Normal file
View File

Binary file not shown.

0
modules/mogo-module-tanlu/build/intermediates/consumer_proguard_file/debug/proguard.txt Normal file
View File

BIN
modules/mogo-module-tanlu/build/intermediates/incremental/debug-mergeJavaRes/merge-state Normal file
View File

Binary file not shown.

BIN
modules/mogo-module-tanlu/build/intermediates/incremental/debug-mergeNativeLibs/merge-state Normal file
View File

Binary file not shown.

2
modules/mogo-module-tanlu/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/debug/jniLibs"/></dataSet></merger>

2
modules/mogo-module-tanlu/build/intermediates/incremental/mergeDebugShaders/merger.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/src/debug/shaders"/></dataSet></merger>

Some files were not shown because too many files have changed in this diff Show More