diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java index c4ca90cd05..5dc24ee1a3 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java @@ -71,9 +71,12 @@ public class EntrancePresenter extends Presenter implements Weathe if ( weatherInfo == null ) { return; } - String temp = getContext().getResources().getString( R.string.module_ext_str_weather_temp_format, weatherInfo.getTemperature() ); Phenomena phenomena = Phenomena.getById( weatherInfo.getPhenomena() ); - String desc = phenomena == null ? "" : phenomena.nameCn; + if ( phenomena == null ) { + return; + } + String temp = getContext().getResources().getString( R.string.module_ext_str_weather_temp_format, weatherInfo.getTemperature() ); + String desc = phenomena.nameCn; int resId = phenomena.resId; mView.renderWeatherInfo( temp, desc, resId ); } diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/MogoGuideProvider.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/MogoGuideProvider.kt index 6258977faa..85262296c0 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/MogoGuideProvider.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/MogoGuideProvider.kt @@ -5,6 +5,7 @@ import android.os.Bundle import android.view.View import androidx.fragment.app.Fragment import com.alibaba.android.arouter.facade.annotation.Route +import com.mogo.commons.debug.DebugConfig import com.mogo.map.listener.IMogoMapListener import com.mogo.map.location.IMogoLocationListener import com.mogo.map.marker.IMogoMarkerClickListener @@ -56,11 +57,12 @@ class MogoGuideProvider : IMogoModuleProvider { } override fun init(context: Context?) { - if (isDeviceOfD()) { - GuideBizManager.init() - } else { - Logger.d("MogoGuideProvider", "device type is not D") - } + Logger.d("MogoGuideProvider", "init====") +// if (DebugConfig.isLoadGuideModule()) { + GuideBizManager.init() +// } else { +// Logger.d("MogoGuideProvider", "device type is not D") +// } } diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index b049144d59..9f5a8fb1f3 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -55,8 +55,8 @@ 18px 20px 16px - 16px - 20px + 20px + 16px 82px 16px 117px