diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/AddUserInfoActivity.java b/app/src/main/java/com/yizhuan/erban/ui/login/AddUserInfoActivity.java index 038379ab7..0613843e3 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/AddUserInfoActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/login/AddUserInfoActivity.java @@ -30,18 +30,6 @@ public class AddUserInfoActivity extends BaseActivity { } public void showAddUserInfo() { - initTitleBar("", false); -// if (mTitleBar != null) -// mTitleBar.setLeftClickListener(new View.OnClickListener() { -// @Override -// public void onClick(View v) { -// try { -// moveTaskToBack(true); -// } catch (Exception ex) { -// -// } -// } -// }); replaceFragment(addUserInfoFragment); } diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java b/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java index 7eace7a56..3118b658b 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java +++ b/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java @@ -70,10 +70,6 @@ public class AddUserInfoFragment extends BaseFragment private XRadioGroup rgGender; private RadioButton rbMale; AddUserInfoActivity addUserInfoActivity; - // private TextInputEditText tvBirthday; - // private TextView tvGenderMen; - // private TextView tvGenderWomen; - // private DatePickerDialog datePickerDialog; @Override public void onAttach(Activity activity) { @@ -97,11 +93,7 @@ public class AddUserInfoFragment extends BaseFragment rgGender = view.findViewById(R.id.rg_gender); rbMale = view.findViewById(R.id.rb_male); tvRandomNick.setVisibility(View.GONE); -// ivRandomAvatar.setVisibility(View.GONE); -// ivRandomAvatar = view.findViewById(R.id.iv_random_avatar); -// tvBirthday = view.findViewById(R.id.tv_birthday); -// tvGenderMen = view.findViewById(R.id.tv_gender_men); -// tvGenderWomen = view.findViewById(R.id.tv_gender_women); + } @Override @@ -113,10 +105,6 @@ public class AddUserInfoFragment extends BaseFragment tvRandomNick.setOnClickListener(this); init(); addWXUserInfo(); -// ivRandomAvatar.setOnClickListener(this); -// tvGenderMen.setOnClickListener(this); -// tvGenderWomen.setOnClickListener(this); -// tvBirthday.setOnClickListener(this); } @@ -124,9 +112,6 @@ public class AddUserInfoFragment extends BaseFragment ThirdUserInfo thirdUserInfo = AuthModel.get().getThirdUserInfo(); if (thirdUserInfo != null) { avatarUrlWX = thirdUserInfo.getUserIcon(); -// if (thirdUserInfo.getBirth() > 0) { -// tvBirthday.setText(TimeUtils.getDateTimeString(thirdUserInfo.getBirth(), "yyyy-MM-dd")); -// } String nick = thirdUserInfo.getUserName(); if (!StringUtil.isEmpty(nick)) { if (nick.length() > 8) { @@ -143,88 +128,25 @@ public class AddUserInfoFragment extends BaseFragment private void init() { tvNick.setFilters(new InputFilter[]{new InputFilter.LengthFilter(8)}); -// Calendar calendar = Calendar.getInstance(); -// int year = calendar.get(Calendar.YEAR) - 18; -// datePickerDialog = DatePickerDialog.newInstance(this, year, 0, 1, true); - // 给一个默认的生日值 - // 默认给够 18 岁 -// tvBirthday.setText(String.format(Locale.getDefault(), "%d-01-01", year)); // 设置默认昵称 tvNick.setText(R.string.text_default_nick); - - UserModel.get().getRandomConfig() - .compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW)) - .doOnSuccess(userRandomConfig -> { -// if (userRandomConfig.isAvatar()) { -// ivRandomAvatar.setVisibility(View.VISIBLE); -// } - if (userRandomConfig.isNick()) { - tvRandomNick.setVisibility(View.VISIBLE); - } - }) - .subscribe(); - - rgGender.setOnCheckedChangeListener(new XRadioGroup.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(XRadioGroup radioGroup, int i) { - gender = i == rbMale.getId()?UserInfo.GENDER_MALE:UserInfo.GENDER_FEMALE; -// LogUtils.e(gender+""); - } - }); + tvRandomNick.setVisibility(View.VISIBLE); + rgGender.setOnCheckedChangeListener((radioGroup, i) -> gender = i == rbMale.getId()?UserInfo.GENDER_MALE:UserInfo.GENDER_FEMALE); } @Override public void onClick(View v) { switch (v.getId()) { -// case R.id.tv_gender: -// ButtonItem maleItem = new ButtonItem("男", new ButtonItem.OnClickListener() { -// @Override -// public void onClick() { -// gender = UserInfo.GENDER_MALE; -// tvGender.setText("男"); -// } -// }); -// -// ButtonItem femaleItem = new ButtonItem("女", new ButtonItem.OnClickListener() { -// @Override -// public void onClick() { -// gender = UserInfo.GENDER_FEMALE; -// tvGender.setText("女"); -// } -// }); -// -// List genderList = new ArrayList<>(); -// genderList.add(maleItem); -// genderList.add(femaleItem); -// getDialogManager().showCommonPopupDialog(genderList, "取消", false); -// break; - -// case R.id.tv_birthday: -// if (datePickerDialog.isAdded()) { -// datePickerDialog.dismiss(); -// } else { -// Calendar calendar = Calendar.getInstance(); -// datePickerDialog.setVibrate(true); -// datePickerDialog.setYearRange(1945, calendar.get(Calendar.YEAR) - 18); -// datePickerDialog.show(getChildFragmentManager(), "DATEPICKER_TAG"); -// } -// break; case R.id.ok_btn: String nick = tvNick.getText().toString(); if (TextUtils.isEmpty(nick)) { toast("昵称不能为空！"); return; } -// String birth = tvBirthday.getText().toString(); -// if (TextUtils.isEmpty(birth)) { -// toast("生日不能为空！"); -// return; -// } if (gender == -1) { toast("必须要选性别哦"); return; } - if (photoFile != null) { getDialogManager().showProgressDialog(getContext(), "正在上传请稍后..."); FileModel.get() @@ -270,28 +192,6 @@ public class AddUserInfoFragment extends BaseFragment buttonItemList.add(localItem); getDialogManager().showCommonPopupDialog(buttonItemList, "取消", false); break; -// case R.id.iv_random_avatar: -// StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_INFORMATION_RANDOM_AVATAR, -// "随机头像"); -// ivRandomAvatar.setEnabled(false); -// UserModel.get().getRandomAvatar() -// .compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW)) -// .subscribe(new DontWarnObserver() { -// @Override -// public void accept(String avatar, String error) { -// super.accept(avatar, error); -// ivRandomAvatar.setEnabled(true); -// if (error != null) { -// toast(error); -// return; -// } -// if (!TextUtils.isEmpty(avatar)) { -// avatarUrl = avatar; -// ImageLoadUtilsV2.loadAvatar(civAvatar, avatar); -// } -// } -// }); -// break; case R.id.tv_random_nick: StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_INFORMATION_RANDOM_NAME, diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoDynamicAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoDynamicAdapter.java index a3c53c041..d80b93ed3 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoDynamicAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoDynamicAdapter.java @@ -92,7 +92,7 @@ public class UserInfoDynamicAdapter extends BaseQuickAdapter - - - - - + > + android:paddingBottom="36dp"> @@ -39,10 +39,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tv_title_text" - android:padding="@dimen/dp_20" android:gravity="center" + android:paddingStart="@dimen/dp_30" + android:paddingEnd="@dimen/dp_30" + android:paddingTop="@dimen/dp_15" android:text="咻，收到小可爱的动态了呢~\n审核通过后小秘书会帮你发送并通知你哦~" - android:textColor="@color/color_999999" + android:textColor="@color/color_666666" android:textSize="13sp" /> \ No newline at end of file diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java index af5b722a4..89b673b82 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java @@ -950,7 +950,7 @@ public final class UserModel extends BaseModel implements IUserModel { @GET("/userRandom/getConfig") Single> apiRandomConfig(); - @GET("/userRandom/getNickname") + @GET("/random/nick/get") Single> apiRandomNick(); @GET("/userRandom/getAvatar")