diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index d90f9010c4..26d57160e8 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -58,7 +58,7 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addModule(new MogoModule(TanluConstants.TAG, TanluConstants.MODEL_NAME)); MogoModulePaths.addModule(new MogoModule(OnLineCarConstants.TAG, OnLineCarConstants.MODULE_NAME)); - MogoModulePaths.addModule(new MogoModule(V2XConst.PATH_V2X_UI, V2XConst.PATH_V2X_UI)); +// MogoModulePaths.addModule(new MogoModule(V2XConst.PATH_V2X_UI, V2XConst.PATH_V2X_UI)); MogoModulePaths.addModule(new MogoModule(PushUIConstants.TAG, PushUIConstants.TAG)); MogoModulePaths.addModule(new MogoModule(BackToLauncherConst.MODULE_PATH, BackToLauncherConst.MODULE_NAME)); Log.i("timer", "cost " + (System.currentTimeMillis() - start) + "ms"); diff --git a/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java b/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java index 2b81874a27..52bf70be04 100644 --- a/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java +++ b/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java @@ -1,6 +1,7 @@ package com.zhidao.mogo.module.main.independent; import android.os.Bundle; +import android.view.View; import android.widget.FrameLayout; import androidx.annotation.Nullable; @@ -29,6 +30,6 @@ public class MainIndependentActivity extends MainActivity { headerParams.leftMargin = getResources().getDimensionPixelSize( R.dimen.module_main_header_fragment_container_marginLeft ); mHeader.setLayoutParams( headerParams ); - + mApps.setVisibility( View.GONE ); } } diff --git a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java index c8ff91a8ad..d0bf8eb98e 100644 --- a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java +++ b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java @@ -32,7 +32,6 @@ public class MainLauncherActivity extends MainActivity { @Override protected void initViews() { super.initViews(); - mApps.setVisibility( View.GONE ); } @Override diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java index 7944f3a06e..7bee8a08a0 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java @@ -158,117 +158,119 @@ public class MockIntentHandler implements IntentHandler { } case 14: { List< MogoLatLng > mogoLatLngs = new ArrayList<>(); - mogoLatLngs.add(new MogoLatLng(116.396716,39.615986)); - mogoLatLngs.add(new MogoLatLng(116.396995,39.616007)); - mogoLatLngs.add(new MogoLatLng(116.397169,39.616012)); - mogoLatLngs.add(new MogoLatLng(116.397343,39.616017)); - mogoLatLngs.add(new MogoLatLng(116.397517,39.616022)); - mogoLatLngs.add(new MogoLatLng(116.397693,39.616029)); - mogoLatLngs.add(new MogoLatLng(116.397896,39.616039)); - mogoLatLngs.add(new MogoLatLng(116.3981,39.616051)); - mogoLatLngs.add(new MogoLatLng(116.39827,39.616058)); - mogoLatLngs.add(new MogoLatLng(116.398441,39.616066)); - mogoLatLngs.add(new MogoLatLng(116.398612,39.616074)); - mogoLatLngs.add(new MogoLatLng(116.398787,39.616083)); - mogoLatLngs.add(new MogoLatLng(116.39899,39.616093)); - mogoLatLngs.add(new MogoLatLng(116.399195,39.616105)); - mogoLatLngs.add(new MogoLatLng(116.399334,39.616112)); - mogoLatLngs.add(new MogoLatLng(116.399473,39.61612)); - mogoLatLngs.add(new MogoLatLng(116.399612,39.616128)); - mogoLatLngs.add(new MogoLatLng(116.399751,39.616136)); - mogoLatLngs.add(new MogoLatLng(116.399893,39.616148)); - mogoLatLngs.add(new MogoLatLng(116.40008,39.616153)); - mogoLatLngs.add(new MogoLatLng(116.400301,39.616159)); - mogoLatLngs.add(new MogoLatLng(116.400471,39.616167)); - mogoLatLngs.add(new MogoLatLng(116.400642,39.616175)); - mogoLatLngs.add(new MogoLatLng(116.400813,39.616183)); - mogoLatLngs.add(new MogoLatLng(116.400988,39.616192)); - mogoLatLngs.add(new MogoLatLng(116.401191,39.616201)); - mogoLatLngs.add(new MogoLatLng(116.401396,39.616213)); - mogoLatLngs.add(new MogoLatLng(116.401728,39.616235)); - mogoLatLngs.add(new MogoLatLng(116.401986,39.616246)); - mogoLatLngs.add(new MogoLatLng(116.402146,39.61625)); - mogoLatLngs.add(new MogoLatLng(116.402307,39.616255)); - mogoLatLngs.add(new MogoLatLng(116.402468,39.61626)); - mogoLatLngs.add(new MogoLatLng(116.40263,39.616267)); - mogoLatLngs.add(new MogoLatLng(116.402762,39.616272)); - mogoLatLngs.add(new MogoLatLng(116.402894,39.616277)); - mogoLatLngs.add(new MogoLatLng(116.403026,39.616282)); - mogoLatLngs.add(new MogoLatLng(116.403158,39.616287)); - mogoLatLngs.add(new MogoLatLng(116.40329,39.616292)); - mogoLatLngs.add(new MogoLatLng(116.403422,39.616297)); - mogoLatLngs.add(new MogoLatLng(116.403554,39.616302)); - mogoLatLngs.add(new MogoLatLng(116.403686,39.616307)); - mogoLatLngs.add(new MogoLatLng(116.403821,39.616321)); - mogoLatLngs.add(new MogoLatLng(116.404045,39.616331)); - mogoLatLngs.add(new MogoLatLng(116.404272,39.616343)); - mogoLatLngs.add(new MogoLatLng(116.404551,39.616353)); - mogoLatLngs.add(new MogoLatLng(116.404753,39.616363)); - mogoLatLngs.add(new MogoLatLng(116.404958,39.616375)); - mogoLatLngs.add(new MogoLatLng(116.405055,39.616375)); - mogoLatLngs.add(new MogoLatLng(116.405184,39.616379)); - mogoLatLngs.add(new MogoLatLng(116.405313,39.616384)); - mogoLatLngs.add(new MogoLatLng(116.405442,39.616389)); - mogoLatLngs.add(new MogoLatLng(116.405571,39.616394)); - mogoLatLngs.add(new MogoLatLng(116.4057,39.616399)); - mogoLatLngs.add(new MogoLatLng(116.405829,39.616404)); - mogoLatLngs.add(new MogoLatLng(116.405958,39.616409)); - mogoLatLngs.add(new MogoLatLng(116.406087,39.616414)); - mogoLatLngs.add(new MogoLatLng(116.406216,39.616419)); - mogoLatLngs.add(new MogoLatLng(116.406345,39.616424)); - mogoLatLngs.add(new MogoLatLng(116.406474,39.616429)); - mogoLatLngs.add(new MogoLatLng(116.406611,39.61644)); - mogoLatLngs.add(new MogoLatLng(116.406879,39.616461)); - mogoLatLngs.add(new MogoLatLng(116.407033,39.616465)); - mogoLatLngs.add(new MogoLatLng(116.407187,39.616469)); - mogoLatLngs.add(new MogoLatLng(116.407341,39.616473)); - mogoLatLngs.add(new MogoLatLng(116.407495,39.616477)); - mogoLatLngs.add(new MogoLatLng(116.407694,39.616483)); - mogoLatLngs.add(new MogoLatLng(116.407876,39.616493)); - mogoLatLngs.add(new MogoLatLng(116.408059,39.616504)); - mogoLatLngs.add(new MogoLatLng(116.408327,39.616515)); - mogoLatLngs.add(new MogoLatLng(116.408596,39.616526)); - mogoLatLngs.add(new MogoLatLng(116.408757,39.616536)); - mogoLatLngs.add(new MogoLatLng(116.409025,39.616547)); - mogoLatLngs.add(new MogoLatLng(116.409227,39.616556)); - mogoLatLngs.add(new MogoLatLng(116.409432,39.616568)); - mogoLatLngs.add(new MogoLatLng(116.409711,39.616579)); - mogoLatLngs.add(new MogoLatLng(116.409914,39.61659)); - mogoLatLngs.add(new MogoLatLng(116.410119,39.616601)); - mogoLatLngs.add(new MogoLatLng(116.410387,39.616601)); - mogoLatLngs.add(new MogoLatLng(116.410602,39.616601)); - mogoLatLngs.add(new MogoLatLng(116.410816,39.616622)); - mogoLatLngs.add(new MogoLatLng(116.411084,39.616633)); - mogoLatLngs.add(new MogoLatLng(116.411395,39.616643)); - mogoLatLngs.add(new MogoLatLng(116.411492,39.616654)); - mogoLatLngs.add(new MogoLatLng(116.411771,39.616665)); - mogoLatLngs.add(new MogoLatLng(116.411974,39.616674)); - mogoLatLngs.add(new MogoLatLng(116.412178,39.616686)); - mogoLatLngs.add(new MogoLatLng(116.412447,39.616697)); - mogoLatLngs.add(new MogoLatLng(116.412586,39.616697)); - mogoLatLngs.add(new MogoLatLng(116.412876,39.616718)); - mogoLatLngs.add(new MogoLatLng(116.413144,39.616729)); - mogoLatLngs.add(new MogoLatLng(116.413347,39.616738)); - mogoLatLngs.add(new MogoLatLng(116.413551,39.61675)); - mogoLatLngs.add(new MogoLatLng(116.41383,39.61675)); - mogoLatLngs.add(new MogoLatLng(116.414002,39.616761)); - mogoLatLngs.add(new MogoLatLng(116.414098,39.616761)); - mogoLatLngs.add(new MogoLatLng(116.414279,39.616767)); - mogoLatLngs.add(new MogoLatLng(116.414461,39.616774)); - mogoLatLngs.add(new MogoLatLng(116.414645,39.616782)); - mogoLatLngs.add(new MogoLatLng(116.41483,39.616792)); - mogoLatLngs.add(new MogoLatLng(116.415016,39.616802)); - mogoLatLngs.add(new MogoLatLng(116.415203,39.616814)); - mogoLatLngs.add(new MogoLatLng(116.415395,39.616824)); - mogoLatLngs.add(new MogoLatLng(116.415589,39.616836)); - mogoLatLngs.add(new MogoLatLng(116.415745,39.616842)); - mogoLatLngs.add(new MogoLatLng(116.415902,39.616849)); - mogoLatLngs.add(new MogoLatLng(116.416061,39.616857)); - mogoLatLngs.add(new MogoLatLng(116.416307,39.616868)); + mogoLatLngs.add( new MogoLatLng( 39.615986, 116.396716 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616007, 116.396995 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616012, 116.397169 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616017, 116.397343 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616022, 116.397517 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616029, 116.397693 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616039, 116.397896 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616051, 116.3981 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616058, 116.39827 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616066, 116.398441 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616074, 116.398612 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616083, 116.398787 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616093, 116.39899 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616105, 116.399195 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616112, 116.399334 ) ); + mogoLatLngs.add( new MogoLatLng( 39.61612, 116.399473 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616128, 116.399612 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616136, 116.399751 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616148, 116.399893 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616153, 116.40008 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616159, 116.400301 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616167, 116.400471 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616175, 116.400642 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616183, 116.400813 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616192, 116.400988 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616201, 116.401191 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616213, 116.401396 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616235, 116.401728 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616246, 116.401986 ) ); + mogoLatLngs.add( new MogoLatLng( 39.61625, 116.402146 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616255, 116.402307 ) ); + mogoLatLngs.add( new MogoLatLng( 39.61626, 116.402468 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616267, 116.40263 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616272, 116.402762 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616277, 116.402894 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616282, 116.403026 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616287, 116.403158 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616292, 116.40329 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616297, 116.403422 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616302, 116.403554 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616307, 116.403686 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616321, 116.403821 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616331, 116.404045 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616343, 116.404272 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616353, 116.404551 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616363, 116.404753 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616375, 116.404958 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616375, 116.405055 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616379, 116.405184 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616384, 116.405313 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616389, 116.405442 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616394, 116.405571 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616399, 116.4057 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616404, 116.405829 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616409, 116.405958 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616414, 116.406087 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616419, 116.406216 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616424, 116.406345 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616429, 116.406474 ) ); + mogoLatLngs.add( new MogoLatLng( 39.61644, 116.406611 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616461, 116.406879 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616465, 116.407033 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616469, 116.407187 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616473, 116.407341 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616477, 116.407495 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616483, 116.407694 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616493, 116.407876 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616504, 116.408059 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616515, 116.408327 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616526, 116.408596 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616536, 116.408757 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616547, 116.409025 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616556, 116.409227 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616568, 116.409432 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616579, 116.409711 ) ); + mogoLatLngs.add( new MogoLatLng( 39.61659, 116.409914 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616601, 116.410119 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616601, 116.410387 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616601, 116.410602 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616622, 116.410816 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616633, 116.411084 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616643, 116.411395 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616654, 116.411492 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616665, 116.411771 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616674, 116.411974 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616686, 116.412178 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616697, 116.412447 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616697, 116.412586 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616718, 116.412876 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616729, 116.413144 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616738, 116.413347 ) ); + mogoLatLngs.add( new MogoLatLng( 39.61675, 116.413551 ) ); + mogoLatLngs.add( new MogoLatLng( 39.61675, 116.41383 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616761, 116.414002 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616761, 116.414098 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616767, 116.414279 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616774, 116.414461 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616782, 116.414645 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616792, 116.41483 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616802, 116.415016 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616814, 116.415203 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616824, 116.415395 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616836, 116.415589 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616842, 116.415745 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616849, 116.415902 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616857, 116.416061 ) ); + mogoLatLngs.add( new MogoLatLng( 39.616868, 116.416307 ) ); MogoMarkerOptions options = new MogoMarkerOptions(); options.icon( BitmapFactory.decodeResource( AbsMogoApplication.getApp().getResources(), R.drawable.icon_map_marker_car_gray ) ) - .position( mogoLatLngs.get( 0 ) ); + .position( mogoLatLngs.get( 0 ) ) + .autoManager( false ); IMogoMarker marker = MarkerServiceHandler.getMarkerManager().addMarker( TAG, options ); + marker.startSmooth( mogoLatLngs, intent.getIntExtra( "duration", 30 ) ); } break; }