From 83a75948ce411e37153f007d5389d7280a113da3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 29 Jun 2020 10:24:03 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BA=86=EF=BC=9A=20=E3=80=90=E8=BF=9D=E7=AB=A0=E9=AB=98?= =?UTF-8?q?=E5=8F=91=E5=9C=B0=E3=80=91=E6=89=93=E7=82=B9=E7=9A=84=E8=BF=9D?= =?UTF-8?q?=E5=81=9C=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=9C=A8?= =?UTF-8?q?=E4=B8=8B=E4=B8=80=E6=AC=A1=E6=95=B4=E4=BD=93=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E6=97=B6=E8=87=AA=E5=8A=A8=E6=B6=88=E5=A4=B1=20http://jira.zhi?= =?UTF-8?q?daohulian.com/browse/E85XJD-46=20=E3=80=90=E8=BF=9D=E7=AB=A0?= =?UTF-8?q?=E9=AB=98=E5=8F=91=E5=9C=B0=E3=80=91=E5=85=8D=E5=94=A4=E9=86=92?= =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E2=80=9C=E6=9C=89=E7=94=A8=E2=80=9D=E2=80=9C?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E2=80=9D=EF=BC=8C=E6=B2=A1=E6=9C=89=E7=94=9F?= =?UTF-8?q?=E6=95=88=20http://jira.zhidaohulian.com/browse/E85XJD-47=20?= =?UTF-8?q?=E3=80=90=E8=BF=9D=E7=AB=A0=E9=AB=98=E5=8F=91=E5=9C=B0=E3=80=91?= =?UTF-8?q?=E8=B6=85=E9=95=BF=E7=9A=84=E5=9C=B0=E5=9D=80=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=B5=AE=E7=AA=97=E5=86=85=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8=20http:/?= =?UTF-8?q?/jira.zhidaohulian.com/browse/E85XJD-51?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 3640e7590a..09281ed0f0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.36 +MOGO_MODULE_V2X_VERSION=1.1.37 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From 38c6fbbba264470ebc7e1e6e131836c62d191478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 29 Jun 2020 10:49:04 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86V2X=E4=B8=AD?= =?UTF-8?q?=E8=BF=9D=E7=AB=A0=E5=81=9C=E8=BD=A6=E7=9A=84=E5=9F=8B=E7=82=B9?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 21e99e2dc0..cd77a1f062 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 09281ed0f0..ef49b73705 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.37 +MOGO_MODULE_V2X_VERSION=1.1.38 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From 31b530eea965715ed0cddb344082f9d0db0b0e19 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 29 Jun 2020 14:15:02 +0800 Subject: [PATCH 3/5] opt --- .../mogo/module/apps/AppNavigatorPresenter.java | 2 +- .../com/mogo/module/apps/AppsListActivity.java | 1 + .../java/com/mogo/module/apps/model/AppsModel.java | 14 ++++++++------ 3 files changed, 10 insertions(+), 7 deletions(-) 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 index 7b39a6b5a3..de53733b66 100644 --- 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 @@ -40,7 +40,7 @@ public class AppNavigatorPresenter extends Presenter< AppNavigatorView > impleme AppServiceHandler.getApis().getRegisterCenterApi().registerMogoNaviListener( TAG, this ); if ( DebugConfig.isLauncher() ) { // 预加载应用列表，空间换时间 - AppsModel.getInstance( getContext() ).load( null ); +// AppsModel.getInstance( getContext() ).load( null ); } } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java index 34a738ac9e..80ad419ea4 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java @@ -113,6 +113,7 @@ public class AppsListActivity extends MvpActivity< AppsListView, AppsListPresent @Override protected void onDestroy() { super.onDestroy(); + AppsModel.getInstance( this ).release(); AppServiceHandler.getApis().getStatusManagerApi().setAppListUIShow( TAG, false ); mMogoFragmentManager.removeMainFragmentStackTransactionListener( this ); mMogoFragmentManager = null; diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java index 7235c69ed9..ee047a2bb7 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java @@ -56,21 +56,23 @@ public class AppsModel { if ( mPagedApps != null ) { mPagedApps.clear(); } + mPagedApps = null; mContext = null; mAppFilter = null; sInstance = null; } public void load( AppLoadCallback callback ) { - if ( !mPagedApps.isEmpty() ) { - if ( callback != null ) { - callback.onLoaded( mPagedApps ); - } - return; - } +// if ( !mPagedApps.isEmpty() ) { +// if ( callback != null ) { +// callback.onLoaded( mPagedApps ); +// } +// return; +// } if ( mAppFilter == null ) { mAppFilter = new AppFilterImpl( mContext ); } + mPagedApps.clear(); final PackageManager packageManager = mContext.getPackageManager(); List< PackageInfo > packages = packageManager.getInstalledPackages( 0 ); int counter = 0; From 21ced97bb79d0c5f3001ed7bea7167c2859c49c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 29 Jun 2020 14:46:17 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BAgps=E9=80=9F=E5=BA=A6=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=A7=BB=E5=8A=A8=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ef49b73705..b0ea862a92 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.38 +MOGO_MODULE_V2X_VERSION=1.1.39 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From 0375d7a8d8ba7ff9ed478173c1a76ef93a6f202a Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 29 Jun 2020 15:45:36 +0800 Subject: [PATCH 5/5] opt --- .../module/apps/AppNavigatorPresenter.java | 2 +- .../mogo/module/apps/AppsListActivity.java | 1 - .../com/mogo/module/apps/AppsPresenter.java | 31 ++++++++++++++++++- .../com/mogo/module/apps/model/AppInfo.java | 18 ++++++++++- .../com/mogo/module/apps/model/AppsModel.java | 13 ++++---- .../src/main/res/layout/view_map_marker.xml | 6 ++-- .../main/res/layout/view_map_marker_info.xml | 4 +-- .../src/main/res/values-xhdpi/dimens.xml | 4 +-- .../src/main/res/values/dimens.xml | 4 +-- 9 files changed, 63 insertions(+), 20 deletions(-) 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 index de53733b66..7b39a6b5a3 100644 --- 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 @@ -40,7 +40,7 @@ public class AppNavigatorPresenter extends Presenter< AppNavigatorView > impleme AppServiceHandler.getApis().getRegisterCenterApi().registerMogoNaviListener( TAG, this ); if ( DebugConfig.isLauncher() ) { // 预加载应用列表，空间换时间 -// AppsModel.getInstance( getContext() ).load( null ); + AppsModel.getInstance( getContext() ).load( null ); } } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java index 80ad419ea4..34a738ac9e 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java @@ -113,7 +113,6 @@ public class AppsListActivity extends MvpActivity< AppsListView, AppsListPresent @Override protected void onDestroy() { super.onDestroy(); - AppsModel.getInstance( this ).release(); AppServiceHandler.getApis().getStatusManagerApi().setAppListUIShow( TAG, false ); mMogoFragmentManager.removeMainFragmentStackTransactionListener( this ); mMogoFragmentManager = null; 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 942568fc7f..87d43203e1 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 @@ -80,6 +80,11 @@ public class AppsPresenter extends Presenter< AppsView > { Logger.d( TAG, "apps: %s", appInfoList ); final Map< Integer, List< AppInfo > > result = addOthersEntrances( appInfoList ); + try { + filterSamePackage( result ); + } catch ( Exception e ) { + Logger.e( TAG, e, "error." ); + } UiThreadHandler.post( () -> { if ( mView != null ) { mView.renderApps( result ); @@ -143,7 +148,7 @@ public class AppsPresenter extends Presenter< AppsView > { } } } -// growthCapacity( result ); +// 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 ) ); if ( DebugConfig.isDebug() ) { @@ -154,6 +159,30 @@ public class AppsPresenter extends Presenter< AppsView > { return result; } + private void filterSamePackage( Map< Integer, List< AppInfo > > appInfoMap ) { + if ( appInfoMap == null || appInfoMap.isEmpty() ) { + return; + } + for ( Map.Entry< Integer, List< AppInfo > > integerListEntry : appInfoMap.entrySet() ) { + if ( integerListEntry == null ) { + continue; + } + List< AppInfo > oldList = integerListEntry.getValue(); + if ( oldList == null + || oldList.size() > AppsConst.TOTAL_SIZE_EACH_PAGE ) { + return; + } + List< AppInfo > appInfos = new ArrayList<>(); + for ( AppInfo appInfo : oldList ) { + if ( appInfos.contains( appInfo ) ) { + continue; + } + appInfos.add( appInfo ); + } + integerListEntry.setValue( appInfos ); + } + } + /** * 扩容 * diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppInfo.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppInfo.java index d9fddafb98..dae51ba27d 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppInfo.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppInfo.java @@ -1,6 +1,9 @@ package com.mogo.module.apps.model; import android.graphics.drawable.Drawable; +import android.text.TextUtils; + +import java.util.Objects; /** * @author congtaowang @@ -29,7 +32,7 @@ public class AppInfo { } public AppInfo( String mName, String mPackageName, String mVersionName, int mVersionCode, Drawable mIcon, int mIconResId ) { - this(mName, mPackageName, mVersionName, mVersionCode, mIcon, mIconResId, 0); + this( mName, mPackageName, mVersionName, mVersionCode, mIcon, mIconResId, 0 ); } public int getIconResId() { @@ -60,6 +63,19 @@ public class AppInfo { return mTrackType; } + @Override + public boolean equals( Object o ) { + if ( this == o ) return true; + if ( o == null || getClass() != o.getClass() ) return false; + AppInfo appInfo = ( AppInfo ) o; + return TextUtils.equals( mPackageName, appInfo.mPackageName ); + } + + @Override + public int hashCode() { + return Objects.hash( mPackageName ); + } + @Override public String toString() { return "AppInfo{" + diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java index ee047a2bb7..61c55a981d 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java @@ -63,16 +63,15 @@ public class AppsModel { } public void load( AppLoadCallback callback ) { -// if ( !mPagedApps.isEmpty() ) { -// if ( callback != null ) { -// callback.onLoaded( mPagedApps ); -// } -// return; -// } + if ( !mPagedApps.isEmpty() ) { + if ( callback != null ) { + callback.onLoaded( mPagedApps ); + } + return; + } if ( mAppFilter == null ) { mAppFilter = new AppFilterImpl( mContext ); } - mPagedApps.clear(); final PackageManager packageManager = mContext.getPackageManager(); List< PackageInfo > packages = packageManager.getInstalledPackages( 0 ); int counter = 0; diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml index 3ba8e4a5cf..7651639cf3 100644 --- a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml +++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml @@ -17,11 +17,11 @@ + tools:src="@drawable/icon_map_marker_road_block_up2" /> diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml index 028892962e..444e398c97 100644 --- a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml +++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml @@ -32,8 +32,8 @@ 8dp 100px 117px - 50px - 50px + 60px + 60px 8px diff --git a/modules/mogo-module-service/src/main/res/values/dimens.xml b/modules/mogo-module-service/src/main/res/values/dimens.xml index 03b1e6650a..6faf47f1e0 100644 --- a/modules/mogo-module-service/src/main/res/values/dimens.xml +++ b/modules/mogo-module-service/src/main/res/values/dimens.xml @@ -4,8 +4,8 @@ 4dp 56px 65px - 27px - 27px + 35px + 35px 4px 550px