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

头像显示 and 爵位内页 优化

Browse Source
This commit is contained in:
骆召亮
2025-11-12 19:09:21 +08:00
parent c41a9f13f3
commit 68b4a66046
18 changed files with 226 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MainModule/src/main/java/com/xscm/modulemain/Application.kt
View File

@@ -57,7 +57,7 @@ open class Application : CommonAppContext() {
private fun initLogUtils() {
LogUtils.getConfig()
.setLogSwitch(false) // 全局开关
.setLogSwitch(true) // 全局开关
.setLog2FileSwitch(true) // 必须设为 true！
.setDir(LOGUTILS_SAVE_PATH) // 设置有效路径
.setFileFilter(LogUtils.V); // 允许所有级别

1
MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/NobleDetailsActivity.java
View File

@@ -107,6 +107,7 @@ public class NobleDetailsActivity extends BaseMvpActivity<NobleTitlePresenter, A
mAdapter = new NobliityBannerAdapter();
mBinding.banner
.setOffScreenPageLimit(nobilitLists.size()-1)
.setAdapter(mAdapter)
.setAutoPlay(false)
.setIndicatorVisibility(GONE)

12
MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java
View File

@@ -214,9 +214,9 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter<EMMessageInfo, Ba
MeHeadView avatar = helper.getView(com.xscm.moduleutil.R.id.avatar);
avatar.setData(emMessage.getText().getFromUserInfo().getAvatar(), "", emMessage.getText().getFromUserInfo().getNobility_image());
ImageUtils.loadHeadCC(emMessage.getText().getFromUserInfo().getAvatar(), helper.getView(com.xscm.moduleutil.R.id.avatar));
// helper.setText(com.xscm.moduleutil.R.id.tv_name, emMessage.getText().getFromUserInfo().getNickname());
helper.setTextColor(com.xscm.moduleutil.R.id.tv_name, emMessage.getText().getFromUserInfo().getNickname_color()!=null && !emMessage.getText().getFromUserInfo().getNickname_color().isEmpty()? Color.parseColor(emMessage.getText().getFromUserInfo().getNickname_color()):Color.parseColor("#CCA882"));
// ImageUtils.loadHeadCC(emMessage.getText().getFromUserInfo().getAvatar(), helper.getView(com.xscm.moduleutil.R.id.avatar));
helper.setText(com.xscm.moduleutil.R.id.tv_name, emMessage.getText().getFromUserInfo().getNickname());
helper.setTextColor(com.xscm.moduleutil.R.id.tv_name, emMessage.getText().getFromUserInfo().getNickname_color() != null && !emMessage.getText().getFromUserInfo().getNickname_color().isEmpty() ? Color.parseColor(emMessage.getText().getFromUserInfo().getNickname_color()) : Color.parseColor("#CCA882"));
if (emMessage.getText().getText() != null) {
helper.setText(com.xscm.moduleutil.R.id.tv_content, getSpannable(emMessage));
}
@@ -268,7 +268,7 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter<EMMessageInfo, Ba
} else {
helper.getView(com.xscm.moduleutil.R.id.bubble).setBackgroundResource(com.xscm.moduleutil.R.drawable.ease_row_pubilc_user_bg);
}
if (emMessage.getText().getEmoji() != null) {
if (emMessage.getText().getEmoji() != null && emMessage.getText().getEmoji().getAnimate_image() != null) {
// 为每个加载任务设置唯一标识
@@ -284,7 +284,7 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter<EMMessageInfo, Ba
// if (Objects.equals(emMessage.getText().getEmoji().getAnimate_image(), "") ||
// emMessage.getText().getEmoji().getAnimate_image().isEmpty()) {
if (!animateImage.isEmpty()){
if (!animateImage.isEmpty()) {
// 检查视图是否仍属于当前数据项
if (uniqueId.equals(emojiImageView.getTag())) {
ImageUtils.loadHeadCC(emMessage.getText().getEmoji().getImage(), emojiImageView);
@@ -323,7 +323,7 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter<EMMessageInfo, Ba
}
})
.into(emojiImageView);
}else {
} else {
Glide.with(mContext)
.load(emMessage.getText().getEmoji().getImage())
.into(emojiImageView);

1
MainModule/src/main/res/layout/activity_main.xml
View File

@@ -246,7 +246,6 @@
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_100"
android:clickable="true"
android:focusable="true"
android:scaleType="fitCenter"

263
MainModule/src/main/res/layout/activity_noble_details.xml
View File

@@ -1,135 +1,128 @@
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/main"
tools:context=".activity.NobleDetailsActivity">
<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"
android:id="@+id/main"
tools:context=".activity.NobleDetailsActivity">
<data>
</data>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/noble_details_bj"
>
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/noble_details_bj">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/top_bar"
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="@dimen/dp_40"
app:layout_constraintTop_toTopOf="parent">
android:id="@+id/top_bar"
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="@dimen/dp_40"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/iv_back"
android:layout_width="0dp"
android:layout_height="0dp"
android:contentDescription="@null"
android:scaleType="centerInside"
android:src="@mipmap/ic_topbar_back_dark"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
/>
android:id="@+id/iv_back"
android:layout_width="0dp"
android:layout_height="0dp"
android:contentDescription="@null"
android:scaleType="centerInside"
android:src="@mipmap/ic_topbar_back_dark"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/icon_noble_title"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
/>
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/icon_noble_title"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_intent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:src="@mipmap/icon_noble_gz"
android:layout_marginEnd="@dimen/dp_16"
/>
android:id="@+id/iv_intent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_16"
android:src="@mipmap/icon_noble_gz"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/tv_noble_lv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_44"
tools:text="骑士"
app:layout_constraintTop_toBottomOf="@+id/top_bar"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="@dimen/dp_8"
android:textSize="@dimen/dp_34"/>
android:id="@+id/tv_noble_lv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_44"
android:layout_marginTop="@dimen/dp_8"
android:textSize="@dimen/dp_34"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/top_bar"
tools:text="骑士" />
<com.zhpan.bannerview.BannerViewPager
android:id="@+id/banner"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_200"
app:layout_constraintTop_toBottomOf="@id/tv_noble_lv"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginTop="@dimen/dp_8"
/>
android:id="@+id/banner"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_200"
android:layout_marginTop="@dimen/dp_8"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_noble_lv" />
<ImageView
android:id="@+id/im_noble_tq"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/banner"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:src="@mipmap/noble_details_tq"
android:scaleType="fitXY"
/>
android:id="@+id/im_noble_tq"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
android:src="@mipmap/noble_details_tq"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/banner" />
<TextView
android:id="@+id/tv_tq"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/sp_16"
tools:text="专属特权"
android:textColor="#FFEDBD"
app:layout_constraintStart_toStartOf="@+id/im_noble_tq"
app:layout_constraintEnd_toEndOf="@+id/im_noble_tq"
app:layout_constraintTop_toTopOf="@+id/im_noble_tq"
app:layout_constraintBottom_toBottomOf="@+id/im_noble_tq"/>
android:id="@+id/tv_tq"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFEDBD"
android:textSize="@dimen/sp_16"
app:layout_constraintBottom_toBottomOf="@+id/im_noble_tq"
app:layout_constraintEnd_toEndOf="@+id/im_noble_tq"
app:layout_constraintStart_toStartOf="@+id/im_noble_tq"
app:layout_constraintTop_toTopOf="@+id/im_noble_tq"
tools:text="专属特权" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintTop_toBottomOf="@+id/tv_tq"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="@dimen/dp_8"
android:paddingTop="@dimen/dp_8"
app:layout_constraintBottom_toTopOf="@+id/im_kt">
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="@dimen/dp_8"
android:paddingTop="@dimen/dp_8"
app:layout_constraintBottom_toTopOf="@+id/im_kt"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_tq">
<com.xscm.moduleutil.widget.MyGridView
android:id="@+id/gridView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:listitem="@layout/item_noble_tq"
android:horizontalSpacing="8dp"
android:verticalSpacing="8dp"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:paddingBottom="@dimen/dp_8"
android:clipToPadding="false"
android:numColumns="3"/>
android:id="@+id/gridView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:numColumns="3"
android:horizontalSpacing="@dimen/dp_8"
android:paddingStart="@dimen/dp_14"
android:paddingEnd="@dimen/dp_15"
android:paddingBottom="@dimen/dp_8"
android:verticalSpacing="4.5dp"
tools:listitem="@layout/item_noble_tq" />
</ScrollView>
@@ -155,49 +148,47 @@
<!-- />-->
<ImageView
android:id="@+id/im_kt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:src="@mipmap/noble_kt"
android:scaleType="fitXY"
app:layout_constraintEnd_toEndOf="parent"
/>
android:id="@+id/im_kt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
android:src="@mipmap/noble_kt"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/tv_lv_tis"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/sp_16"
tools:text="骑士开通"
android:textColor="#F7EAC9"
android:layout_marginStart="@dimen/dp_16"
app:layout_constraintStart_toStartOf="@+id/im_kt"
app:layout_constraintTop_toTopOf="@+id/im_kt"
app:layout_constraintBottom_toBottomOf="@+id/im_kt"/>
android:id="@+id/tv_lv_tis"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
android:textColor="#F7EAC9"
android:textSize="@dimen/sp_16"
app:layout_constraintBottom_toBottomOf="@+id/im_kt"
app:layout_constraintStart_toStartOf="@+id/im_kt"
app:layout_constraintTop_toTopOf="@+id/im_kt"
tools:text="骑士开通" />
<TextView
android:id="@+id/tv_noble_mob"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/sp_16"
tools:text="￥30/月"
android:textColor="#F7EAC9"
app:layout_constraintStart_toEndOf="@+id/tv_lv_tis"
app:layout_constraintTop_toTopOf="@+id/tv_lv_tis"
app:layout_constraintBottom_toBottomOf="@+id/tv_lv_tis"/>
android:id="@+id/tv_noble_mob"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#F7EAC9"
android:textSize="@dimen/sp_16"
app:layout_constraintBottom_toBottomOf="@+id/tv_lv_tis"
app:layout_constraintStart_toEndOf="@+id/tv_lv_tis"
app:layout_constraintTop_toTopOf="@+id/tv_lv_tis"
tools:text="￥30/月" />
<ImageView
android:id="@+id/im_ljkt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/noble_ljkt"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/im_kt"
app:layout_constraintBottom_toBottomOf="@+id/im_kt"
android:layout_marginEnd="@dimen/dp_16"
/>
android:id="@+id/im_ljkt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_16"
android:src="@mipmap/noble_ljkt"
app:layout_constraintBottom_toBottomOf="@+id/im_kt"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/im_kt" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

3
MainModule/src/main/res/layout/fragment_vocal_range.xml
View File

@@ -83,8 +83,7 @@
android:layout_marginLeft="@dimen/dp_5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:riv_oval="true"
/>
app:riv_oval="true"/>
<TextView
android:id="@+id/tv_nick_name"

2
MainModule/src/main/res/layout/item_noble_tq.xml
View File

@@ -5,7 +5,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:background="@drawable/bg_r4_2a2925">
<com.xscm.moduleutil.widget.CircularImage
android:id="@+id/ci_image"
android:layout_width="@dimen/dp_44"