diff --git a/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java b/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java index 1926df313..ceb99c7c6 100644 --- a/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java @@ -207,6 +207,7 @@ public class EditProfileActivity extends AbsActivity { submit.setText(R.string.live_task_item_complete_true); submit.setBackgroundResource(R.mipmap.bg_submit_cancel); submit.setTextColor(Color.parseColor("#FFFFFF")); + userModel.seUserInfoComplete(1); } @Override @@ -254,7 +255,7 @@ public class EditProfileActivity extends AbsActivity { @Override public void onBackPressed() { - if (userModel.getUserInfoComplete() ==1) { + if (userModel.getUserInfoComplete() == 1) { finish(); } else { new XPopup.Builder(mContext) @@ -418,19 +419,6 @@ public class EditProfileActivity extends AbsActivity { if (mUserBean == null) { return; } -// Intent intent = new Intent(mContext, EditNameActivity.class); -// intent.putExtra(Constants.NICK_NAME, mUserBean.getUserNiceName()); -// mImageUtil.startActivityForResult(intent, new ActivityResultCallback() { -// @Override -// public void onSuccess(Intent intent) { -// if (intent != null) { -// String name = intent.getStringExtra(Constants.NICK_NAME); -// mUserBean.setUserNiceName(name); -// mName.setText(name); -// EventBus.getDefault().post(new UpdateFieldEvent()); -// } -// } -// }); Constants.myIntoIndex = 2; Intent intent = new Intent(mContext, MyWebViewActivity2.class); intent.putExtra(Constants.URL, CommonAppConfig.HOST + "/h5/table/Modify-information.html" + "?token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid()); @@ -660,12 +648,12 @@ public class EditProfileActivity extends AbsActivity { submit.setTextColor(Color.parseColor("#FFFFFF")); submit.setEnabled(false); } else { - if (index<4){ + if (index < 4) { submit.setText(R.string.to_complete); submit.setBackgroundResource(R.mipmap.bg_submit); submit.setTextColor(Color.parseColor("#FFFFFF")); submit.setEnabled(false); - }else { + } else { submit.setText(R.string.to_receive); submit.setBackgroundResource(R.mipmap.bg_submit); submit.setTextColor(Color.parseColor("#935902")); diff --git a/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java b/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java index f0d5c971f..6cb05f77e 100644 --- a/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java +++ b/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java @@ -244,6 +244,7 @@ public class MainHttpUtil { bean.setMedalLevel(obj.getIntValue("medal_level")); CommonAppConfig.getInstance().setUserBean(bean); CommonAppConfig.getInstance().setUserItemList(obj.getString("list")); + bean.seUserInfoComplete(obj.getIntValue("user_info_complete")); SpUtil.getInstance().setStringValue(SpUtil.USER_INFO, info[0]); if (commonCallback != null) { commonCallback.callback(bean); diff --git a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java index 531087671..5bc68d577 100644 --- a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java @@ -219,15 +219,6 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi @Override public void loadData() { - if (isFirstLoadData()) { - CommonAppConfig appConfig = CommonAppConfig.getInstance(); - UserBean u = appConfig.getUserBean(); - List list = appConfig.getUserItemList(); - if (u != null && list != null) { - showData(u, list); - } - } - MainHttpUtil.getGoogle(mCallback1); MainHttpUtil.getBaseInfo(mCallback); MainHttpUtil.getBalance(new HttpCallback() {