Merge branch 'dev' into demo/shunyi_v2v_merge

This commit is contained in:
wangcongtao
2020-09-14 14:11:03 +08:00
28 changed files with 184 additions and 110 deletions

View File

@@ -50,6 +50,8 @@ public class EntrancePresenter extends Presenter<EntranceView> implements Weathe
private IMogoNetwork mNetWork;
private boolean isResumed = false;
public EntrancePresenter(Context context, EntranceView view) {
super(view);
mWeatherModel = new WeatherModel( getContext() );
@@ -71,9 +73,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 );
}
@@ -88,6 +93,10 @@ public class EntrancePresenter extends Presenter<EntranceView> implements Weathe
@Override
public void onResume( @NonNull LifecycleOwner owner ) {
super.onResume( owner );
isResumed = true;
if (userInfo != null) {
mView.renderUserInfo(userInfo);
}
if(ExtensionsConfig.needRequestUserInfo()){
// 相当于每次onResume都会请求一下个人信息目的是能够相对及时的同步手机端的个人信息修改
requestUserInfo();
@@ -97,6 +106,7 @@ public class EntrancePresenter extends Presenter<EntranceView> implements Weathe
@Override
public void onPause( @NonNull LifecycleOwner owner ) {
super.onPause( owner );
isResumed = false;
}
@Override
@@ -125,11 +135,13 @@ public class EntrancePresenter extends Presenter<EntranceView> implements Weathe
@Override
public void onSuccess(UserInfoResponse userInfoBaseResponse) {
userInfo = userInfoBaseResponse.getResult();
if(userInfo!=null) {
Logger.d(TAG, "获取个人信息成功: " + userInfo);
mView.renderUserInfo(userInfo);
}else{
Logger.e(TAG,"获取个人信息失败");
if(isResumed) {
if (userInfo != null) {
Logger.d(TAG, "获取个人信息成功: " + userInfo);
mView.renderUserInfo(userInfo);
} else {
Logger.e(TAG, "获取个人信息失败");
}
}
}