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

fix bugs.

Browse Source
This commit is contained in:
骆召亮
2025-12-05 10:48:31 +08:00
parent fbc2a57593
commit 4136077e98
15 changed files with 96 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BaseModule/src/main/java/com/xscm/moduleutil/adapter/LikeUserAdapter.java
View File

@@ -13,7 +13,7 @@ import com.xscm.moduleutil.utils.ImageUtils;
*/
public class LikeUserAdapter<T> extends BaseQuickAdapter<T, BaseViewHolder> {
public LikeUserAdapter() {
super(R.layout.item_like_user);
super(R.layout.item_like_user_2);
}
@Override

1
BaseModule/src/main/java/com/xscm/moduleutil/utils/GsonUtils.java
View File

@@ -26,6 +26,7 @@ public class GsonUtils {
GSON = new GsonBuilder()
.serializeNulls() // 序列化 null 值
.registerTypeAdapterFactory(new BaseModelTypeAdapterFactory())
.registerTypeAdapter(String.class,new NullToEmptyStringAdapter())
.create();
}
return GSON;

21
BaseModule/src/main/java/com/xscm/moduleutil/utils/NullToEmptyStringAdapter.kt Normal file
View File

@@ -0,0 +1,21 @@
package com.xscm.moduleutil.utils
import com.google.gson.TypeAdapter
import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonToken
import com.google.gson.stream.JsonWriter
class NullToEmptyStringAdapter : TypeAdapter<String>() {
override fun write(out: JsonWriter, value: String?) {
out.value(value ?: "")
}
override fun read(`in`: JsonReader): String {
return if (`in`.peek() == JsonToken.NULL) {
`in`.nextNull()
"" // null → 空字符串
} else {
`in`.nextString() ?: ""
}
}
}

3
BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/CommentDialogFragment.java
View File

@@ -101,6 +101,9 @@ public class CommentDialogFragment extends BaseMvpDialogFragment<CommentPresente
@Override
public void getCommentList(List<CircleListBean.LikeList> likeLists) {
if (likeLists == null){
return;
}
mBinding.tvNum.setText("已有"+likeLists.size()+"人点赞");
likeListAdapter.setNewData(likeLists);
}

5
BaseModule/src/main/res/layout/item_comment.xml
View File

@@ -117,10 +117,11 @@
<!-- 子评论列表 -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_replies"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_9"
android:padding="@dimen/dp_12"
android:layout_marginStart="@dimen/dp_45"
android:padding="@dimen/dp_8"
android:background="@drawable/bg_r12_f9f9f9"
app:layout_constraintStart_toStartOf="@+id/tv_time"
app:layout_constraintTop_toBottomOf="@+id/tv_time" />

19
BaseModule/src/main/res/layout/item_like_user_2.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto">
<com.xscm.moduleutil.widget.GifAvatarOvalView
android:id="@+id/user_icon"
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_18"
android:src="@mipmap/default_avatar"
android:layout_marginStart="-5dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:riv_oval="true"
app:layout_constraintEnd_toEndOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>

12
BaseModule/src/main/res/layout/item_reply.xml
View File

@@ -9,8 +9,8 @@
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_12"
android:layout_marginTop="@dimen/dp_12"
android:textSize="@dimen/sp_12"
android:textColor="@color/black"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="回复" />
@@ -18,12 +18,12 @@
<TextView
android:id="@+id/tv_reply"
android:layout_width="0dp"
android:layout_marginTop="@dimen/dp_4"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_12"
app:layout_constraintStart_toEndOf="@+id/tv_name"
android:layout_marginHorizontal="@dimen/dp_8"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_name"
app:layout_constraintTop_toBottomOf="@+id/tv_name"
tools:text="回复" />
<TextView