admin
2021-07-06 abce02c7a61820f5d580f87364d542e817be429c
app/src/main/java/com/tejia/lijin/app/ui/mine/MergeAccountActivity.java
@@ -66,14 +66,14 @@
        if (mainUser != null) {
            Glide.with(this).load(mainUser.getPortrait()).placeholder(R.drawable.ic_default_portrait).transform(new GlideCircleTransform(this)).into(iv_portrait_new);
            Glide.with(this).load(mainUser.getPortrait()).placeholder(R.drawable.ic_default_portrait_light).transform(new GlideCircleTransform(this)).into(iv_portrait_new);
            tv_nickName_new.setText(mainUser.getNickName());
            tv_id_new.setText("ID:" + mainUser.getId());
            tv_create_time_new.setText(TimeUtils.millisToStringDate(Long.parseLong(mainUser.getCreatetime()), "yyyy-MM-dd"));
        }
        if (lessUser != null) {
            Glide.with(this).load(lessUser.getPortrait()).placeholder(R.drawable.ic_default_portrait).transform(new GlideCircleTransform(this)).into(iv_portrait_old);
            Glide.with(this).load(lessUser.getPortrait()).placeholder(R.drawable.ic_default_portrait_light).transform(new GlideCircleTransform(this)).into(iv_portrait_old);
            tv_nickName_old.setText(lessUser.getNickName());
            tv_id_old.setText("ID:" + lessUser.getId());
            tv_create_time_old.setText(TimeUtils.millisToStringDate(Long.parseLong(lessUser.getCreatetime()), "yyyy-MM-dd"));