yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更换图标，随机昵称

Browse Source
This commit is contained in:
oujunhui
2020-05-07 17:47:40 +08:00
parent bcd9e7d9aa
commit c95def88c9
14 changed files with 22 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/yizhuan/erban/ui/login/AddUserInfoActivity.java
View File

@@ -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);
}

106
app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java
View File

@@ -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<ButtonItem> 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<String>() {
// @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,

2
app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoDynamicAdapter.java
View File

@@ -92,7 +92,7 @@ public class UserInfoDynamicAdapter extends BaseQuickAdapter<WorldDynamicBean, B
@Override
protected void convert(BaseViewHolder helper, WorldDynamicBean item) {
//这个值，有没有文本UI部分，改变图片部分的margin
boolean noTextUi = TextUtils.isEmpty(item.getContent()) && !item.isFirstDynamic();
boolean noTextUi = TextUtils.isEmpty(item.getContent());
helper.setText(R.id.tv_nick, item.getNick());
RecyclerView rvImage = helper.getView(R.id.rv_image);

BIN
app/src/main/res/drawable-xhdpi/default_user_head.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

6
app/src/main/res/layout/activity_addinfo.xml
View File

@@ -6,12 +6,6 @@
android:background="@drawable/bg_login"
android:orientation="vertical">
<com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<FrameLayout
android:id="@+id/fl_fragment_container"
android:layout_width="match_parent"

11
app/src/main/res/layout/fragment_add_user_info.xml
View File

@@ -21,17 +21,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_random_avatar"
android:scaleType="fitCenter"
tools:visibility="visible"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/civ_avatar"
app:layout_constraintEnd_toEndOf="@id/civ_avatar"
android:src="@drawable/switch_random_avatar"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/ll_nick"
android:layout_width="match_parent"

2
app/src/main/res/layout/fragment_game_home.xml
View File

@@ -94,7 +94,7 @@
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/title_bar"
android:visibility="visible">
>
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar"

2
app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/WorldDynamicAdapter.java
View File

@@ -92,7 +92,7 @@ public class WorldDynamicAdapter extends BaseQuickAdapter<WorldDynamicBean, Base
@Override
protected void convert(BaseViewHolder helper, WorldDynamicBean item) {
//这个值，有没有文本UI部分，改变图片部分的margin
boolean noTextUi = TextUtils.isEmpty(item.getContent()) && !item.isFirstDynamic();
boolean noTextUi = TextUtils.isEmpty(item.getContent());
helper.setText(R.id.tv_nick, item.getNick());
RecyclerView rvImage = helper.getView(R.id.rv_image);

2
app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java
View File

@@ -737,7 +737,7 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele
tvTime.setText(TimeUiUtils.getDynamicUi(bean.getPublishTime()));
etvContent.setVisibility(View.GONE);
etvContent.setEventType(3);
if (!TextUtils.isEmpty(bean.getContent()) || bean.isFirstDynamic()) {
if (!TextUtils.isEmpty(bean.getContent())) {
etvContent.setVisibility(View.VISIBLE);
int iconWidth = UIUtil.dip2px(context, 32);
int iconHeight = UIUtil.dip2px(context, 15);

8
app/src/module_community/java/com/yizhuan/erban/community/helper/DynamicUiHelper.java
View File

@@ -17,10 +17,10 @@ public class DynamicUiHelper {
public static CharSequence formatFirstDynamicContent(WorldDynamicBean item, TextView textView,
int iconWidth, int iconHeight) {
MessageView.SpannableBuilder builder = new MessageView.SpannableBuilder(textView);
if (item.isFirstDynamic()) {
builder.append(textView.getResources().getDrawable(R.drawable.icon_dy_first_dynamic), iconWidth,
iconHeight);
}
// if (item.isFirstDynamic()) {
// builder.append(textView.getResources().getDrawable(R.drawable.icon_dy_first_dynamic), iconWidth,
// iconHeight);
// }
if (!TextUtils.isEmpty(item.getContent())) {
builder.append(item.getContent());
} else {

2
app/src/module_community/java/com/yizhuan/erban/community/square/adapter/SquareDynamicAdapter.java
View File

@@ -91,7 +91,7 @@ public class SquareDynamicAdapter extends BaseQuickAdapter<WorldDynamicBean, Bas
@Override
protected void convert(BaseViewHolder helper, WorldDynamicBean item) {
//这个值，有没有文本UI部分，改变图片部分的margin
boolean noTextUi = TextUtils.isEmpty(item.getContent()) && !item.isFirstDynamic();
boolean noTextUi = TextUtils.isEmpty(item.getContent());
helper.setText(R.id.tv_nick, item.getNick());
GridImageWidget widgetImage = helper.getView(R.id.widget_image);

BIN
app/src/module_community/res/drawable-xhdpi/icon_dy_publish_examine.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 10 KiB

16
app/src/module_community/res/layout/dialog_dy_publish_success.xml
View File

@@ -8,14 +8,14 @@
android:background="@drawable/bg_mini_world_guest_page_dialog"
android:gravity="center"
android:orientation="vertical"
android:paddingBottom="9.5dp">
android:paddingBottom="36dp">
<ImageView
android:id="@+id/iv_title_pic"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="@dimen/dp_21"
android:layout_marginTop="@dimen/dp_31"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_dy_publish_examine"
@@ -25,12 +25,12 @@
android:id="@+id/tv_title_text"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_title_pic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="92dp"
android:layout_marginTop="17dp"
android:textColor="#333333"
android:textSize="17sp"
android:textSize="16sp"
android:text="审核中"
/>
@@ -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" />
</androidx.constraintlayout.widget.ConstraintLayout>

2
core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java
View File

@@ -950,7 +950,7 @@ public final class UserModel extends BaseModel implements IUserModel {
@GET("/userRandom/getConfig")
Single<ServiceResult<UserRandomConfig>> apiRandomConfig();
@GET("/userRandom/getNickname")
@GET("/random/nick/get")
Single<ServiceResult<String>> apiRandomNick();
@GET("/userRandom/getAvatar")