From 0626b8a1cbb9f66d70fcf35992bed0a9dd2c139d Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 2 Apr 2020 11:22:48 +0800 Subject: [PATCH] opt --- .../com/mogo/module/apps/AppFilterImpl.java | 6 +- .../com/mogo/module/apps/AppsPresenter.java | 82 +++++++++++++++---- .../apps/applaunch/GuideShowLauncher.java | 10 ++- .../com/mogo/module/apps/model/AppEnum.java | 2 +- .../mogo/module/apps/model/UnScannedApps.java | 24 ++++++ .../module/main/cards/MogoModulesManager.java | 4 +- 6 files changed, 106 insertions(+), 22 deletions(-) create mode 100644 modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/UnScannedApps.java diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java index f7695d5ff6..7f8776b806 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java @@ -43,9 +43,9 @@ public class AppFilterImpl implements AppFilter { if ( !AppEnumHelper.isCustomizedApp( packageInfo.packageName ) ) { return true; } -// if ( noLaunchIntent( packageInfo ) ) { -// return true; -// } + if ( noLaunchIntent( packageInfo ) ) { + return true; + } return false; } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java index f722a9418e..54f42368d3 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java @@ -1,5 +1,7 @@ package com.mogo.module.apps; +import android.text.TextUtils; + import androidx.annotation.NonNull; import androidx.lifecycle.LifecycleOwner; @@ -11,6 +13,8 @@ import com.mogo.module.apps.applaunch.CardAppLauncher; import com.mogo.module.apps.applaunch.GuideShowLauncher; import com.mogo.module.apps.model.AppInfo; import com.mogo.module.apps.model.AppsModel; +import com.mogo.module.apps.model.UnScannedApps; +import com.mogo.service.IMogoServiceApis; import com.mogo.service.MogoServicePaths; import com.mogo.service.analytics.IMogoAnalytics; import com.mogo.service.cardmanager.IMogoCardManager; @@ -20,7 +24,6 @@ import com.mogo.utils.UiThreadHandler; import com.mogo.utils.logger.Logger; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -40,14 +43,17 @@ public class AppsPresenter extends Presenter { private IMogoAnalytics mAnalytics; private AppLaunchFilter mLauncher; + private IMogoServiceApis mApis; + private IMogoCardManager mCardManager; private IMogoStatusManager mMogoStatusManager; public AppsPresenter(AppsView view) { super(view); - mCardManager = (IMogoCardManager) ARouter.getInstance().build(MogoServicePaths.PATH_CARD_MANAGER).navigation(getContext()); + mApis = (IMogoServiceApis)ARouter.getInstance().build( MogoServicePaths.PATH_SERVICE_APIS ).navigation(getContext()); + mCardManager = mApis.getCardManagerApi(); CardAppLauncher cardAppLauncher = new CardAppLauncher(this, mCardManager); - GuideShowLauncher guideShowLauncher = new GuideShowLauncher(); + GuideShowLauncher guideShowLauncher = new GuideShowLauncher(mApis.getMapServiceApi().getNavi( getContext() )); cardAppLauncher.setNext(guideShowLauncher); guideShowLauncher.setNext(new AppLauncher()); mLauncher = cardAppLauncher; @@ -63,8 +69,8 @@ public class AppsPresenter extends Presenter { } }); - mAnalytics = (IMogoAnalytics) ARouter.getInstance().build(MogoServicePaths.PATH_UTILS_ANALYTICS).navigation(getContext()); - mMogoStatusManager = (IMogoStatusManager) ARouter.getInstance().build(MogoServicePaths.PATH_STATUS_MANAGER).navigation(); + mAnalytics = mApis.getAnalyticsApi(); + mMogoStatusManager = mApis.getStatusManagerApi(); mMogoStatusManager.setAppListUIShow(TAG, true); } @@ -73,9 +79,10 @@ public class AppsPresenter extends Presenter { AppsModel.getInstance(getContext()).load(appInfoList -> { Logger.d(TAG, "apps: %s", appInfoList); + final Map> result = addOthersEntrances( appInfoList ); UiThreadHandler.post(() -> { if (mView != null) { - mView.renderApps(addGuideAppEntrance(appInfoList)); + mView.renderApps( result ); } }); }); @@ -83,7 +90,12 @@ public class AppsPresenter extends Presenter { }); } - private Map> addGuideAppEntrance(Map> appInfoMap) { + /** + * 新增入口 + * @param appInfoMap + * @return + */ + private Map> addOthersEntrances( Map> appInfoMap) { Map> result = new HashMap<>(); if ( appInfoMap != null && !appInfoMap.isEmpty() ) { @@ -99,18 +111,60 @@ public class AppsPresenter extends Presenter { } } - if (result.isEmpty()) { - result.put(0, new ArrayList<>()); - } else if (result.get(result.size() - 1) == null) { - result.put(result.size() - 1, new ArrayList<>()); - } else if (result.get(result.size() - 1).size() == AppsConst.TOTAL_SIZE_EACH_PAGE) { - result.put(result.size(), new ArrayList<>()); + // 手动添加无法识别到的app + List apps = UnScannedApps.getUnScannedApps(); + if ( apps != null && !apps.isEmpty() ) { + for ( AppInfo app : apps ) { + if ( app == null ) { + continue; + } + Set keys = result.keySet(); + boolean addFlag = true; + for ( Integer key : keys ) { + List val = result.get( key ); + // 无法扫描到蓝牙电话app，这里手动添加 + for ( AppInfo appInfo : val ) { + if ( appInfo == null ) { + continue; + } + if ( TextUtils.equals( appInfo.getPackageName(), app.getPackageName() ) ) { + addFlag = false; + break; + } + } + if ( !addFlag ) { + break; + } + } + if ( addFlag ) { + growthCapacity(result); + result.get(result.size() - 1).add(app); + } + } } - // 添加逻辑 + growthCapacity(result); + // 添加介绍入口 result.get(result.size() - 1).add(new AppInfo(GuideShowLauncher.APP_INFO_NAME_GUIDE_SHOW, getContext().getPackageName(), null, 0, null, R.drawable.module_apps_ic_guide_show)); return result; } + /** + * 扩容 + * @param target + */ + private void growthCapacity( Map> target ){ + if ( target == null ) { + return; + } + if (target.isEmpty()) { + target.put(0, new ArrayList<>()); + } else if (target.get(target.size() - 1) == null) { + target.put(target.size() - 1, new ArrayList<>()); + } else if (target.get(target.size() - 1).size() == AppsConst.TOTAL_SIZE_EACH_PAGE) { + target.put(target.size(), new ArrayList<>()); + } + } + public void launch(AppInfo appInfo) { if (appInfo == null) { return; diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/GuideShowLauncher.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/GuideShowLauncher.java index 115ee5b844..88e5068c61 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/GuideShowLauncher.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/GuideShowLauncher.java @@ -4,7 +4,7 @@ import android.app.Activity; import android.content.Context; import com.mogo.commons.voice.AIAssist; -import com.mogo.map.impl.amap.navi.NaviClient; +import com.mogo.map.navi.IMogoNavi; import com.mogo.module.apps.AppServiceHandler; import com.mogo.module.apps.R; import com.mogo.module.apps.model.AppInfo; @@ -17,10 +17,16 @@ public class GuideShowLauncher extends BaseAppLauncher { public static final String TAG = "GuideShowLauncher"; public static final String APP_INFO_NAME_GUIDE_SHOW = "新手引导"; + private IMogoNavi mNavi; + + public GuideShowLauncher( IMogoNavi navi ) { + this.mNavi = navi; + } + @Override public void launch(Context context, AppInfo appInfo) { if (appInfo != null && APP_INFO_NAME_GUIDE_SHOW.equals(appInfo.getName())) { - if (!NaviClient.getInstance(context).isNaviing()) { + if ( mNavi != null && !mNavi.isNaviing()) { AppServiceHandler.getMogoGuideShow().playGuideVideo((Activity) context, (s) -> { Logger.d(TAG, s); return Unit.INSTANCE; diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java index 2ac25cee1b..7837c2cd77 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java @@ -77,7 +77,7 @@ public enum AppEnum { LocalVideo( "本地视频", "com.zhidao.video", R.drawable.module_apps_ic_local_video ), // 车辆信息 - CanBus( "车辆信息", "com.zd.canbus", R.drawable.module_apps_ic_canbus ), + CanBus( "车辆信息", "com.nwd.can.setting", R.drawable.module_apps_ic_canbus ), // 蓝牙电话 BT_PHONE( "蓝牙电话", "com.nwd.android.phone", R.drawable.module_apps_ic_bt_phone ), diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/UnScannedApps.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/UnScannedApps.java new file mode 100644 index 0000000000..7028085838 --- /dev/null +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/UnScannedApps.java @@ -0,0 +1,24 @@ +package com.mogo.module.apps.model; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author congtaowang + * @since 2020-04-02 + *

+ * 扫描不到的app + */ +public class UnScannedApps { + + private static List< AppInfo > sUnScannedApps = new ArrayList<>(); + + static { + sUnScannedApps.add( new AppInfo( AppEnum.BT_PHONE.getName(), AppEnum.BT_PHONE.getPkg(), null, 0, null, AppEnum.BT_PHONE.getIconResId() ) ); + sUnScannedApps.add( new AppInfo( AppEnum.CanBus.getName(), AppEnum.CanBus.getPkg(), null, 0, null, AppEnum.CanBus.getIconResId() ) ); + } + + public static List< AppInfo > getUnScannedApps() { + return sUnScannedApps; + } +} 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 0f3a593dc2..e23b2ec31e 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 @@ -280,7 +280,7 @@ public class MogoModulesManager implements MogoModulesHandler, mSortedCards.remove( mEnableModuleName ); mSortedCards.add( 0, mEnableModuleName ); SharedPrefsMgr.getInstance( getContext() ).putString( KEY_SORTED_CARD_MODULES, GsonUtil.jsonFromObject( mSortedCards ) ); - Log.i( TAG, "enable & disable card cost " + ( System.currentTimeMillis() - start1 ) + "ms" ); + Logger.i( TAG, "enable & disable card cost " + ( System.currentTimeMillis() - start1 ) + "ms" ); CardIntroduceConfigs.broadcastCardIntroduce( mActivity, mEnableModuleName ); } @@ -401,7 +401,7 @@ public class MogoModulesManager implements MogoModulesHandler, } } } - Log.i( TAG, "onMapChanged event cost " + ( System.currentTimeMillis() - start ) + "ms" ); + Logger.i( TAG, "onMapChanged event cost " + ( System.currentTimeMillis() - start ) + "ms" ); } @Override