diff --git a/.idea/misc.xml b/.idea/misc.xml index 703e5d4b89..8a8f75bfe2 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,7 +5,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index c49fec90e9..d12ced771a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,19 +55,18 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - api rootProject.ext.dependencies.androidxappcompat + implementation rootProject.ext.dependencies.androidxappcompat + implementation rootProject.ext.dependencies.arouter + implementation rootProject.ext.dependencies.androidxmultidex debugImplementation rootProject.ext.dependencies.leakcanary testImplementation rootProject.ext.dependencies.leakcanary releaseImplementation rootProject.ext.dependencies.leakcanarynoop - releaseImplementation rootProject.ext.dependencies.androidxmultidex // implementation rootProject.ext.dependencies.moduledemo // implementation rootProject.ext.dependencies.moduledemo2 implementation rootProject.ext.dependencies.carcallprovider implementation rootProject.ext.dependencies.carcall implementation rootProject.ext.dependencies.modulemedia - - implementation rootProject.ext.dependencies.moduleonlinecar if (Boolean.valueOf(RELEASE)) { diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index bb32ee6236..a1edf28be0 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -4,6 +4,7 @@ import android.content.Context; import androidx.multidex.MultiDex; +import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; import com.mogo.module.carchatting.card.CallChatConstant; @@ -12,6 +13,8 @@ import com.mogo.module.common.MogoModulePaths; import com.mogo.module.media.MediaConstants; import com.mogo.module.onlinecar.OnLineCarConstants; import com.mogo.module.tanlu.constant.TanluConstants; +import com.mogo.service.MogoServicePaths; +import com.mogo.service.connection.IMogoSocketManager; /** * @author congtaowang @@ -27,10 +30,17 @@ public class MogoApplication extends AbsMogoApplication { // MogoModulePaths.addModule( new MogoModule( DemoConstants.TAG, "CARD_DEMO" ) ); // MogoModulePaths.addModule( new MogoModule( Demo2Constants.TAG, "CARD_DEMO2" ) ); DebugConfig.setNetMode( DebugConfig.NET_MODE_QA ); - MogoModulePaths.addModule(new MogoModule(OnLineCarConstants.TAG, "CARD_TYPE_ROAD_ONLINECAR")); + MogoModulePaths.addModule( new MogoModule( OnLineCarConstants.TAG, "CARD_TYPE_ROAD_ONLINECAR" ) ); MogoModulePaths.addModule( new MogoModule( TanluConstants.TAG, "CARD_TYPE_ROAD_CONDITION" ) ); - MogoModulePaths.addModule(new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME)); - MogoModulePaths.addModule(new MogoModule( MediaConstants.TAG, MediaConstants.MODULE_TYPE) ); + MogoModulePaths.addModule( new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME ) ); + MogoModulePaths.addModule( new MogoModule( MediaConstants.TAG, MediaConstants.MODULE_TYPE ) ); + } + + @Override + protected void init() { + super.init(); + IMogoSocketManager mMogoSocketManager = ( IMogoSocketManager ) ARouter.getInstance().build( MogoServicePaths.PATH_SOCKET_MANAGER ).navigation(); + mMogoSocketManager.init( getApplicationContext(), BuildConfig.APPLICATION_ID ); } @Override diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java index af59685709..dfa7b35300 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java @@ -4,7 +4,10 @@ import android.content.Context; import com.zhidao.auto.platform.voice.VoiceClient; +import java.util.ArrayList; import java.util.HashMap; +import java.util.Iterator; +import java.util.List; import java.util.Map; /** @@ -33,7 +36,8 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack { } private final VoiceClient mVoiceClient; - private Map< String, IMogoVoiceCmdCallBack > mCmdMap = new HashMap<>(); + private Map< String, List< IMogoVoiceCmdCallBack > > mCmdMap = new HashMap<>(); + private Map< String, IMogoVoiceCmdCallBack > mVoiceMap = new HashMap<>(); private AIAssist( Context context ) { // private constructor @@ -43,15 +47,22 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack { @Override public void onCmdSelected( String cmd ) { - final IMogoVoiceCmdCallBack cmdCallBack = mCmdMap.get( cmd ); - if ( cmdCallBack != null ) { - cmdCallBack.onCmdSelected( cmd ); + if ( !mCmdMap.containsKey( cmd ) ) { + return; + } + final List< IMogoVoiceCmdCallBack > cmdCallBacks = mCmdMap.get( cmd ); + Iterator< IMogoVoiceCmdCallBack > iterator = cmdCallBacks.iterator(); + while ( iterator.hasNext() ) { + IMogoVoiceCmdCallBack callBack = iterator.next(); + if ( callBack != null ) { + callBack.onCmdSelected( cmd ); + } } } @Override public void onCmdAction( String speakText ) { - IMogoVoiceCmdCallBack cmdCallBack = mCmdMap.remove( speakText ); + IMogoVoiceCmdCallBack cmdCallBack = mVoiceMap.remove( speakText ); if ( cmdCallBack != null ) { cmdCallBack.onCmdAction( speakText ); } @@ -59,7 +70,7 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack { @Override public void onCmdCancel( String speakText ) { - IMogoVoiceCmdCallBack cmdCallBack = mCmdMap.remove( speakText ); + IMogoVoiceCmdCallBack cmdCallBack = mVoiceMap.remove( speakText ); if ( cmdCallBack != null ) { cmdCallBack.onCmdCancel( speakText ); } @@ -67,7 +78,7 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack { @Override public void onSpeakEnd( String speakText ) { - IMogoVoiceCmdCallBack callBack = mCmdMap.remove( speakText ); + IMogoVoiceCmdCallBack callBack = mVoiceMap.remove( speakText ); if ( callBack != null ) { callBack.onSpeakEnd( speakText ); } @@ -75,7 +86,7 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack { @Override public void onSpeakSelectTimeOut( String speakText ) { - IMogoVoiceCmdCallBack callBack = mCmdMap.remove( speakText ); + IMogoVoiceCmdCallBack callBack = mVoiceMap.remove( speakText ); if ( callBack != null ) { callBack.onSpeakSelectTimeOut( speakText ); } @@ -88,7 +99,7 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack { */ public void speakTTSVoice( String text, IMogoVoiceCmdCallBack callBack ) { try { - mCmdMap.put( text, callBack ); + mVoiceMap.put( text, callBack ); mVoiceClient.speakDefault( text ); } catch ( Exception e ) { } @@ -103,7 +114,7 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack { */ public void speakTTSVoice( String text, VoicePreemptType type, IMogoVoiceCmdCallBack callBack ) { try { - mCmdMap.put( text, callBack ); + mVoiceMap.put( text, callBack ); mVoiceClient.speakTypeText( text, type.getPreemptType() ); } catch ( Exception e ) { } @@ -115,7 +126,7 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack { * @param tts 播报内容 */ public void speakQAndACmd( String tts, IMogoVoiceCmdCallBack callBack ) { - mCmdMap.put( tts, callBack ); + mVoiceMap.put( tts, callBack ); mVoiceClient.speakTtsAndRegistCmd( tts ); } @@ -127,7 +138,7 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack { * @param cancelCmds 取消命令唤醒词 */ public void speakQAndACmd( String tts, String[] okCmds, String[] cancelCmds, IMogoVoiceCmdCallBack callBack ) { - mCmdMap.put( tts, callBack ); + mVoiceMap.put( tts, callBack ); mVoiceClient.speakTtsAndRegistCmd( tts, okCmds, cancelCmds ); } @@ -139,17 +150,56 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack { * @param callBack */ public void registerUnWakeupCommand( String cmd, String[] cmdWords, IMogoVoiceCmdCallBack callBack ) { - mCmdMap.put( cmd, callBack ); + if ( !mCmdMap.containsKey( cmd ) ) { + mCmdMap.put( cmd, new ArrayList< IMogoVoiceCmdCallBack >() ); + } + mCmdMap.get( cmd ).add( callBack ); mVoiceClient.registerCustomWakeupCmd( cmd, cmdWords ); } + /** + * 注册免唤醒命令 + * + * @param cmd + * @param cmdWords + */ + public void registerUnWakeupCommand( String cmd, String[] cmdWords ) { + mVoiceClient.registerCustomWakeupCmd( cmd, cmdWords ); + } + + /** + * 注册免唤醒命令回调 + * + * @param cmd + * @param callBack + */ + public synchronized void registerUnWakeupCommandCallback( String cmd, IMogoVoiceCmdCallBack callBack ) { + if ( !mCmdMap.containsKey( cmd ) ) { + mCmdMap.put( cmd, new ArrayList< IMogoVoiceCmdCallBack >() ); + } + mCmdMap.get( cmd ).add( callBack ); + } + /** * 注销免唤醒命令 * * @param cmd */ - public void unregisterUnWakeupCommand( String cmd ) { + public synchronized void unregisterUnWakeupCommand( String cmd ) { mCmdMap.remove( cmd ); mVoiceClient.unRegisterCustomWakeupCmd( cmd ); } + + /** + * 注销免唤醒命令 + * + * @param cmd + */ + public synchronized void unregisterUnWakeupCommand( String cmd, IMogoVoiceCmdCallBack callBack ) { + if ( !mCmdMap.containsKey( cmd ) ) { + return; + } + List< IMogoVoiceCmdCallBack > callBacks = mCmdMap.get( cmd ); + callBacks.remove( callBack ); + } } diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MapStyleUtils.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MapStyleUtils.java index 0ce253910b..1184654b03 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MapStyleUtils.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MapStyleUtils.java @@ -1,9 +1,13 @@ package com.mogo.map.impl.amap.utils; +import android.content.Context; import android.graphics.Bitmap; import android.graphics.Color; import com.amap.api.navi.model.RouteOverlayOptions; +import com.mogo.map.impl.amap.R; +import com.mogo.utils.ResourcesHelper; +import com.mogo.utils.WindowUtils; /** * @author congtaowang @@ -36,7 +40,7 @@ public class MapStyleUtils { public static RouteOverlayOptions getRouteOverlayOptions() { RouteOverlayOptions options = new RouteOverlayOptions(); // 设置导航线路的宽度 - options.setLineWidth( 32 ); + options.setLineWidth( 16 ); // 设置交通状况情况良好下的纹理位图 options.setSmoothTraffic( colorToBitmap( ColorEnum.route_overlay_line_normal.getColor() ) ); // 设置路线的图标 diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java index dd71df4fc9..121bd860d6 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java @@ -23,7 +23,7 @@ import com.mogo.service.module.IMogoModuleProvider; *

* 描述 */ -public class AppNavigatorFragment extends MvpFragment< IView, Presenter< IView > > implements IView { +public class AppNavigatorFragment extends MvpFragment< AppNavigatorView, AppNavigatorPresenter > implements AppNavigatorView { private View mNavigation; private View mMediaCenter; @@ -62,16 +62,14 @@ public class AppNavigatorFragment extends MvpFragment< IView, Presenter< IView > mCarSettings.setOnClickListener( view -> { } ); mApps.setOnClickListener( view -> { - mAppsFragment = new AppsFragment(); - mMogoFragmentManager.push( new FragmentDescriptor.Builder().fragment( mAppsFragment ).tag( "apps" ).notifyMainModule( false ).build() ); + openAppsPanel(); } ); } @NonNull @Override - protected Presenter< IView > createPresenter() { - return new Presenter< IView >( this ) { - }; + protected AppNavigatorPresenter createPresenter() { + return new AppNavigatorPresenter( this ); } @Override @@ -79,4 +77,17 @@ public class AppNavigatorFragment extends MvpFragment< IView, Presenter< IView > super.onActivityCreated( savedInstanceState ); mMogoFragmentManager = ( IMogoFragmentManager ) ARouter.getInstance().build( MogoServicePaths.PATH_FRAGMENT_MANAGER ).navigation( getContext() ); } + + @Override + public void openAppsPanel() { + mAppsFragment = new AppsFragment(); + mMogoFragmentManager.push( new FragmentDescriptor.Builder().hasTransition( true ).fragment( mAppsFragment ).tag( "apps" ).notifyMainModule( false ).build() ); + } + + @Override + public void closeAppsPanel() { + if ( getActivity() != null ) { + getActivity().onBackPressed(); + } + } } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorPresenter.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorPresenter.java new file mode 100644 index 0000000000..e0b257b241 --- /dev/null +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorPresenter.java @@ -0,0 +1,70 @@ +package com.mogo.module.apps; + +import androidx.annotation.NonNull; +import androidx.lifecycle.LifecycleOwner; + +import com.mogo.commons.mvp.Presenter; +import com.mogo.commons.voice.AIAssist; +import com.mogo.commons.voice.IMogoVoiceCmdCallBack; + +/** + * @author congtaowang + * @since 2020-01-12 + *

+ * 描述 + */ +public class AppNavigatorPresenter extends Presenter< AppNavigatorView > implements IMogoVoiceCmdCallBack { + + public AppNavigatorPresenter( AppNavigatorView view ) { + super( view ); + } + + @Override + public void onCreate( @NonNull LifecycleOwner owner ) { + super.onCreate( owner ); + AIAssist.getInstance( getContext() ).registerUnWakeupCommand( AppsConst.CMD_OPEN_APPS_PANEL, AppsConst.CMD_OPEN_APPS_PANEL_UN_WAKEUP_WORDS, this ); + AIAssist.getInstance( getContext() ).registerUnWakeupCommand( AppsConst.CMD_CLOSE_APPS_PANEL, AppsConst.CMD_CLOSE_APPS_PANEL_UN_WAKEUP_WORDS, this ); + } + + @Override + public void onCmdSelected( String cmd ) { + if ( mView == null ) { + return; + } + switch ( cmd ) { + case AppsConst.CMD_OPEN_APPS_PANEL: + mView.openAppsPanel(); + break; + case AppsConst.CMD_CLOSE_APPS_PANEL: + mView.closeAppsPanel(); + break; + } + } + + @Override + public void onCmdAction( String speakText ) { + + } + + @Override + public void onCmdCancel( String speakText ) { + + } + + @Override + public void onSpeakEnd( String speakText ) { + + } + + @Override + public void onSpeakSelectTimeOut( String speakText ) { + + } + + @Override + public void onDestroy( @NonNull LifecycleOwner owner ) { + super.onDestroy( owner ); + AIAssist.getInstance( getContext() ).unregisterUnWakeupCommand( AppsConst.CMD_OPEN_APPS_PANEL ); + AIAssist.getInstance( getContext() ).unregisterUnWakeupCommand( AppsConst.CMD_CLOSE_APPS_PANEL ); + } +} diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorView.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorView.java new file mode 100644 index 0000000000..52ca2e2fe0 --- /dev/null +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorView.java @@ -0,0 +1,23 @@ +package com.mogo.module.apps; + + +import com.mogo.commons.mvp.IView; + +/** + * @author congtaowang + * @since 2020-01-12 + *

+ * 描述 + */ +public interface AppNavigatorView extends IView { + + /** + * 打开全部应用 + */ + void openAppsPanel(); + + /** + * 关闭全部应用 + */ + void closeAppsPanel(); +} diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsConst.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsConst.java index 5c38567236..f56a5ba615 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsConst.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsConst.java @@ -8,5 +8,14 @@ package com.mogo.module.apps; */ public class AppsConst { + /** + * 每页显示多少个app + */ public static final int TOTAL_SIZE_EACH_PAGE = 12; + + public static final String CMD_OPEN_APPS_PANEL = "CMD_OPEN_APPS_PANEL"; + public static final String[] CMD_OPEN_APPS_PANEL_UN_WAKEUP_WORDS = {"第一个"}; + + public static final String CMD_CLOSE_APPS_PANEL = "CMD_CLOSE_APPS_PANEL"; + public static final String[] CMD_CLOSE_APPS_PANEL_UN_WAKEUP_WORDS = {"第二个"}; } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragment.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragment.java index 0ac3a0fb11..c4a2495369 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragment.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragment.java @@ -2,12 +2,16 @@ package com.mogo.module.apps; import android.os.Bundle; import android.view.View; +import android.view.animation.Animation; +import android.view.animation.TranslateAnimation; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentTransaction; import androidx.viewpager.widget.ViewPager; import com.alibaba.android.arouter.launcher.ARouter; +import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.mogo.commons.mvp.MvpFragment; import com.mogo.module.apps.model.AppInfo; import com.mogo.module.apps.view.LinePageIndicator; @@ -28,7 +32,7 @@ public class AppsFragment extends MvpFragment< AppsView, AppsPresenter > impleme public static final String TAG = "AppsFragment"; - // private BottomSheetBehavior mBottomSheetBehavior; + private BottomSheetBehavior mBottomSheetBehavior; private ViewPager mAppsPager; private AppsPagerAdapter mAppsPagerAdapter; @@ -48,24 +52,28 @@ public class AppsFragment extends MvpFragment< AppsView, AppsPresenter > impleme mAppsPager = findViewById( R.id.module_apps_id_apps_pager ); mExit = findViewById( R.id.module_apps_id_apps_exit ); mExit.setOnClickListener( view -> { - mMogoFragmentManager.pop(); + if ( getActivity() != null ) { + getActivity().onBackPressed(); + } } ); // mAppsList = findViewById( R.id.module_apps_id_apps ); // mAppsList.setLayoutManager( new GridLayoutManager( getContext(), 8 ) ); -// mBottomSheetBehavior = BottomSheetBehavior.from( mAppsList ); -// mBottomSheetBehavior.setSkipCollapsed( true ); -// mBottomSheetBehavior.setBottomSheetCallback( new BottomSheetBehavior.BottomSheetCallback() { -// @Override -// public void onStateChanged( @NonNull View bottomSheet, int newState ) { -// -// } -// -// @Override -// public void onSlide( @NonNull View bottomSheet, float slideOffset ) { -// -// } -// } ); -// mBottomSheetBehavior.setState( BottomSheetBehavior.STATE_COLLAPSED ); + mBottomSheetBehavior = BottomSheetBehavior.from( findViewById( R.id.module_apps_id_apps_container ) ); + mBottomSheetBehavior.setSkipCollapsed( true ); + mBottomSheetBehavior.setBottomSheetCallback( new BottomSheetBehavior.BottomSheetCallback() { + @Override + public void onStateChanged( @NonNull View bottomSheet, int newState ) { + if ( newState == BottomSheetBehavior.STATE_COLLAPSED ) { + mMogoFragmentManager.pop(); + } + } + + @Override + public void onSlide( @NonNull View bottomSheet, float slideOffset ) { + + } + } ); + mBottomSheetBehavior.setState( BottomSheetBehavior.STATE_EXPANDED ); mLoadingView = findViewById( R.id.module_apps_id_loading ); mLoadingView.setVisibility( View.VISIBLE ); mIndicator = findViewById( R.id.module_apps_id_indicator ); @@ -100,6 +108,34 @@ public class AppsFragment extends MvpFragment< AppsView, AppsPresenter > impleme mLoadingView.setVisibility( View.GONE ); } + @Override + public Animation onCreateAnimation( int transit, boolean enter, int nextAnim ) { + TranslateAnimation animation = null; + if ( transit == FragmentTransaction.TRANSIT_FRAGMENT_OPEN ) { + if ( enter ) { + animation = new TranslateAnimation( Animation.RELATIVE_TO_SELF, 0, Animation.RELATIVE_TO_SELF, 0, + Animation.RELATIVE_TO_SELF, 1, Animation.RELATIVE_TO_SELF, 0 ); + } else { + animation = new TranslateAnimation( Animation.RELATIVE_TO_SELF, 0, Animation.RELATIVE_TO_SELF, -1, + Animation.RELATIVE_TO_SELF, 0, Animation.RELATIVE_TO_SELF, 0 ); + } + } else if ( FragmentTransaction.TRANSIT_FRAGMENT_CLOSE == transit ) { + if ( enter ) { + animation = new TranslateAnimation( Animation.RELATIVE_TO_SELF, -1, Animation.RELATIVE_TO_SELF, 0, + Animation.RELATIVE_TO_SELF, 0, Animation.RELATIVE_TO_SELF, 0 ); + } else { + animation = new TranslateAnimation( Animation.RELATIVE_TO_SELF, 0, Animation.RELATIVE_TO_SELF, 1, + Animation.RELATIVE_TO_SELF, 0, Animation.RELATIVE_TO_SELF, 0 ); + } + } + if ( animation == null ) { + animation = new TranslateAnimation( Animation.RELATIVE_TO_SELF, 0, Animation.RELATIVE_TO_SELF, 0, + Animation.RELATIVE_TO_SELF, 0, Animation.RELATIVE_TO_SELF, 1 ); + } + animation.setDuration( 300 ); + return animation; + } + @Override public void onDestroyView() { super.onDestroyView(); diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_apps.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_apps.png new file mode 100755 index 0000000000..c564b8867f Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_apps.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_car_settings.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_car_settings.png new file mode 100755 index 0000000000..cd4253095b Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_car_settings.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_media_center.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_media_center.png new file mode 100755 index 0000000000..193b206235 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_media_center.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigation.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigation.png new file mode 100755 index 0000000000..f192abed11 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigation.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_retract.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_retract.png new file mode 100755 index 0000000000..8c37a69e35 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_retract.png differ diff --git a/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps.xml b/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps.xml index f112500208..1229ca7d01 100644 --- a/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps.xml +++ b/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps.xml @@ -12,40 +12,50 @@ - + android:layout_height="match_parent"> - - - + android:background="#0C0C0C" + app:behavior_hideable="false" + android:id="@+id/module_apps_id_apps_container" + app:behavior_peekHeight="0dp" + app:layout_behavior="@string/bottom_sheet_behavior"> - + - - \ No newline at end of file + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/anim/JSurfaceView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/anim/JSurfaceView.java index 6d4c941c8e..bbe2174e17 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/anim/JSurfaceView.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/anim/JSurfaceView.java @@ -91,7 +91,7 @@ public class JSurfaceView extends SurfaceView implements Runnable, SurfaceHolder return; } //绘制透明色 - mCanvas.drawColor( Color.TRANSPARENT, PorterDuff.Mode.CLEAR ); + mCanvas.drawColor( Color.parseColor( "#0C0C0C" ) ); Bitmap mBitmap = BitmapFactory.decodeResource( getResources(), mFrames[mCurrentPos % mFrames.length] ); Paint paint = new Paint(); @@ -112,7 +112,6 @@ public class JSurfaceView extends SurfaceView implements Runnable, SurfaceHolder @Override public void surfaceCreated( SurfaceHolder holder ) { - } @Override diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index f352cdd9cf..e24438030b 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -102,14 +102,12 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent mCompany = findViewById( R.id.module_entrance_id_company ); mCompany.setOnClickListener( view -> { - mMogoMarkerManager.addMarker( "tag", new MogoMarkerOptions().owner( "tag" ) - .latitude( 39.000 ).longitude( 136.000 ).icon( BitmapFactory.decodeResource( getResources(), R.drawable.module_ext_ic_voice ) ).anchor( 0.5f, 0.5f ) ); } ); mUploadRoadCondition = findViewById( R.id.module_entrance_id_upload_road_condition ); mUploadRoadCondition.setOnClickListener( view -> { ShareControl shareControl = new ShareControl(); - shareControl.showDialog(getActivity()); + shareControl.showDialog( getActivity() ); } ); mVRMode = findViewById( R.id.module_entrance_id_vr_mode ); diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_message.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_message.png new file mode 100644 index 0000000000..ec0f007df5 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_message.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_company.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_company.png new file mode 100755 index 0000000000..e385bd7426 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_company.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_home.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_home.png new file mode 100755 index 0000000000..ca0841b550 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_home.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_move2_current_location.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_move2_current_location.png new file mode 100755 index 0000000000..c1183aff8d Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_move2_current_location.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_search.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_search.png new file mode 100644 index 0000000000..27b414c367 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_search.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_000.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_000.png new file mode 100644 index 0000000000..fb93d34e52 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_000.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_001.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_001.png new file mode 100644 index 0000000000..2d90014c88 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_001.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_002.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_002.png new file mode 100644 index 0000000000..cebabd17dd Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_002.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_003.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_003.png new file mode 100644 index 0000000000..7de16583b3 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_003.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_004.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_004.png new file mode 100644 index 0000000000..889e1fda6a Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_004.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_005.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_005.png new file mode 100644 index 0000000000..af4a3d909c Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_005.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_006.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_006.png new file mode 100644 index 0000000000..0c30ddd100 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_006.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_007.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_007.png new file mode 100644 index 0000000000..c22e60f799 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_007.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_008.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_008.png new file mode 100644 index 0000000000..5fdd402211 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_008.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_009.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_009.png new file mode 100644 index 0000000000..59a89a6a49 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_009.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_010.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_010.png new file mode 100644 index 0000000000..fd41cd22e5 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_010.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_011.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_011.png new file mode 100644 index 0000000000..feccc9606d Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_011.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_012.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_012.png new file mode 100644 index 0000000000..0c8586d2d4 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_012.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_013.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_013.png new file mode 100644 index 0000000000..00d78703cd Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_013.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_014.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_014.png new file mode 100644 index 0000000000..a0dae668ff Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_014.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_015.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_015.png new file mode 100644 index 0000000000..d5c4162e35 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_015.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_016.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_016.png new file mode 100644 index 0000000000..9b942cde66 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_016.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_017.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_017.png new file mode 100644 index 0000000000..e2e429f2ad Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_017.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_018.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_018.png new file mode 100644 index 0000000000..058e5dbf6e Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_018.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_019.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_019.png new file mode 100644 index 0000000000..e992640008 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_019.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_020.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_020.png new file mode 100644 index 0000000000..974e26deca Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_020.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_021.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_021.png new file mode 100644 index 0000000000..0582f43235 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_021.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_022.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_022.png new file mode 100644 index 0000000000..3460520479 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_022.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_023.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_023.png new file mode 100644 index 0000000000..0816cb4016 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_023.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_024.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_024.png new file mode 100644 index 0000000000..0a42e16b7e Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_024.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_025.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_025.png new file mode 100644 index 0000000000..592137d15f Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_025.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_026.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_026.png new file mode 100644 index 0000000000..25d14c902b Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_026.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_027.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_027.png new file mode 100644 index 0000000000..ec90bcf254 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_027.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_028.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_028.png new file mode 100644 index 0000000000..86b9e7a5a4 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_028.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_029.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_029.png new file mode 100644 index 0000000000..4e1e94c543 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_029.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_030.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_030.png new file mode 100644 index 0000000000..35c4c10e0e Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_030.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_031.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_031.png new file mode 100644 index 0000000000..a488c1d06a Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_031.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_032.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_032.png new file mode 100644 index 0000000000..9a6a09c058 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_032.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_033.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_033.png new file mode 100644 index 0000000000..5ef54ebef8 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_033.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_034.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_034.png new file mode 100644 index 0000000000..777fc7755c Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_034.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_035.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_035.png new file mode 100644 index 0000000000..510179f739 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_035.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_036.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_036.png new file mode 100644 index 0000000000..44a13f1177 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_036.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_037.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_037.png new file mode 100644 index 0000000000..adf2e1717b Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_037.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_038.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_038.png new file mode 100644 index 0000000000..c68cd1c83f Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_038.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_039.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_039.png new file mode 100644 index 0000000000..2e94ac7513 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_039.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_040.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_040.png new file mode 100644 index 0000000000..78ab332d50 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_040.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_041.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_041.png new file mode 100644 index 0000000000..5f0fe2ea90 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_041.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_042.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_042.png new file mode 100644 index 0000000000..4ff5603fde Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_042.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_043.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_043.png new file mode 100644 index 0000000000..5d16230d11 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_043.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_044.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_044.png new file mode 100644 index 0000000000..ad98992dcd Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_044.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_045.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_045.png new file mode 100644 index 0000000000..d215c6babe Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_045.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_046.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_046.png new file mode 100644 index 0000000000..7faace9e41 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_046.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_047.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_047.png new file mode 100644 index 0000000000..7765304e6c Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_047.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_048.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_048.png new file mode 100644 index 0000000000..7bd0d2594c Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_048.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_049.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_049.png new file mode 100644 index 0000000000..9a2b57abb0 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_049.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_050.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_050.png new file mode 100644 index 0000000000..fc388fd2cd Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_050.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_051.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_051.png new file mode 100644 index 0000000000..70aeca0e4e Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_051.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_052.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_052.png new file mode 100644 index 0000000000..23394fefbc Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_052.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_053.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_053.png new file mode 100644 index 0000000000..06b0bcc1f7 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_053.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_054.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_054.png new file mode 100644 index 0000000000..d1dff8a80c Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_054.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_055.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_055.png new file mode 100644 index 0000000000..e641353fe3 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_055.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_056.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_056.png new file mode 100644 index 0000000000..4a426b4469 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_056.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_057.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_057.png new file mode 100644 index 0000000000..73f1d021da Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_057.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_058.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_058.png new file mode 100644 index 0000000000..ac72979993 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_058.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_059.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_059.png new file mode 100644 index 0000000000..1ac5a3944a Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_059.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_060.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_060.png new file mode 100644 index 0000000000..26fbfaf98a Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_060.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_061.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_061.png new file mode 100644 index 0000000000..5f1ed4104d Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_061.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_062.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_062.png new file mode 100644 index 0000000000..16d996c047 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_062.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_063.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_063.png new file mode 100644 index 0000000000..6bd058a870 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_063.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_064.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_064.png new file mode 100644 index 0000000000..cfc1f795fe Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_064.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_065.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_065.png new file mode 100644 index 0000000000..6b01b8465d Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_065.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_066.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_066.png new file mode 100644 index 0000000000..bdafd42c89 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_066.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_067.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_067.png new file mode 100644 index 0000000000..0a0eb347b4 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/mogo_tts_icon_00_067.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_cloudy.png b/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_cloudy.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_cloudy.png rename to modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_cloudy.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_dust_sand.png b/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_dust_sand.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_dust_sand.png rename to modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_dust_sand.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_duststorm.png b/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_duststorm.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_duststorm.png rename to modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_duststorm.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_fog.png b/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_fog.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_fog.png rename to modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_fog.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_haze.png b/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_haze.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_haze.png rename to modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_haze.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_heavy_rain.png b/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_heavy_rain.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_heavy_rain.png rename to modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_heavy_rain.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_light_rain.png b/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_light_rain.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_light_rain.png rename to modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_light_rain.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_moderate_rain.png b/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_moderate_rain.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_moderate_rain.png rename to modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_moderate_rain.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_overcast.png b/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_overcast.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_overcast.png rename to modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_overcast.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_severe_storm.png b/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_severe_storm.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_severe_storm.png rename to modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_severe_storm.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_shower.png b/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_shower.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_shower.png rename to modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_shower.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_snow.png b/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_snow.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_snow.png rename to modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_snow.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_sunny.png b/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_sunny.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_sunny.png rename to modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_sunny.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_thunder.png b/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_thunder.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_thunder.png rename to modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_thunder.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_thundershower.png b/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_thundershower.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_thundershower.png rename to modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_thundershower.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_unknown.png b/modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_unknown.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_unknown.png rename to modules/mogo-module-extensions/src/main/res/drawable-nodpi/ic_unknown.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_voice.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_voice.png deleted file mode 100644 index 6e46c49e70..0000000000 Binary files a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_voice.png and /dev/null differ diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml index 0323fe0232..f7b06af490 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml @@ -13,7 +13,6 @@ android:id="@+id/module_ext_id_voice" android:layout_width="@dimen/dp_120" android:layout_height="@dimen/dp_120" - android:src="@drawable/module_ext_ic_voice" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -69,8 +68,7 @@ + android:layout_height="@dimen/dp_44" /> - * 常量 - */ -public class AppConstants { - - /** - * 长链 appId - */ - public static final String SOCKET_APP_ID = "com.mogo.launcher"; -} diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 308855a442..f439f025e8 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -51,8 +51,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme private IMogoMapUIController mMogoMapUIController; private MogoModulesHandler mMogoModuleHandler; - private IMogoSocketManager mMogoSocketManager; - private OrientedViewPager mCardsContainer; private CardModulesAdapter mCardModulesAdapter; @@ -160,9 +158,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mLocationClient = mMogoMapService.getSingletonLocationClient( getApplicationContext() ); mLocationClient.addLocationListener( this ); mLocationClient.start(); - - mMogoSocketManager = ( IMogoSocketManager ) ARouter.getInstance().build( MogoServicePaths.PATH_SOCKET_MANAGER ).navigation(); - mMogoSocketManager.init( getApplicationContext(), AppConstants.SOCKET_APP_ID ); } private void loadModules() { @@ -232,6 +227,5 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mMogoModuleHandler.destroy(); mMogoModuleHandler = null; } - mMogoSocketManager = null; } } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java index ed6c080aac..a6a4ed7bf1 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java @@ -159,28 +159,47 @@ public class MogoModulesManager implements MogoModulesHandler, @Override public void setEnable( String module ) { - mEnableModuleName = module; - final Set< Map.Entry< MogoModule, IMogoModuleProvider > > entries = mModuleProviders.entrySet(); - if ( !entries.isEmpty() ) { - for ( Map.Entry< MogoModule, IMogoModuleProvider > entry : entries ) { - final MogoModule key = entry.getKey(); - final IMogoModuleProvider provider = entry.getValue(); - if ( provider.getType() != ModuleType.TYPE_CARD_FRAGMENT ) { - // 仅卡片需要生命周期 - continue; - } - final IMogoModuleLifecycle lifecycle = MogoRegisterCenterHandler.getInstance().getLifecycleListener( key.getName() ); + Iterator< IMogoModuleProvider > iterator = mModuleProviders.values().iterator(); + int counter = 0; + while ( iterator.hasNext() ) { + IMogoModuleProvider provider = iterator.next(); + if ( provider == null ) { + continue; + } + if ( provider.getType() != ModuleType.TYPE_CARD_FRAGMENT ) { + continue; + } + if ( TextUtils.equals( mEnableModuleName, provider.getModuleName() ) ) { + final IMogoModuleLifecycle lifecycle = MogoRegisterCenterHandler.getInstance().getLifecycleListener( mEnableModuleName ); if ( lifecycle != null ) { - if ( TextUtils.equals( key.getName(), mEnableModuleName ) ) { - lifecycle.onPerform(); - } else { + try { lifecycle.onDisable(); + } catch ( Exception e ) { + Logger.e( TAG, e, "error." ); } } - + counter++; + continue; + } + if ( TextUtils.equals( module, provider.getModuleName() ) ) { + final IMogoModuleLifecycle lifecycle = MogoRegisterCenterHandler.getInstance().getLifecycleListener( module ); + if ( lifecycle != null ) { + try { + lifecycle.onPerform(); + } catch ( Exception e ) { + Logger.e( TAG, e, "error." ); + } + } + counter++; + continue; + } + if ( counter == 2 ) { + break; } } + + mEnableModuleName = module; } @Override diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/fragmentmanager/FragmentStack.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/fragmentmanager/FragmentStack.java index 70dac9edd3..963bdb25c2 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/fragmentmanager/FragmentStack.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/fragmentmanager/FragmentStack.java @@ -71,8 +71,14 @@ public class FragmentStack { mFragmentTransaction.hide( mCurrentFragment.getFragment() ); } mFragmentTransaction.add( mContainerId, descriptor.getFragment() ); + if ( descriptor.hasTransition() ) { + mFragmentTransaction.setTransition( FragmentTransaction.TRANSIT_FRAGMENT_OPEN ); + } mFragmentTransaction.addToBackStack( null ); mFragmentTransaction.commitAllowingStateLoss(); + if ( descriptor.hasTransition() ) { + mFragmentManager.executePendingTransactions(); + } mFragmentStack.push( descriptor ); mCurrentFragment = descriptor; diff --git a/modules/mogo-module-share/src/androidTest/java/com/example/mogo_module_share/ExampleInstrumentedTest.kt b/modules/mogo-module-share/src/androidTest/java/com/example/mogo_module_share/ExampleInstrumentedTest.kt deleted file mode 100644 index 4d8f4c5680..0000000000 --- a/modules/mogo-module-share/src/androidTest/java/com/example/mogo_module_share/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.example.mogo_module_share - -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.example.mogo_module_share.test", appContext.packageName) - } -} diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/fragmentmanager/FragmentDescriptor.java b/services/mogo-service-api/src/main/java/com/mogo/service/fragmentmanager/FragmentDescriptor.java index 08a1dadf8a..0e60baa11e 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/fragmentmanager/FragmentDescriptor.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/fragmentmanager/FragmentDescriptor.java @@ -18,6 +18,11 @@ public class FragmentDescriptor { */ private boolean mNotifyMainModule = true; + /** + * 是否有进入动画 + */ + private boolean mHasTransition = false; + public FragmentDescriptor() { } @@ -33,6 +38,10 @@ public class FragmentDescriptor { return mNotifyMainModule; } + public boolean hasTransition() { + return mHasTransition; + } + public static class Builder { private FragmentDescriptor descriptor; @@ -56,6 +65,11 @@ public class FragmentDescriptor { return this; } + public Builder hasTransition( boolean hasTransition ) { + descriptor.mHasTransition = hasTransition; + return this; + } + public FragmentDescriptor build() { return descriptor; }