moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:完成用户主页UI改版

Browse Source
This commit is contained in:
Max
2023-11-25 13:34:48 +08:00
parent bc3097f412
commit 1fc37eb85d
27 changed files with 626 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/chwl/app/home/MeViewModel.kt
View File

@@ -74,7 +74,8 @@ class MeViewModel : BaseViewModel() {
add(
MeCenterInfo(
icon = R.drawable.me_ic_menu_level,
centerName = "我的等級"
centerName = "我的等級",
skipType = RouterType.USER_LEVEL
)
)
add(

3
app/src/main/java/com/chwl/app/ui/im/RouterHandler.java
View File

@@ -333,6 +333,9 @@ public class RouterHandler {
case RouterType.MY_REVENUE:
EarnRecordActivity.start(context);
break;
case RouterType.USER_LEVEL:
CommonWebViewActivity.start(context, UriProvider.getUserLevelUrl());
break;
default:
SingleToastUtil.showToast(ResUtil.getString(R.string.ui_im_routerhandler_07));
return false;

4
app/src/main/java/com/chwl/app/ui/login/LoginActivity.java
View File

@@ -92,7 +92,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
private void onSetListener() {
findViewById(R.id.cs_google).setOnClickListener(this);
findViewById(R.id.tv_others).setOnClickListener(this);
findViewById(R.id.layout_other).setOnClickListener(this);
}
protected void setProtocol() {
@@ -199,7 +199,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
});
break;
case R.id.tv_others:
case R.id.layout_other:
reportLoginType(IReportConstants.FIVE);
LoginPasswordActivity.start(LoginActivity.this);
break;

173
app/src/main/java/com/chwl/app/ui/user/activity/UserInfoActivity.java
View File

@@ -19,8 +19,6 @@ import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider;
import androidx.viewpager.widget.ViewPager;
import com.google.android.flexbox.AlignItems;
import com.google.android.flexbox.FlexDirection;
import com.netease.nim.uikit.StatusBarUtil;
import com.netease.nim.uikit.impl.cache.NimUserInfoCache;
import com.netease.nimlib.sdk.RequestCallbackWrapper;
@@ -46,11 +44,9 @@ import com.chwl.app.ui.im.avtivity.NimFriendModel;
import com.chwl.app.ui.im.avtivity.NimP2PMessageActivity;
import com.chwl.app.ui.user.adapter.SelfPhotoAdapter;
import com.chwl.app.ui.user.adapter.UserInfoIndicatorAdapter;
import com.chwl.app.ui.user.adapter.UserInfoLabelAdapter;
import com.chwl.app.ui.user.adapter.UserInfoPagerAdapter;
import com.chwl.app.ui.user.adapter.UserInfoPhotoAdapter;
import com.chwl.app.ui.user.adapter.UserPhotoAdapter;
import com.chwl.app.ui.user.dialog.UserLabelDialog;
import com.chwl.app.ui.user.fragment.UserInfoGiftWallFragment;
import com.chwl.app.ui.user.fragment.UserInfoInfoFragment;
import com.chwl.app.ui.user.viewmodel.UserInfoViewModel;
@@ -60,11 +56,8 @@ import com.chwl.app.ui.widget.ButtonItem;
import com.chwl.app.ui.widget.ObservableScrollView;
import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper;
import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
import com.chwl.app.ui.widget.rollviewpager.HintView;
import com.chwl.app.ui.widget.rollviewpager.RollPagerView;
import com.chwl.app.ui.widget.rollviewpager.adapter.StaticPagerAdapterWrapper;
import com.chwl.app.utils.RegexUtil;
import com.chwl.app.vip.util.VipHelper;
import com.chwl.core.XConstants;
import com.chwl.core.Constants;
import com.chwl.core.auth.AuthModel;
@@ -85,9 +78,7 @@ import com.chwl.core.user.event.LoginUserInfoUpdateEvent;
import com.chwl.core.utils.LogUtils;
import com.chwl.core.utils.Logger;
import com.chwl.library.annatation.ActLayoutRes;
import com.chwl.library.common.widget.LinesFlexBoxLayoutManager;
import com.chwl.library.utils.ListUtils;
import com.chwl.library.utils.ResUtil;
import com.chwl.library.utils.SingleToastUtil;
import com.chwl.library.utils.SizeUtils;
@@ -141,7 +132,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
initUserInfoDetailObserver();
initAttentionView();
initNestScrollView();
setEditButton(identityState, true);
setEditButton(identityState, false);
setTitleVisible(false);
initViewPager();
if (userId != AuthModel.get().getCurrentUid()) {
@@ -174,7 +165,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
if (AuthModel.get().getCurrentUid() == userId) {
identityState = OWN;
mBinding.tvFansCount.setOnClickListener(this);
mBinding.groupLive.setVisibility(View.GONE);
mBinding.layoutLive.setVisibility(View.GONE);
if (bottomViewLayout != null)
bottomViewLayout.setVisibility(View.GONE);
} else {
@@ -200,8 +191,8 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
mBinding.ivUserBack.setOnClickListener(this);
mBinding.ivEdit.setOnClickListener(this);
mBinding.tvEdit.setOnClickListener(this);
mBinding.viewLive.setOnClickListener(this);
mBinding.ivTagArrow.setOnClickListener(this);
mBinding.layoutLive.setOnClickListener(this);
// mBinding.ivTagArrow.setOnClickListener(this);
}
/**
@@ -209,10 +200,10 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
*/
private void setWhereVisible() {
if (viewModel.getMRoomUid() != 0) {
mBinding.groupLive.setVisibility(View.VISIBLE);
mBinding.layoutLive.setVisibility(View.VISIBLE);
playSvgaBg(mBinding.svgLive, "svga/user_in_live.svga");
} else {
mBinding.groupLive.setVisibility(View.GONE);
mBinding.layoutLive.setVisibility(View.GONE);
mBinding.svgLive.stopAnimation();
}
}
@@ -242,7 +233,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
tagList.add(getString(R.string.me_data));
tagList.add(getString(R.string.me_gift_wall));
CommonNavigator commonNavigator = new CommonNavigator(context);
commonNavigator.setTitleWrapContent(true);
commonNavigator.setTitleWrapContent(false);
UserInfoIndicatorAdapter magicIndicatorAdapter = new UserInfoIndicatorAdapter(context, tagList);
magicIndicatorAdapter.setOnItemSelectListener((position, view) -> {
mBinding.viewPager.setCurrentItem(position);
@@ -322,11 +313,11 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
mBinding.ivChargeAgent.setVisibility(userInfo.isRechargeUser() ? View.VISIBLE : View.GONE);
VipHelper.loadVipIcon(mBinding.ivVipIcon, userInfo.getUserVipInfoVO());
// VipHelper.loadVipIcon(mBinding.ivVipIcon, userInfo.getUserVipInfoVO());
initVoiceShow(userInfo.getAudioCard());
initLabel(userInfo.getLabels());
// initLabel(userInfo.getLabels());
mBinding.tvErbanId.setOnLongClickListener(view -> {
copyName();
@@ -348,39 +339,39 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
}
}
/**
* 标签
*
* @param labels
*/
private void initLabel(List<String> labels) {
if (labels == null || labels.isEmpty()) {
if (AuthModel.get().getCurrentUid() != userId) {
mBinding.groupLabel.setVisibility(View.GONE);
mBinding.tvEditLabel.setVisibility(View.GONE);
} else {
mBinding.groupLabel.setVisibility(View.GONE);
mBinding.tvEditLabel.setVisibility(View.VISIBLE);
mBinding.tvEditLabel.setOnClickListener(view -> {
EditUserLabelActivity.start(this);
});
}
return;
} else {
mBinding.groupLabel.setVisibility(View.VISIBLE);
mBinding.tvEditLabel.setVisibility(View.GONE);
}
UserInfoLabelAdapter userInfoLabelAdapter = new UserInfoLabelAdapter();
LinesFlexBoxLayoutManager labelLayoutManager = new LinesFlexBoxLayoutManager(this);
labelLayoutManager.setFlexDirection(FlexDirection.ROW);
labelLayoutManager.setAlignItems(AlignItems.FLEX_START);
labelLayoutManager.setMaxLines(1);
mBinding.mLabelRecyclerView.setLayoutManager(labelLayoutManager);
mBinding.mLabelRecyclerView.setAdapter(userInfoLabelAdapter);
userInfoLabelAdapter.setNewData(labels);
}
// /**
// * 标签
// *
// * @param labels
// */
// private void initLabel(List<String> labels) {
// if (labels == null || labels.isEmpty()) {
// if (AuthModel.get().getCurrentUid() != userId) {
// mBinding.groupLabel.setVisibility(View.GONE);
// mBinding.tvEditLabel.setVisibility(View.GONE);
// } else {
// mBinding.groupLabel.setVisibility(View.GONE);
// mBinding.tvEditLabel.setVisibility(View.VISIBLE);
// mBinding.tvEditLabel.setOnClickListener(view -> {
// EditUserLabelActivity.start(this);
// });
// }
// return;
// } else {
// mBinding.groupLabel.setVisibility(View.VISIBLE);
// mBinding.tvEditLabel.setVisibility(View.GONE);
// }
// UserInfoLabelAdapter userInfoLabelAdapter = new UserInfoLabelAdapter();
//
// LinesFlexBoxLayoutManager labelLayoutManager = new LinesFlexBoxLayoutManager(this);
// labelLayoutManager.setFlexDirection(FlexDirection.ROW);
// labelLayoutManager.setAlignItems(AlignItems.FLEX_START);
// labelLayoutManager.setMaxLines(1);
// mBinding.mLabelRecyclerView.setLayoutManager(labelLayoutManager);
// mBinding.mLabelRecyclerView.setAdapter(userInfoLabelAdapter);
//
// userInfoLabelAdapter.setNewData(labels);
// }
/**
* 相册
@@ -390,20 +381,20 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
return;
}
if (bannerAdapter == null) {
mBinding.rollView.setHintViewDelegate(new RollPagerView.HintViewDelegate() {
@SuppressLint("SetTextI18n")
@Override
public void setCurrentPosition(int position, HintView hintView) {
if (mBinding.rollView.getAdapter() != null) {
mBinding.tvRollHint.setText((position + 1) + "/" + mBinding.rollView.getAdapter().getCount());
}
}
@Override
public void initView(int length, int gravity, HintView hintView) {
}
});
// mBinding.rollView.setHintViewDelegate(new RollPagerView.HintViewDelegate() {
// @SuppressLint("SetTextI18n")
// @Override
// public void setCurrentPosition(int position, HintView hintView) {
// if (mBinding.rollView.getAdapter() != null) {
// mBinding.tvRollHint.setText((position + 1) + "/" + mBinding.rollView.getAdapter().getCount());
// }
// }
//
// @Override
// public void initView(int length, int gravity, HintView hintView) {
//
// }
// });
bannerAdapter = identityState == OWN ? new SelfPhotoAdapter(list, this)
: new UserInfoPhotoAdapter(list, this);
mBinding.rollView.setAdapter(bannerAdapter);
@@ -464,11 +455,17 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
} else if (identityState == IdentityState.OTHER) {
mBinding.ivEdit.setVisibility(View.VISIBLE);
mBinding.tvEdit.setVisibility(View.GONE);
mBinding.ivEdit.setImageResource(R.drawable.icon_home_page_more_black);
} else {
mBinding.ivEdit.setVisibility(View.GONE);
mBinding.tvEdit.setVisibility(View.GONE);
}
if (isExpanded) {
mBinding.ivEdit.setImageResource(R.drawable.user_info_ic_more_black);
mBinding.tvEdit.setImageResource(R.drawable.user_info_ic_edit_black);
} else {
mBinding.ivEdit.setImageResource(R.drawable.user_info_ic_more);
mBinding.tvEdit.setImageResource(R.drawable.user_info_ic_edit);
}
}
@Override
@@ -526,9 +523,9 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
@Override
public void onClick(View v) {
switch (v.getId()) {
case R.id.ivTagArrow:
UserLabelDialog.newInstance(userInfo.getLabels(), userId).show(this);
break;
// case R.id.ivTagArrow:
// UserLabelDialog.newInstance(userInfo.getLabels(), userId).show(this);
// break;
case R.id.iv_user_back:
finish();
@@ -585,7 +582,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
PraiseModel.get().praise(userInfo.getUid(), true).subscribe();
}
break;
case R.id.viewLive:
case R.id.layout_live:
if (userInfo == null) {
toast(getString(R.string.me_user_information_is_empty));
return;
@@ -605,7 +602,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
private void setLikedText(boolean isliked) {
mIslike = isliked;
attentionLayout.setBackgroundResource(isliked ? R.drawable.bg_common_cancel_30 : R.drawable.selector_common_confirm);
attentionLayout.setBackgroundResource(isliked ? R.drawable.base_shape_fffdaa_23dp : R.drawable.user_info_bg_follow);
attentionLayout.setText(getString((isliked) ? R.string.already_attention : R.string.attention));
}
@@ -644,7 +641,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
showSoundCard(audioCard);
} else {
mBinding.llAudio.setVisibility(View.GONE);
mBinding.llAudioTip.setVisibility(View.VISIBLE);
// mBinding.llAudioTip.setVisibility(View.VISIBLE);
}
} else if (audioCard.getStatus() == 2) {//客态
showSoundCard(audioCard);
@@ -652,26 +649,26 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
} else {
if (AuthModel.get().getCurrentUid() == userId) {//主态
mBinding.llAudio.setVisibility(View.GONE);
mBinding.llAudioTip.setVisibility(View.VISIBLE);
// mBinding.llAudioTip.setVisibility(View.VISIBLE);
} else {
mBinding.llAudio.setVisibility(View.GONE);
mBinding.llAudioTip.setVisibility(View.GONE);
// mBinding.llAudioTip.setVisibility(View.GONE);
}
}
mBinding.llAudioTip.setOnClickListener(view -> {
// 点击跳转到声音签名页面
UIHelper.showSoundAct(
this,
UserInfoModifyActivity.Method.AUDIO,
ResUtil.getString(R.string.ui_user_userinfomodifyactivity_07),
audioCard);
});
// mBinding.llAudioTip.setOnClickListener(view -> {
// // 点击跳转到声音签名页面
// UIHelper.showSoundAct(
// this,
// UserInfoModifyActivity.Method.AUDIO,
// ResUtil.getString(R.string.ui_user_userinfomodifyactivity_07),
// audioCard);
// });
}
private void showSoundCard(UserInfo.SoundBean audioCard) {
mBinding.llAudio.setVisibility(View.VISIBLE);
mBinding.llAudioTip.setVisibility(View.GONE);
mBinding.tvAudio.setText(String.valueOf(audioCard.getSecond()));
// mBinding.llAudioTip.setVisibility(View.GONE);
mBinding.tvAudio.setText(audioCard.getSecond() + "s");
mBinding.livUser.stopAnimation();
mBinding.llAudio.setOnClickListener(v -> toggleAudio(audioCard));
}
@@ -695,7 +692,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
if (audioPlaying) return;
audioPlaying = true;
playSvgaBg(mBinding.livUser, "svga/user_sound_play.svga");
mBinding.ivAudioControl.setImageResource(R.drawable.ic_skill_play);
mBinding.ivAudioControl.setImageResource(R.drawable.user_info_ic_audio_pause);
startCountDown(second);
if (AvRoomDataManager.get().mCurrentRoomInfo != null) {
AudioEngineManager.get().setRemoteMute(true);//設置靜音
@@ -732,7 +729,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
@Override
public void onTick(long millisUntilFinished) {
String time = String.valueOf(millisUntilFinished / 1000);
mBinding.tvAudio.setText(time);
mBinding.tvAudio.setText(time + "s");
}
@Override
@@ -744,7 +741,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
private void stopCountDown(int second) {
if (timer != null) {
mBinding.tvAudio.setText(String.valueOf(second));
mBinding.tvAudio.setText(second+"s");
timer.cancel();
}
}
@@ -754,7 +751,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
if (!audioPlaying) return;
audioPlaying = false;
mBinding.livUser.stopAnimation();
mBinding.ivAudioControl.setImageResource(R.drawable.ic_skill_pause);
mBinding.ivAudioControl.setImageResource(R.drawable.user_info_ic_audio_play);
AudioPlayerHelper.get().endPlay();
if (AvRoomDataManager.get().mCurrentRoomInfo != null) {
AudioEngineManager.get().setRemoteMute(isRemoteMute);//非靜音

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 182 B

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 206 B

6
app/src/main/res/drawable/user_info_bg_audio.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#80CBFF00" />
<corners android:radius="17dp" />
</shape>

8
app/src/main/res/drawable/user_info_bg_follow.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/base_shape_ffee00_23dp" android:state_pressed="true" />
<item android:drawable="@drawable/base_shape_ffee00_23dp" android:state_focused="true" />
<item android:drawable="@drawable/base_shape_ffee00_23dp" android:state_enabled="true" />
<item android:drawable="@drawable/base_shape_fffdaa_23dp" android:state_enabled="false" />
</selector>

9
app/src/main/res/drawable/user_info_bg_live.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="12dp" />
<stroke
android:width="1dp"
android:color="#FF1E1E1F" />
<solid android:color="@color/base_color_theme" />
</shape>

10
app/src/main/res/drawable/user_info_bg_top_cover.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="270"
android:centerColor="#08000000"
android:endColor="#00000000"
android:startColor="#cc000000"
android:type="linear" />
</shape>

36
app/src/main/res/drawable/user_info_ic_audio_palying.xml Normal file
View File

@@ -0,0 +1,36 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="23dp"
android:height="12dp"
android:viewportWidth="23"
android:viewportHeight="12">
<path
android:pathData="M11.5,0L11.5,0A1.5,1.5 0,0 1,13 1.5L13,10.5A1.5,1.5 0,0 1,11.5 12L11.5,12A1.5,1.5 0,0 1,10 10.5L10,1.5A1.5,1.5 0,0 1,11.5 0z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M16.7,2.7L16.7,2.7A1.2,1.2 0,0 1,17.9 3.9L17.9,8.1A1.2,1.2 0,0 1,16.7 9.3L16.7,9.3A1.2,1.2 0,0 1,15.5 8.1L15.5,3.9A1.2,1.2 0,0 1,16.7 2.7z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M6.3,2.7L6.3,2.7A1.2,1.2 135,0 0,5.1 3.9L5.1,8.1A1.2,1.2 0,0 0,6.3 9.3L6.3,9.3A1.2,1.2 0,0 0,7.5 8.1L7.5,3.9A1.2,1.2 0,0 0,6.3 2.7z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M22,4.5L22,4.5A1,1 0,0 1,23 5.5L23,6.5A1,1 0,0 1,22 7.5L22,7.5A1,1 0,0 1,21 6.5L21,5.5A1,1 0,0 1,22 4.5z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M1,4.5L1,4.5A1,1 0,0 0,0 5.5L0,6.5A1,1 0,0 0,1 7.5L1,7.5A1,1 0,0 0,2 6.5L2,5.5A1,1 0,0 0,1 4.5z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
</vector>

25
app/src/main/res/drawable/user_info_ic_audio_pause.xml Normal file
View File

@@ -0,0 +1,25 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="26dp"
android:height="26dp"
android:viewportWidth="26"
android:viewportHeight="26">
<path
android:pathData="M13,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
android:strokeWidth="1"
android:fillColor="#CBFF00"
android:fillAlpha="0.5"
android:strokeColor="#FFFFFF"
android:fillType="evenOdd"/>
<path
android:pathData="M10.1,8.5L10.1,8.5A1.4,1.4 0,0 1,11.5 9.9L11.5,16.1A1.4,1.4 0,0 1,10.1 17.5L10.1,17.5A1.4,1.4 0,0 1,8.7 16.1L8.7,9.9A1.4,1.4 0,0 1,10.1 8.5z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M15.9,8.5L15.9,8.5A1.4,1.4 0,0 1,17.3 9.9L17.3,16.1A1.4,1.4 0,0 1,15.9 17.5L15.9,17.5A1.4,1.4 0,0 1,14.5 16.1L14.5,9.9A1.4,1.4 0,0 1,15.9 8.5z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
</vector>

19
app/src/main/res/drawable/user_info_ic_audio_play.xml Normal file
View File

@@ -0,0 +1,19 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="26dp"
android:height="26dp"
android:viewportWidth="26"
android:viewportHeight="26">
<path
android:pathData="M13,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
android:strokeWidth="1"
android:fillColor="#CBFF00"
android:fillAlpha="0.5"
android:strokeColor="#FFFFFF"
android:fillType="evenOdd"/>
<path
android:pathData="M17.099,14.441L12.044,17.473C11.249,17.951 10.217,17.693 9.739,16.897C9.583,16.636 9.5,16.337 9.5,16.033L9.5,9.967C9.5,9.039 10.252,8.287 11.18,8.287C11.484,8.287 11.783,8.37 12.044,8.527L17.099,11.559C17.895,12.037 18.153,13.069 17.675,13.864C17.533,14.101 17.335,14.299 17.099,14.441Z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
</vector>

12
app/src/main/res/drawable/user_info_ic_edit.xml Normal file
View File

@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:pathData="M18.211,0.729C18.399,0.534 18.678,0.456 18.94,0.524C19.202,0.593 19.407,0.798 19.476,1.06C19.544,1.322 19.466,1.601 19.271,1.789L8.671,12.39C8.378,12.682 7.903,12.682 7.61,12.39C7.318,12.097 7.318,11.622 7.61,11.329L18.211,0.729L18.211,0.729ZM17.991,8.505C17.991,8.091 18.327,7.756 18.741,7.756C19.155,7.756 19.491,8.091 19.491,8.505L19.491,16.751C19.491,18.269 18.26,19.5 16.742,19.5L3.249,19.5C1.731,19.5 0.5,18.269 0.5,16.751L0.5,3.258C0.5,1.74 1.731,0.509 3.249,0.509L11.245,0.509C11.659,0.509 11.994,0.845 11.994,1.259C11.994,1.673 11.659,2.009 11.245,2.009L3.249,2.009C2.559,2.009 1.999,2.568 1.999,3.258L1.999,16.751C1.999,17.441 2.559,18.001 3.249,18.001L16.742,18.001C17.432,18.001 17.991,17.441 17.991,16.751L17.991,8.505Z"
android:strokeWidth="0.3"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:strokeColor="#FFFFFF"/>
</vector>

12
app/src/main/res/drawable/user_info_ic_edit_black.xml Normal file
View File

@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:pathData="M18.211,0.729C18.399,0.534 18.678,0.456 18.94,0.524C19.202,0.593 19.407,0.798 19.476,1.06C19.544,1.322 19.466,1.601 19.271,1.789L8.671,12.39C8.378,12.682 7.903,12.682 7.61,12.39C7.318,12.097 7.318,11.622 7.61,11.329L18.211,0.729L18.211,0.729ZM17.991,8.505C17.991,8.091 18.327,7.756 18.741,7.756C19.155,7.756 19.491,8.091 19.491,8.505L19.491,16.751C19.491,18.269 18.26,19.5 16.742,19.5L3.249,19.5C1.731,19.5 0.5,18.269 0.5,16.751L0.5,3.258C0.5,1.74 1.731,0.509 3.249,0.509L11.245,0.509C11.659,0.509 11.994,0.845 11.994,1.259C11.994,1.673 11.659,2.009 11.245,2.009L3.249,2.009C2.559,2.009 1.999,2.568 1.999,3.258L1.999,16.751C1.999,17.441 2.559,18.001 3.249,18.001L16.742,18.001C17.432,18.001 17.991,17.441 17.991,16.751L17.991,8.505Z"
android:strokeWidth="0.3"
android:fillColor="#000000"
android:fillType="nonZero"
android:strokeColor="#000000"/>
</vector>

12
app/src/main/res/drawable/user_info_ic_live.xml Normal file
View File

@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="12dp"
android:height="12dp"
android:viewportWidth="12"
android:viewportHeight="12">
<path
android:pathData="M2,2.5C2.552,2.5 3,2.948 3,3.5L3,8.5C3,9.052 2.552,9.5 2,9.5C1.448,9.5 1,9.052 1,8.5L1,3.5C1,2.948 1.448,2.5 2,2.5ZM6,0.5C6.552,0.5 7,0.948 7,1.5L7,10.5C7,11.052 6.552,11.5 6,11.5C5.448,11.5 5,11.052 5,10.5L5,1.5C5,0.948 5.448,0.5 6,0.5ZM10,2.5C10.552,2.5 11,2.948 11,3.5L11,8.5C11,9.052 10.552,9.5 10,9.5C9.448,9.5 9,9.052 9,8.5L9,3.5C9,2.948 9.448,2.5 10,2.5Z"
android:strokeWidth="1"
android:fillColor="#141414"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
</vector>

12
app/src/main/res/drawable/user_info_ic_more.xml Normal file
View File

@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:pathData="M18,8C16.895,8 16,8.895 16,10C16,11.105 16.895,12 18,12C19.105,12 20,11.105 20,10C20,8.895 19.105,8 18,8ZM10,8C8.895,8 8,8.895 8,10C8,11.105 8.895,12 10,12C11.105,12 12,11.105 12,10C12,8.895 11.105,8 10,8ZM2,8C0.895,8 0,8.895 0,10C0,11.105 0.895,12 2,12C3.105,12 4,11.105 4,10C4,8.895 3.105,8 2,8Z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
</vector>

12
app/src/main/res/drawable/user_info_ic_more_black.xml Normal file
View File

@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:pathData="M18,8C16.895,8 16,8.895 16,10C16,11.105 16.895,12 18,12C19.105,12 20,11.105 20,10C20,8.895 19.105,8 18,8ZM10,8C8.895,8 8,8.895 8,10C8,11.105 8.895,12 10,12C11.105,12 12,11.105 12,10C12,8.895 11.105,8 10,8ZM2,8C0.895,8 0,8.895 0,10C0,11.105 0.895,12 2,12C3.105,12 4,11.105 4,10C4,8.895 3.105,8 2,8Z"
android:strokeWidth="1"
android:fillColor="#000000"
android:fillType="evenOdd"
android:strokeColor="#000000"/>
</vector>

743
app/src/main/res/layout/activity_user_info.xml
View File

@@ -2,16 +2,10 @@
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<data>
</data>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_F3F5FA">
android:background="@color/color_FFFFFF">
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/coordinator_layout"
@@ -32,482 +26,390 @@
app:contentScrim="@color/white"
app:layout_scrollFlags="scroll|exitUntilCollapsed">
<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="vertical">
android:paddingBottom="@dimen/dp_20">
<FrameLayout
<com.chwl.app.ui.widget.rollviewpager.RollPagerView
android:id="@+id/roll_view"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="@dimen/dp_190"
app:layout_constraintTop_toTopOf="parent"
app:rollviewpager_play_delay="5000" />
<com.chwl.app.ui.widget.rollviewpager.RollPagerView
android:id="@+id/roll_view"
android:layout_width="match_parent"
android:layout_height="245dp"
app:rollviewpager_play_delay="5000">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_166"
android:background="@drawable/user_info_bg_top_cover"
app:layout_constraintTop_toTopOf="@id/roll_view" />
<View
android:layout_width="match_parent"
android:layout_height="245dp"
android:background="@mipmap/bg_userinfo_photo_cover" />
</com.chwl.app.ui.widget.rollviewpager.RollPagerView>
<LinearLayout
android:id="@+id/llAudio"
android:layout_width="@dimen/dp_98"
android:layout_height="@dimen/dp_32"
android:layout_gravity="end|bottom"
android:layout_marginTop="@dimen/dp_132"
android:layout_marginEnd="@dimen/dp_12"
android:background="@drawable/user_info_bg_audio"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible">
<TextView
android:id="@+id/tv_roll_hint"
<ImageView
android:id="@+id/iv_audio_control"
android:layout_width="@dimen/dp_26"
android:layout_height="@dimen/dp_26"
android:layout_marginStart="@dimen/dp_4"
android:src="@drawable/user_info_ic_audio_play" />
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/liv_user"
android:layout_width="@dimen/dp_23"
android:layout_height="@dimen/dp_12"
android:layout_marginStart="@dimen/dp_7"
android:src="@drawable/user_info_ic_audio_palying"
app:autoPlay="true" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvAudio"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_68"
android:background="@drawable/shape_66000000_100dp"
android:gravity="center"
android:includeFontPadding="false"
android:paddingStart="@dimen/dp_10"
android:paddingTop="@dimen/dp_2"
android:paddingEnd="@dimen/dp_10"
android:paddingBottom="@dimen/dp_2"
android:text="1/1"
android:layout_marginStart="@dimen/dp_6"
android:textColor="@color/white"
android:textSize="@dimen/sp_10" />
android:textSize="@dimen/sp_13"
tools:text="60S" />
<LinearLayout
android:id="@+id/llAudio"
android:layout_width="@dimen/dp_98"
android:layout_height="@dimen/dp_28"
android:layout_gravity="end|bottom"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_64"
android:background="@drawable/bg_common_confirm_30"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone"
tools:visibility="visible">
</LinearLayout>
<ImageView
android:id="@+id/iv_audio_control"
android:layout_width="@dimen/dp_18"
android:layout_height="18dp"
android:layout_marginStart="@dimen/dp_4"
android:src="@drawable/ic_skill_pause" />
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/liv_user"
android:layout_width="35dp"
android:layout_height="20dp"
android:layout_marginStart="@dimen/dp_4"
android:src="@mipmap/user_sound_play"
app:autoPlay="true" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvAudio"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_6"
android:textColor="@color/white"
android:textSize="@dimen/sp_14"
tools:text="60" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="''"
android:textColor="@color/white"
android:textSize="@dimen/sp_14" />
</LinearLayout>
<LinearLayout
android:id="@+id/llAudioTip"
android:layout_width="98dp"
android:layout_height="@dimen/dp_28"
android:layout_gravity="end|bottom"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_64"
android:background="@drawable/bg_common_confirm_30"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone">
<ImageView
android:id="@+id/iv_record"
android:layout_width="@dimen/dp_18"
android:layout_height="18dp"
android:layout_marginStart="@dimen/dp_4"
android:src="@drawable/ic_audio_record" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_6"
android:text="@string/recording_sound_card"
android:textColor="@color/white"
android:textSize="@dimen/sp_12" />
</LinearLayout>
</FrameLayout>
<androidx.constraintlayout.widget.ConstraintLayout
<View
android:id="@+id/v_bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="-50dp"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/shape_white_12dp_round"
android:clipChildren="false"
android:clipToPadding="false"
android:paddingStart="@dimen/dp_15"
android:paddingTop="@dimen/dp_10"
android:paddingEnd="0dp"
android:paddingBottom="@dimen/dp_15">
android:layout_height="0dp"
android:layout_marginTop="@dimen/dp_180"
android:background="@drawable/shape_white_top_12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/v_bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_white_12dp_round"
app:layout_constraintTop_toTopOf="parent" />
<com.chwl.app.common.widget.CircleImageView
android:id="@+id/iv_user_head"
android:layout_width="@dimen/dp_88"
android:layout_height="@dimen/dp_88"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_25"
android:src="@drawable/default_avatar"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/v_bg" />
<com.chwl.app.common.widget.CircleImageView
android:id="@+id/iv_user_head"
android:layout_width="88dp"
android:layout_height="88dp"
android:src="@drawable/default_avatar"
app:cborder_color="@color/white"
app:cborder_width="1dp"
app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/viewLive"
android:layout_width="0dp"
android:layout_height="@dimen/dp_22"
android:layout_marginStart="7dp"
android:layout_marginEnd="7dp"
android:background="@drawable/ic_live_bottom"
app:layout_constraintBottom_toBottomOf="@+id/iv_user_head"
app:layout_constraintEnd_toEndOf="@+id/iv_user_head"
app:layout_constraintStart_toStartOf="@+id/iv_user_head" />
<LinearLayout
android:id="@+id/layout_live"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_24"
android:layout_marginTop="@dimen/dp_64"
android:background="@drawable/user_info_bg_live"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingHorizontal="@dimen/dp_7"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="@id/iv_user_head"
app:layout_constraintStart_toStartOf="@id/iv_user_head"
app:layout_constraintTop_toTopOf="@id/iv_user_head"
tools:visibility="visible">
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/svgLive"
android:layout_width="@dimen/dp_12"
android:layout_height="@dimen/dp_12"
android:src="@drawable/ic_live"
android:src="@drawable/user_info_ic_live"
app:autoPlay="true"
app:clearsAfterDetached="true"
app:layout_constraintBottom_toBottomOf="@+id/viewLive"
app:layout_constraintEnd_toStartOf="@+id/tvLive"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="@+id/viewLive"
app:layout_constraintTop_toTopOf="@+id/viewLive" />
app:clearsAfterDetached="true" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvLive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/me_in_live"
android:textColor="@color/white"
android:textSize="@dimen/sp_10"
app:layout_constraintBottom_toBottomOf="@+id/viewLive"
app:layout_constraintEnd_toEndOf="@+id/viewLive"
app:layout_constraintStart_toEndOf="@+id/svgLive"
app:layout_constraintTop_toTopOf="@+id/viewLive" />
android:textColor="@color/color_1E1E1F"
android:textSize="@dimen/sp_11" />
<androidx.constraintlayout.widget.Group
android:id="@+id/groupLive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:constraint_referenced_ids="viewLive,tvLive,svgLive" />
</LinearLayout>
<ImageView
android:id="@+id/iv_vip_icon"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_marginStart="@dimen/dp_12"
android:adjustViewBounds="true"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/tv_nick"
app:layout_constraintStart_toEndOf="@+id/iv_user_head"
app:layout_constraintTop_toTopOf="@id/tv_nick"
tools:src="@drawable/ic_user_charm_level"
tools:visibility="visible" />
<TextView
android:id="@+id/tv_nick"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginStart="@dimen/dp_12"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/color_1E1E1F"
android:textSize="@dimen/sp_16"
android:textStyle="bold"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toTopOf="@id/ll_id"
app:layout_constraintEnd_toStartOf="@id/tv_gender_age"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@id/iv_user_head"
app:layout_constraintTop_toTopOf="@id/iv_user_head"
app:layout_constraintVertical_chainStyle="packed"
app:layout_goneMarginStart="@dimen/dp_12"
tools:text="Name" />
<com.chwl.app.view.GenderAgeTextView
android:id="@+id/tv_gender_age"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_4"
android:layout_marginEnd="@dimen/dp_16"
android:textSize="@dimen/sp_12"
app:layout_constraintBaseline_toBaselineOf="@id/tv_nick"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/tv_nick" />
<LinearLayout
android:id="@+id/ll_id"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_4"
android:gravity="center_vertical"
android:orientation="horizontal"
app:layout_constraintBottom_toTopOf="@id/tv_desc"
app:layout_constraintStart_toStartOf="@+id/tv_nick"
app:layout_constraintTop_toBottomOf="@id/tv_nick">
<TextView
android:id="@+id/tv_nick"
android:id="@+id/tv_erban_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginStart="3dp"
android:layout_marginBottom="6dp"
android:ellipsize="end"
android:gravity="center_vertical"
android:includeFontPadding="false"
android:maxLines="1"
android:textColor="@color/color_1F1A4E"
android:textSize="@dimen/sp_18"
android:textStyle="bold"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toStartOf="@id/tv_gender_age"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@id/iv_vip_icon"
app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginStart="@dimen/dp_12"
tools:text="@string/layout_activity_user_info_01" />
android:textColor="@color/color_84868A"
android:textSize="@dimen/sp_12"
tools:text="ID:7958626" />
<com.chwl.app.view.GenderAgeTextView
android:id="@+id/tv_gender_age"
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_copy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:src="@drawable/ic_user_info_copy" />
<ImageView
android:id="@+id/iv_good_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_5"
android:layout_marginEnd="@dimen/dp_10"
android:textSize="@dimen/sp_12"
app:layout_constraintBaseline_toBaselineOf="@id/tv_nick"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/tv_nick" />
android:src="@mipmap/ic_good_num"
android:visibility="gone"
tools:visibility="visible" />
<View
android:layout_width="0.5dp"
android:layout_height="@dimen/dp_7"
android:layout_marginHorizontal="@dimen/dp_8"
android:background="#FFB4B7BD" />
<LinearLayout
android:id="@+id/ll_id"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_12"
android:layout_marginTop="@dimen/dp_8"
android:gravity="center_vertical"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/iv_user_head"
app:layout_constraintTop_toBottomOf="@id/tv_nick">
android:layout_marginEnd="@dimen/dp_16"
android:baselineAligned="true"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_erban_id"
android:id="@+id/tv_fans_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:includeFontPadding="false"
android:maxLines="1"
android:textColor="@color/color_6D6B89"
android:textColor="@color/color_84868A"
android:textSize="@dimen/sp_12"
tools:text="ID:7958626" />
tools:text="19" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_copy"
<TextView
android:id="@+id/tv_user_fan_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:src="@drawable/ic_user_info_copy" />
<ImageView
android:id="@+id/iv_good_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_5"
android:src="@mipmap/ic_good_num"
android:visibility="gone"
tools:visibility="visible" />
<View
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_15"
android:baselineAligned="true"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_fans_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:textColor="@color/color_6D6B89"
android:textSize="@dimen/sp_12"
tools:text="19" />
<TextView
android:id="@+id/tv_user_fan_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/fan"
android:textColor="@color/color_6D6B89"
android:textSize="@dimen/sp_12" />
</LinearLayout>
android:layout_marginStart="@dimen/dp_3"
android:text="@string/fan"
android:textColor="@color/color_84868A"
android:textSize="@dimen/sp_12" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_level"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8"
android:gravity="center_vertical"
android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@id/ll_id">
</LinearLayout>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_level"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:layout_marginEnd="1dp"
android:adjustViewBounds="true"
android:visibility="visible"
tools:src="@mipmap/ic_user_level" />
<TextView
android:id="@+id/tv_desc"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_4"
android:layout_marginEnd="@dimen/dp_5"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/color_84868A"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toTopOf="@id/ll_level"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/tv_nick"
app:layout_constraintTop_toBottomOf="@id/ll_id"
tools:text="@string/layout_activity_user_info_04" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_charm"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:layout_marginEnd="1dp"
android:adjustViewBounds="true"
android:visibility="visible"
tools:src="@drawable/ic_user_charm_level" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/in_official_mask"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:visibility="visible"
tools:visibility="visible">
<ImageView
android:id="@+id/iv_official_mask"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:adjustViewBounds="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/ic_temp_official_mask" />
<TextView
android:id="@+id/tv_official_mask"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="22dp"
android:layout_marginEnd="8dp"
android:gravity="center"
android:includeFontPadding="false"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="11sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/iv_official_mask"
app:layout_constraintStart_toStartOf="@id/iv_official_mask"
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/layout_activity_user_info_02" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView
android:id="@+id/iv_charge_agent"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:layout_gravity="center_vertical"
android:adjustViewBounds="true"
android:src="@drawable/img_charge_agent"
android:visibility="gone" />
<View
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/mLabelRecyclerView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_12"
android:orientation="horizontal"
app:layout_constraintEnd_toStartOf="@+id/ivTagArrow"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_level" />
<LinearLayout
android:id="@+id/ll_level"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_5"
android:gravity="center_vertical"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="@id/iv_user_head"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/tv_nick"
app:layout_constraintTop_toBottomOf="@id/tv_desc">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ivTagArrow"
android:id="@+id/iv_user_level"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_12"
android:src="@drawable/ic_tag_arrow"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_level" />
android:layout_height="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_4"
android:adjustViewBounds="true"
android:visibility="visible"
tools:src="@mipmap/ic_user_level" />
<androidx.constraintlayout.widget.Group
android:id="@+id/groupLabel"
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_charm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_4"
android:adjustViewBounds="true"
android:visibility="visible"
tools:src="@drawable/ic_user_charm_level" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/in_official_mask"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_marginEnd="@dimen/dp_4"
android:visibility="visible"
tools:visibility="visible">
<ImageView
android:id="@+id/iv_official_mask"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:adjustViewBounds="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/ic_temp_official_mask" />
<TextView
android:id="@+id/tv_official_mask"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="22dp"
android:layout_marginEnd="8dp"
android:gravity="center"
android:includeFontPadding="false"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="11sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/iv_official_mask"
app:layout_constraintStart_toStartOf="@id/iv_official_mask"
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/layout_activity_user_info_02" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView
android:id="@+id/iv_charge_agent"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:layout_gravity="center_vertical"
android:adjustViewBounds="true"
android:src="@drawable/img_charge_agent"
android:visibility="gone"
app:constraint_referenced_ids="mLabelRecyclerView,ivTagArrow" />
tools:visibility="visible" />
</LinearLayout>
<com.coorchice.library.SuperTextView
android:id="@+id/tvEditLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_12"
android:drawableStart="@drawable/ic_user_info_label_edit"
android:drawablePadding="@dimen/dp_10"
android:gravity="center"
android:paddingStart="@dimen/dp_9"
android:paddingTop="@dimen/dp_3"
android:paddingEnd="@dimen/dp_15"
android:paddingBottom="@dimen/dp_3"
android:text="@string/edit_your_user_label"
android:textColor="@color/color_00C4EA"
android:textSize="@dimen/sp_10"
android:visibility="gone"
app:corner="@dimen/dp_10"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/mLabelRecyclerView"
app:solid="@color/color_E1FAFF" />
<!-- <androidx.recyclerview.widget.RecyclerView-->
<!-- android:id="@+id/mLabelRecyclerView"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="@dimen/dp_12"-->
<!-- android:orientation="horizontal"-->
<!-- app:layout_constraintEnd_toStartOf="@+id/ivTagArrow"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@id/ll_level" />-->
<TextView
android:id="@+id/tv_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_12"
android:ellipsize="end"
android:maxLines="2"
android:textColor="@color/color_B3B3C3"
android:textSize="@dimen/sp_13"
app:layout_constraintTop_toBottomOf="@id/tvEditLabel"
tools:text="@string/layout_activity_user_info_04" />
<!-- <androidx.appcompat.widget.AppCompatImageView-->
<!-- android:id="@+id/ivTagArrow"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="@dimen/dp_12"-->
<!-- android:layout_marginEnd="@dimen/dp_12"-->
<!-- android:src="@drawable/ic_tag_arrow"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@id/ll_level" />-->
</androidx.constraintlayout.widget.ConstraintLayout>
<!-- <androidx.constraintlayout.widget.Group-->
<!-- android:id="@+id/groupLabel"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:visibility="gone"-->
<!-- app:constraint_referenced_ids="mLabelRecyclerView,ivTagArrow" />-->
</LinearLayout>
<!-- <com.coorchice.library.SuperTextView-->
<!-- android:id="@+id/tvEditLabel"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="@dimen/dp_12"-->
<!-- android:drawableStart="@drawable/ic_user_info_label_edit"-->
<!-- android:drawablePadding="@dimen/dp_10"-->
<!-- android:gravity="center"-->
<!-- android:paddingStart="@dimen/dp_9"-->
<!-- android:paddingTop="@dimen/dp_3"-->
<!-- android:paddingEnd="@dimen/dp_15"-->
<!-- android:paddingBottom="@dimen/dp_3"-->
<!-- android:text="@string/edit_your_user_label"-->
<!-- android:textColor="@color/color_00C4EA"-->
<!-- android:textSize="@dimen/sp_10"-->
<!-- android:visibility="gone"-->
<!-- app:corner="@dimen/dp_10"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/mLabelRecyclerView"-->
<!-- app:solid="@color/color_E1FAFF" />-->
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.appcompat.widget.Toolbar
android:id="@+id/tb_user_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="30dp"
android:paddingTop="@dimen/dp_44"
android:visibility="visible"
app:contentInsetStart="0dp"
app:layout_collapseMode="pin">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:paddingLeft="15dp"
android:paddingRight="15dp">
android:layout_height="@dimen/dp_44">
<ImageView
android:id="@+id/iv_user_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:src="@drawable/icon_user_back" />
<TextView
@@ -518,16 +420,18 @@
android:layout_centerVertical="true"
android:text="@string/user_info"
android:textColor="@color/text_title_color"
android:textSize="16sp"
android:textSize="@dimen/dp_16"
android:visibility="visible" />
<ImageView
android:id="@+id/iv_edit"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:src="@drawable/icon_home_page_more" />
android:layout_marginEnd="@dimen/dp_7"
android:scaleType="centerInside"
android:src="@drawable/user_info_ic_more" />
<ImageView
android:id="@+id/tv_edit"
@@ -535,7 +439,9 @@
android:layout_height="@dimen/dp_30"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:src="@drawable/icon_home_page_compile"
android:layout_marginEnd="@dimen/dp_7"
android:scaleType="centerInside"
android:src="@drawable/user_info_ic_edit"
android:visibility="gone" />
</RelativeLayout>
@@ -545,31 +451,24 @@
</com.google.android.material.appbar.CollapsingToolbarLayout>
<FrameLayout
android:id="@+id/fl_indicator"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="15dp"
android:paddingBottom="5dp">
<com.chwl.app.ui.widget.magicindicator.MagicIndicator
android:id="@+id/magic_indicator"
android:layout_width="wrap_content"
android:layout_height="25dp"
android:paddingStart="15dp"
android:paddingEnd="10dp" />
</FrameLayout>
<com.chwl.app.ui.widget.magicindicator.MagicIndicator
android:id="@+id/magic_indicator"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_44"
android:layout_marginStart="@dimen/dp_4" />
<View
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_4"
android:background="@color/color_F7F7F7" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_5"
android:layout_marginEnd="@dimen/dp_15"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
@@ -577,7 +476,7 @@
<ViewStub
android:id="@+id/vs_bottom_layout"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_60"
android:layout_height="@dimen/dp_66"
android:layout_alignParentBottom="true"
android:layout="@layout/user_info_bottom_layout"
app:layout_behavior="com.chwl.app.ui.user.ScrollAwareBehavior" />

1
app/src/main/res/layout/fragment_me.xml
View File

@@ -153,6 +153,7 @@
android:id="@+id/iv_copy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_4"
android:src="@drawable/ic_user_info_copy" />
</LinearLayout>

1
app/src/main/res/layout/fragment_userinfo_gift_wall.xml
View File

@@ -5,6 +5,7 @@
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_marginHorizontal="@dimen/dp_15"
android:layout_width="match_parent"
android:layout_height="wrap_content">

3
app/src/main/res/layout/fragment_userinfo_userinfo.xml
View File

@@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layout_marginHorizontal="@dimen/dp_15">
<LinearLayout
android:layout_width="match_parent"

27
app/src/main/res/layout/user_info_bottom_layout.xml
View File

@@ -8,28 +8,29 @@
android:orientation="horizontal">
<com.chwl.library.widget.DrawableCenterTextView
android:id="@+id/send_msg_layout"
android:id="@+id/attention_layout"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="45dp"
android:layout_height="@dimen/dp_46"
android:layout_marginStart="@dimen/dp_15"
android:background="@drawable/bg_gradient_cc66ff_9cb3ff_30"
android:layout_marginEnd="@dimen/dp_8"
android:layout_weight="1"
android:background="@drawable/user_info_bg_follow"
android:gravity="center"
android:text="@string/send_msg"
android:textColor="@color/color_9168FA"
android:text="@string/attention"
android:textColor="@color/color_1E1E1F"
android:textSize="@dimen/sp_16" />
<com.chwl.library.widget.DrawableCenterTextView
android:id="@+id/attention_layout"
android:id="@+id/send_msg_layout"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="45dp"
android:layout_marginStart="18dp"
android:layout_height="@dimen/dp_46"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/selector_common_confirm"
android:layout_weight="1"
android:background="@drawable/base_shape_cbff00_23dp"
android:gravity="center"
android:text="@string/attention"
android:textColor="@color/white"
android:text="@string/send_msg"
android:textColor="@color/color_1E1E1F"
android:textSize="@dimen/sp_16" />
</LinearLayout>

4
core/src/main/java/com/chwl/core/im/custom/bean/RouterType.java
View File

@@ -278,4 +278,8 @@ public class RouterType {
* 收益记录（目前只是本地用到，所以用了100000）
*/
public static final int MY_REVENUE = 100000;
/**
* 用户等级（目前只是本地用到，所以用了100001）
*/
public static final int USER_LEVEL = 100001;
}

6
modules/module_base/src/main/res/drawable/base_shape_cbff00_23dp.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#CBFF00" />
<corners android:radius="23dp" />
</shape>

6
modules/module_base/src/main/res/drawable/base_shape_ffee00_23dp.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#FFEE00" />
<corners android:radius="23dp" />
</shape>

6
modules/module_base/src/main/res/drawable/base_shape_fffdaa_23dp.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#FFFDAA" />
<corners android:radius="23dp" />
</shape>