yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ii' into dev

Browse Source
This commit is contained in:
liujing
2020-09-11 14:45:22 +08:00
parent f1276dacd3 392c03585c
commit 520d9aad31
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
View File

@@ -71,9 +71,12 @@ public class EntrancePresenter extends Presenter<EntranceView> 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 );
}

12
modules/mogo-module-guide/src/main/java/com/mogo/module/guide/MogoGuideProvider.kt
View File

@@ -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")
// }
}

4
modules/mogo-module-v2x/src/main/res/values/dimens.xml
View File

@@ -55,8 +55,8 @@
<dimen name="module_v2x_surrounding_top_textsize">18px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_left_textsize">20px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_right_textsize">16px</dimen>
<dimen name="module_v2x_des_index_width">16px</dimen>
<dimen name="module_v2x_des_index_height">20px</dimen>
<dimen name="module_v2x_des_index_width">20px</dimen>
<dimen name="module_v2x_des_index_height">16px</dimen>
<dimen name="module_v2x_panel_width">82px</dimen>
<dimen name="module_v2x_panel_icon_cor">16px</dimen>
<dimen name="share_empty_icon_width">117px</dimen>