From 45d59956346a8315b84c344347b8e3588e5407ed Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Fri, 3 Apr 2020 14:46:43 +0800 Subject: [PATCH 1/4] bugfix: UI-623 --- .../src/main/java/com/mogo/module/main/MainActivity.java | 2 ++ 1 file changed, 2 insertions(+) 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 a3c1ea3cde..4a0e8c2be9 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 @@ -114,6 +114,8 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme @Override protected void initViews() { + getWindow().setBackgroundDrawable( null ); + mCardsContainer = findViewById( R.id.module_main_id_cards_container ); mCardsContainer.setOrientation( OrientedViewPager.Orientation.HORIZONTAL ); mTransformer = new HorizentalStackTransformer( this ); From 97a8174e86670198daf4d282fb5951c2a8059fda Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Fri, 3 Apr 2020 16:08:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=B6=E5=92=8C=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/navi/cp/AddressHelper.java | 23 ++++++++----------- .../module/navi/manager/AddressManager.kt | 9 ++++++-- .../navi/ui/setting/NaviSettingFragment.kt | 4 +--- .../navi/ui/setting/SettingAddressFragment.kt | 7 ++++-- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/cp/AddressHelper.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/cp/AddressHelper.java index 4d7d7e435b..676063c156 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/cp/AddressHelper.java +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/cp/AddressHelper.java @@ -1,6 +1,7 @@ package com.mogo.module.navi.cp; import android.content.Context; +import com.mogo.commons.AbsMogoApplication; import com.mogo.module.navi.bean.SearchPoi; import com.mogo.module.navi.constants.DataConstants; import org.jetbrains.annotations.NotNull; @@ -14,27 +15,21 @@ import org.jetbrains.annotations.Nullable; */ public class AddressHelper { - public static void notifyHomeAddressChanged( Context context ) { - if ( context == null ) { - return; - } - context.getContentResolver().notifyChange( DataConstants.CONTENT_HOME_ADDRESS_URI, null ); + public static void notifyHomeAddressChanged( ) { + AbsMogoApplication.getApp().getContentResolver().notifyChange( DataConstants.CONTENT_HOME_ADDRESS_URI, null ); } - public static void notifyCompanyAddressChanged( Context context ) { - if ( context == null ) { - return; - } - context.getContentResolver().notifyChange( DataConstants.CONTENT_COMPANY_ADDRESS_URI, null ); + public static void notifyCompanyAddressChanged( ) { + + AbsMogoApplication.getApp().getContentResolver().notifyChange( DataConstants.CONTENT_COMPANY_ADDRESS_URI, null ); } - public static void notifyAddressChanged(@Nullable Context context, + public static void notifyAddressChanged( @NotNull SearchPoi searchPoi) { - if (searchPoi.getType()== DataConstants.TYPE_HOME_ADDRESS) { - notifyHomeAddressChanged(context); + notifyHomeAddressChanged(); }else { - notifyCompanyAddressChanged(context); + notifyCompanyAddressChanged(); } } } diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/AddressManager.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/AddressManager.kt index 2ddfb4a538..3f1b9aa4ed 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/AddressManager.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/AddressManager.kt @@ -13,6 +13,7 @@ import com.mogo.module.navi.database.AppDataBase import com.mogo.module.navi.ui.search.ChoosePathFragment import com.mogo.module.navi.ui.setting.SettingAddressFragment import com.mogo.service.fragmentmanager.FragmentDescriptor +import com.mogo.utils.UiThreadHandler import io.reactivex.Observable import io.reactivex.ObservableEmitter import io.reactivex.ObservableOnSubscribe @@ -24,6 +25,7 @@ import org.greenrobot.eventbus.EventBus * @author zyz * 2020-01-12. */ +@SuppressLint("StaticFieldLeak") object AddressManager { var homeAddress: SearchPoi? = null var companyAddress: SearchPoi? = null @@ -60,6 +62,7 @@ object AddressManager { SearchServiceHolder.push( newInstance, MogoModulePaths.PATH_FRAGMENT_CHOOSE_PAHT ) + } } @@ -80,8 +83,10 @@ object AddressManager { SearchServiceHolder.fragmentManager.push(build) } + private lateinit var context: Context @SuppressLint("CheckResult") fun init(context: Context) { + this.context=context poiDao = AppDataBase.getDatabase(context) .poiDao() poiDao @@ -120,7 +125,7 @@ object AddressManager { ObservableOnSubscribe { poiDao.delete(homeAddress) homeAddress?.name="" - AddressHelper.notifyAddressChanged(context, homeAddress!!) + AddressHelper.notifyAddressChanged( homeAddress!!) homeAddress=null }) @@ -135,7 +140,7 @@ object AddressManager { ObservableOnSubscribe { poiDao.delete(companyAddress) companyAddress?.name="" - AddressHelper.notifyAddressChanged(context, companyAddress!!) + AddressHelper.notifyAddressChanged( companyAddress!!) companyAddress=null }) diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt index 3f6e80d2b4..8d2418e841 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt @@ -300,9 +300,7 @@ class NaviSettingFragment : BaseFragment(), OnCheckedChangeListener { } - UiThreadHandler.postDelayed(Runnable { - AddressHelper.notifyAddressChanged(activity, searchPoi) - }, 100) + } override fun onDestroyView() { diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/SettingAddressFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/SettingAddressFragment.kt index 6a686b80b2..bd197ab5e7 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/SettingAddressFragment.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/SettingAddressFragment.kt @@ -159,6 +159,9 @@ class SettingAddressFragment : BaseFragment(), IMogoGeoSearchListener { .windowCenterLocation moveMapToCenter() UiThreadHandler.postDelayed({ + if (!isAdded) { + return@postDelayed + } var decodeResource = BitmapFactory.decodeResource(resources, R.mipmap.icon_choose_position2) val options = MogoMarkerOptions() .icon(decodeResource) @@ -180,10 +183,10 @@ class SettingAddressFragment : BaseFragment(), IMogoGeoSearchListener { AddressManager.insert(searchPoi) Observable.create( ObservableOnSubscribe { - AppDataBase.getDatabase(context) + AppDataBase.getDatabase(activity) .poiDao() .insert(searchPoi) - + AddressHelper.notifyAddressChanged(searchPoi) }) .subscribeOn(Schedulers.io()) .subscribe() From fccd57f6eb3361231ccbaf3a99f7d3511388969f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 3 Apr 2020 18:45:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E8=BD=A6?= =?UTF-8?q?=E7=A5=B8=E7=9A=84=E5=B1=95=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/service/marker/MapMarkerInfoView.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java index 3210ed50e7..d272ae9046 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java @@ -170,6 +170,7 @@ public class MapMarkerInfoView extends MapMarkerBaseView { ivIcon.setImageResource(R.drawable.module_service_ic_rc_accident2); clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_red_info); ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_red); + break; case MarkerPoiTypeEnum.FOURS_NEALY: ivIcon.setImageResource(R.drawable.icon_map_marker_shear_news); clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_blue_info); From f4785c5305bff4074bf2cf7d78211f83c8755443 Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Tue, 7 Apr 2020 10:43:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=B6=E5=92=8C=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/module/navi/cp/AddressHelper.java | 6 ++++-- .../java/com/mogo/module/navi/manager/AddressManager.kt | 4 ++-- .../mogo/module/navi/ui/setting/SettingAddressFragment.kt | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/cp/AddressHelper.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/cp/AddressHelper.java index 676063c156..6ebef4cce2 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/cp/AddressHelper.java +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/cp/AddressHelper.java @@ -4,6 +4,7 @@ import android.content.Context; import com.mogo.commons.AbsMogoApplication; import com.mogo.module.navi.bean.SearchPoi; import com.mogo.module.navi.constants.DataConstants; +import com.mogo.utils.logger.Logger; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -15,6 +16,7 @@ import org.jetbrains.annotations.Nullable; */ public class AddressHelper { + private static final String TAG = "AddressHelper"; public static void notifyHomeAddressChanged( ) { AbsMogoApplication.getApp().getContentResolver().notifyChange( DataConstants.CONTENT_HOME_ADDRESS_URI, null ); } @@ -25,8 +27,8 @@ public class AddressHelper { } public static void notifyAddressChanged( - @NotNull SearchPoi searchPoi) { - if (searchPoi.getType()== DataConstants.TYPE_HOME_ADDRESS) { + int type) { + if (type== DataConstants.TYPE_HOME_ADDRESS) { notifyHomeAddressChanged(); }else { notifyCompanyAddressChanged(); diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/AddressManager.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/AddressManager.kt index 3f1b9aa4ed..b779530976 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/AddressManager.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/AddressManager.kt @@ -125,7 +125,7 @@ object AddressManager { ObservableOnSubscribe { poiDao.delete(homeAddress) homeAddress?.name="" - AddressHelper.notifyAddressChanged( homeAddress!!) + AddressHelper.notifyAddressChanged( 1) homeAddress=null }) @@ -140,7 +140,7 @@ object AddressManager { ObservableOnSubscribe { poiDao.delete(companyAddress) companyAddress?.name="" - AddressHelper.notifyAddressChanged( companyAddress!!) + AddressHelper.notifyAddressChanged( 0) companyAddress=null }) diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/SettingAddressFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/SettingAddressFragment.kt index bd197ab5e7..032a31d5e3 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/SettingAddressFragment.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/SettingAddressFragment.kt @@ -186,7 +186,7 @@ class SettingAddressFragment : BaseFragment(), IMogoGeoSearchListener { AppDataBase.getDatabase(activity) .poiDao() .insert(searchPoi) - AddressHelper.notifyAddressChanged(searchPoi) + AddressHelper.notifyAddressChanged(searchPoi.type) }) .subscribeOn(Schedulers.io()) .subscribe()