Merge remote-tracking branch 'origin/temp' into dev

This commit is contained in:
CsHeng
2017-12-15 11:00:08 +08:00
128 changed files with 3328 additions and 2705 deletions

View File

@ -95,7 +95,7 @@ public class UserInfoEditActivity extends BaseActivity {
params.addRule(RelativeLayout.CENTER_VERTICAL);
params.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
params.setMargins(0, 0, DisplayUtils.dip2px(this, 18), 0);
RelativeLayout reuse_actionbar = mContentView.findViewById(R.id.reuse_actionbar);
RelativeLayout reuse_actionbar = findViewById(R.id.reuse_actionbar);
reuse_actionbar.addView(mSaveTv, params);
mUserInfoEntity = UserManager.getInstance().getUserInfoEntity();
@ -164,7 +164,7 @@ public class UserInfoEditActivity extends BaseActivity {
title = "";
break;
}
initTitle(title);
setNavigationTitle(title);
}
private void saveData() {