1：修改房间设置，

2:修改个人主页头像框展示
3：修改礼物墙数据错乱不让展示的问题
4：修改房间设置里面的活动，变成趣味活动，当有参数的并且是打开的情况下，是展示的

BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftRoomAdapter.java

@@ -21,6 +21,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
+import com.blankj.utilcode.util.LogUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.hjq.toast.ToastUtils;
@@ -78,8 +79,6 @@ public class GiftRoomAdapter extends BaseQuickAdapter<RoonGiftModel, BaseViewHol
 
     @Override
     protected void convert(@NonNull BaseViewHolder helper, RoonGiftModel giftModel) {
-
-
         helper.getView(R.id.cl_gift).setOnClickListener(v -> {
 //            RoonGiftModel clickedModel = (RoonGiftModel) v.getTag();
             if (giftModel.getIs_lock() == 0) {
@@ -121,13 +120,7 @@ public class GiftRoomAdapter extends BaseQuickAdapter<RoonGiftModel, BaseViewHol
         ImageUtils.loadImageView(giftModel.getBase_image(), helper.getView(R.id.iv_gift_pic));
         //设置选中后的样式
 
-        if (giftModel.isChecked()) {//被选中
-            helper.getView(R.id.cl_iv_down_on).setBackgroundResource(R.mipmap.room_gift_bjx);
-            helper.setVisible(R.id.iv_down_on,false);
-        } else {
-            helper.getView(R.id.cl_iv_down_on).setBackgroundResource(0);
-            helper.setVisible(R.id.iv_down_on,false);
-        }
+
         if (giftModel.getGift_bag() == 10) {
             helper.setText(R.id.tv_gift_name,"");
             helper.getView(R.id.cl_gift).setBackgroundResource(R.mipmap.gift_tkzj);
@@ -140,6 +133,18 @@ public class GiftRoomAdapter extends BaseQuickAdapter<RoonGiftModel, BaseViewHol
             helper.setText(R.id.tv_gift_name,"");
             helper.getView(R.id.cl_gift).setBackgroundResource(R.mipmap.gift_sjzd);
             helper.getView(R.id.tv_gift_name).setBackgroundResource(R.mipmap.gift_name_skzd);
+        }else {
+            helper.setText(R.id.tv_gift_name,giftModel.getGift_name());
+            helper.getView(R.id.tv_gift_name).setBackgroundResource(0);
+            helper.getView(R.id.cl_gift).setBackgroundResource(R.mipmap.gift_bj);
+        }
+
+        if (giftModel.isChecked()) {//被选中
+            helper.getView(R.id.cl_iv_down_on).setBackgroundResource(R.mipmap.room_gift_bjx);
+            helper.setVisible(R.id.iv_down_on,false);
+        } else {
+            helper.getView(R.id.cl_iv_down_on).setBackgroundResource(0);
+            helper.setVisible(R.id.iv_down_on,false);
         }
     }
 

BaseModule/src/main/java/com/xscm/moduleutil/base/BaseFragmentDialog.kt

@@ -1,4 +1,4 @@
-package com.voice.lib_base.base.dialog
+package com.xscm.moduleutil.base
 
 import android.app.Dialog
 import android.content.DialogInterface

BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java

@@ -1311,7 +1311,7 @@ public class RetrofitClient {
                 if (response.code() == 200) {
                     BaseModel<String> baseModel = response.body();
                     if (baseModel.getCode() == 1) {
-                        ToastUtils.showLong(baseModel.getMsg());
+                        ToastUtils.showLong("热度卡使用成功");
                         observer.onNext(baseModel.getMsg());
                     } else if (baseModel.getCode() == 301) {
                         setCode301(baseModel.getMsg());

BaseModule/src/main/res/layout/me_view_decoration_head.xml

@@ -19,7 +19,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintWidth_percent="0.95"
+        app:layout_constraintWidth_percent="0.8"
         app:riv_oval="true" />
 
 
@@ -32,7 +32,8 @@
         android:scaleType="fitXY"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintWidth_percent="1"
+        app:layout_constraintWidth_percent="0.9"
+        app:layout_constraintHeight_percent="0.9"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"