d

.idea/misc.xml

@@ -120,7 +120,9 @@
         <entry key="room/src/main/res/layout/view_item_gift.xml" value="0.67" />
         <entry key="room/src/main/res/layout/view_svga.xml" value="0.3619791666666667" />
         <entry key="room/src/main/res/layout/view_waft.xml" value="0.39166666666666666" />
+        <entry key="tuikit/src/main/res/drawable/message_send_border.xml" value="0.204" />
         <entry key="tuikit/src/main/res/layout/activity_camera.xml" value="0.303125" />
+        <entry key="tuikit/src/main/res/layout/chat_input_layout.xml" value="0.3015625" />
         <entry key="tuikit/src/main/res/layout/chat_layout.xml" value="0.303125" />
         <entry key="tuikit/src/main/res/layout/conversation_adapter.xml" value="0.20833333333333334" />
         <entry key="tuikit/src/main/res/layout/conversation_layout.xml" value="0.3776041666666667" />

baseswago/src/main/java/com/swago/baseswago/HandleVm.kt

@@ -85,7 +85,7 @@ class HandleVm(application: Application) : BaseViewModel(application) {
                   Toast.makeText(AppContext.getContext(), AppContext.getContext().resources.getString(R.string.cancel_black_success), Toast.LENGTH_SHORT).show()
               }
             }
-            blackTypeLiveData.value = type
+            blackTypeLiveData.value = blackType
         }
     }
 

baseswago/src/main/java/com/swago/baseswago/inter/UserApi.kt

@@ -98,7 +98,7 @@ interface UserApi {
     //"black_type": 1, //用户类型 1拉黑主播 2拉黑用户
     //"page": 1 //第几页
     @FormUrlEncoded
-    @POST("v1/rtc/broadcast/black/user/list")
+    @POST("/v1/rtc/broadcast/black/user/list")
     suspend fun getRoomBlackList(@Field("black_type") black_type: Int):RoomBlackModel
 
 }

baseswago/src/main/java/com/swago/baseswago/model/ConfigModel.kt

@@ -5,5 +5,7 @@ package com.swago.baseswago.model
  *description:
  */
 data class ConfigModel(
-    val game_url : String
+    val game_url : String,
+    val app_phone:String,
+    val app_gmail:String
 )

baseswago/src/main/java/com/swago/baseswago/model/MomentModel.java

@@ -27,6 +27,7 @@ public class MomentModel implements Parcelable {
     private String user_rtc_token;
     private int is_follow;
     private int user_sex;
+    private int user_level;
 
     protected MomentModel(Parcel in) {
         user_account = in.readString();
@@ -41,6 +42,7 @@ public class MomentModel implements Parcelable {
         user_rtc_token = in.readString();
         is_follow = in.readInt();
         user_sex = in.readInt();
+        user_level = in.readInt();
     }
 
     @Override
@@ -57,6 +59,7 @@ public class MomentModel implements Parcelable {
         dest.writeString(user_rtc_token);
         dest.writeInt(is_follow);
         dest.writeInt(user_sex);
+        dest.writeInt(user_level);
     }
 
     @Override
@@ -171,4 +174,12 @@ public class MomentModel implements Parcelable {
     public void setUser_sex(int user_sex) {
         this.user_sex = user_sex;
     }
+
+    public int getUser_level() {
+        return user_level;
+    }
+
+    public void setUser_level(int user_level) {
+        this.user_level = user_level;
+    }
 }

baseswago/src/main/res/layout/dialog_benefit_bag.xml

@@ -61,7 +61,7 @@
                 <TextView
                     android:textSize="10dp"
                     android:textColor="#FFAE34"
-                    android:text="@string/diamond"
+                    android:text="@string/coin"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
 
@@ -97,7 +97,7 @@
                 <TextView
                     android:textSize="10dp"
                     android:textColor="#FFAE34"
-                    android:text="@string/diamond"
+                    android:text="@string/rank_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
 
@@ -134,7 +134,7 @@
                 <TextView
                     android:textSize="10dp"
                     android:textColor="#FFAE34"
-                    android:text="@string/diamond"
+                    android:text="@string/special_effects"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
 

baseswago/src/main/res/values-in/strings.xml

@@ -28,13 +28,13 @@
     <string name="my_level">Level saya</string>
     <string name="top_up_center">Pusat Top up</string>
     <string name="task_center">Pusat Tugas</string>
-    <string name="contact_service">Layanan Pelanggan\ngmail:Swagoliveservice@gmail.com\nWhatsApp：+86  18758880853</string>
+    <string name="contact_service">Layanan Pelanggan</string>
     <string name="sex">Jenis kelamin</string>
     <string name="age">Umur</string>
     <string name="constellation">Konstelasi</string>
     <string name="country">Negara</string>
     <string name="sign">Tanda tangan</string>
-    <string name="selecte_country">Pilih negaramu</string>
+    <string name="selecte_country">Pilih negara/daerah</string>
     <string name="rich_level">Level kekayaan</string>
     <string name="anchor_level">Level Host</string>
     <string name="get_exp">Dapatkan poin pengalaman</string>
@@ -71,10 +71,12 @@
     <string name="level">Lv.%s</string>
     <string name="report">Laporan</string>
     <string name="report_success">Melaporkan sukses</string>
-    <string name="report_one">Kontennya tidak nyaman atau menyinggung</string>
-    <string name="report_two">Pidato politik yang dicurigai</string>
-    <string name="report_three">Nickname nya ilegal</string>
-    <string name="report_four">Diduga menghina pengguna dan ucapan kekerasan</string>
+    <string name="report_one">Konten kasar atau sexsual</string>
+    <string name="report_two">Konten kekerasan atau ilegal</string>
+    <string name="report_three">Konten bahaya</string>
+    <string name="report_four">Avatar ilegal</string>
+    <string name="report_five">Tampilan  ilegal</string>
+    <string name="report_six">Sesuatu lain</string>
     <string name="tips">mengingatkan</string>
     <string name="consume_order">Pesanan\n%s\n tidak berhasil, silakan klik kirim ulang pesanan!</string>
     <string name="sure_consume">kirim ulang sekarang</string>
@@ -94,4 +96,23 @@
     <string name="big_gift_msg">%s memberikan %s kepada %s, yang sangat membanggakan!</string>
     <string name="balance">Saldo: </string>
     <string name="login_anthor_device">Akun Anda sudah masuk di perangkat lain</string>
+    <string name="lucky">Lucky</string>
+    <string name="live">Live</string>
+    <string name="win_num_prize">Win %s times coins</string>
+    <string name="kick_success">Berhasil usir</string>
+    <string name="kick_room">Mengusirkan dari room</string>
+    <string name="be_kick_out">Anda telah diusir dari live room ini</string>
+    <string name="mute_success">Berhasil mute</string>
+    <string name="cancel_mute_success">Berhasil batalkan mute</string>
+    <string name="forbid_speak">Mute</string>
+    <string name="cancel_forbid_speak">Membatalkan mute</string>
+    <string name="you_are_been_forbid">Anda telah dimute</string>
+    <string name="black">Block</string>
+    <string name="black_success">Berhasil blokir</string>
+    <string name="cancel_black_success">Berhasil batalkan blokir</string>
+    <string name="room_anchor_black_list">Daftar hitam host</string>
+    <string name="room_user_black_list">Daftar hitam pengguna</string>
+    <string name="delete">Menghapus</string>
+    <string name="rank_title">Gelar</string>
+    <string name="special_effects">Efek masuk</string>
 </resources>

baseswago/src/main/res/values-zh/strings.xml

@@ -28,13 +28,13 @@
     <string name="my_level">我的等级</string>
     <string name="top_up_center">充值中心</string>
     <string name="task_center">任务中心</string>
-    <string name="contact_service">联系客服\ngmail:Swagoliveservice@gmail.com\nWhatsApp：+86  18758880853</string>
+    <string name="contact_service">联系客服</string>
     <string name="sex">性别</string>
     <string name="age">年龄</string>
     <string name="constellation">星座</string>
     <string name="country">国家</string>
     <string name="sign">个性签名</string>
-    <string name="selecte_country">选择国家</string>
+    <string name="selecte_country">选择国家/地区</string>
     <string name="rich_level">财富等级</string>
     <string name="anchor_level">主播等级</string>
     <string name="get_exp">获取经验值</string>
@@ -71,10 +71,12 @@
     <string name="level">Lv.%s</string>
     <string name="report">举报</string>
     <string name="report_success">举报成功</string>
-    <string name="report_one">内容令人不适或者反感</string>
-    <string name="report_two">涉嫌政治言论</string>
-    <string name="report_three">非法用户昵称</string>
-    <string name="report_four">涉嫌辱骂用户和暴力言论</string>
+    <string name="report_one">粗俗或色情</string>
+    <string name="report_two">违法或暴力</string>
+    <string name="report_three">危及人身安全</string>
+    <string name="report_four">非法头像</string>
+    <string name="report_five">非法封面</string>
+    <string name="report_six">其他</string>
     <string name="tips">提示</string>
     <string name="consume_order">该笔订单\n%s\n未消费成功，请立即补单!</string>
     <string name="sure_consume">立即补单</string>
@@ -94,4 +96,23 @@
     <string name="big_gift_msg">%s赠送了一个%s给%s,真是豪气冲天!</string>
     <string name="balance">余额：</string>
     <string name="login_anthor_device">您的账号已在另一台设备上登录</string>
+    <string name="lucky">幸运</string>
+    <string name="live">开播</string>
+    <string name="win_num_prize">赢 %s 倍金币</string>
+    <string name="kick_success">踢出成功</string>
+    <string name="kick_room">踢出直播间</string>
+    <string name="be_kick_out">您已被踢出直播间</string>
+    <string name="mute_success">禁言成功</string>
+    <string name="cancel_mute_success">取消禁言成功</string>
+    <string name="forbid_speak">禁言</string>
+    <string name="cancel_forbid_speak">取消禁言</string>
+    <string name="you_are_been_forbid">您已被禁言</string>
+    <string name="black">拉黑</string>
+    <string name="black_success">拉黑成功</string>
+    <string name="cancel_black_success">取消拉黑成功</string>
+    <string name="room_anchor_black_list">直播间主播黑名单</string>
+    <string name="room_user_black_list">直播间用户黑名单</string>
+    <string name="delete">删除</string>
+    <string name="rank_title">头衔</string>
+    <string name="special_effects">入场特效</string>
 </resources>

baseswago/src/main/res/values/strings.xml

@@ -33,13 +33,13 @@
     <string name="my_level">My Level</string>
     <string name="top_up_center">Top up Center</string>
     <string name="task_center">Task Center</string>
-    <string name="contact_service">Customer Service\ngmail:Swagoliveservice@gmail.com\nWhatsApp：+86  18758880853</string>
+    <string name="contact_service">Customer Service</string>
     <string name="sex">Gender</string>
     <string name="age">Age</string>
     <string name="constellation">Constellation</string>
     <string name="country">Country</string>
     <string name="sign">Bio</string>
-    <string name="selecte_country">Choose your country</string>
+    <string name="selecte_country">Choose your country/area</string>
     <string name="rich_level">Rich level</string>
     <string name="anchor_level">Host level</string>
     <string name="get_exp">Get experience points</string>
@@ -103,19 +103,21 @@
     <string name="login_anthor_device">Your account is already logged in on another device</string>
     <string name="lucky">Lucky</string>
     <string name="live">Live</string>
-    <string name="win_num_prize">Win %s coins</string>
-    <string name="kick_success">踢出成功</string>
-    <string name="kick_room">踢出直播间</string>
-    <string name="be_kick_out">您已被踢出直播间</string>
-    <string name="mute_success">禁言成功</string>
-    <string name="cancel_mute_success">取消禁言成功</string>
-    <string name="forbid_speak">禁言</string>
-    <string name="cancel_forbid_speak">取消禁言</string>
-    <string name="you_are_been_forbid">您已被禁言</string>
-    <string name="black">拉黑</string>
-    <string name="black_success">拉黑成功</string>
-    <string name="cancel_black_success">取消拉黑成功</string>
-    <string name="room_anchor_black_list">直播间主播黑名单</string>
-    <string name="room_user_black_list">直播间用户黑名单</string>
-    <string name="delete">删除</string>
+    <string name="win_num_prize">Win %s times coins</string>
+    <string name="kick_success">Kicked out successfully</string>
+    <string name="kick_room">Kick out of the live room</string>
+    <string name="be_kick_out">You have been kicked out of the studio</string>
+    <string name="mute_success">Muted successfully</string>
+    <string name="cancel_mute_success">Unmuted successfully</string>
+    <string name="forbid_speak">Mute</string>
+    <string name="cancel_forbid_speak">Unmute</string>
+    <string name="you_are_been_forbid">You have been muted</string>
+    <string name="black">Block</string>
+    <string name="black_success">Successfully blocked</string>
+    <string name="cancel_black_success">Cancel block success</string>
+    <string name="room_anchor_black_list">Host blacklist</string>
+    <string name="room_user_black_list">User blacklist</string>
+    <string name="delete">Delete</string>
+    <string name="rank_title">Title</string>
+    <string name="special_effects">Admission effects</string>
 </resources>

home/src/main/java/com/swago/home/HomeActivity.kt

@@ -115,7 +115,11 @@ class HomeActivity : BaseXActivity<ActivityHomeBinding>(), IPayCallback {
         binding.viewPager.adapter = SwagoAdapter(listFragment, supportFragmentManager)
     }
 
-    override fun initLiveData() {}
+    override fun initLiveData() {
+        homeVm.appConfigLiveData.observe(this){
+            (listFragment[2] as MineFragment).setCustomServiceData(it)
+        }
+    }
 
     override fun onResume() {
         super.onResume()

home/src/main/java/com/swago/home/MineFragment.kt

@@ -9,6 +9,7 @@ import com.swago.baseswago.UserVm
 import com.swago.baseswago.constant.ARouteConstant
 import com.swago.baseswago.dialog.BenefitBagDialog
 import com.swago.baseswago.fragment.BaseXFragment
+import com.swago.baseswago.model.ConfigModel
 import com.swago.baseswago.util.AppContext
 import com.swago.baseswago.util.NoDoubleClickListener
 import com.swago.baseswago.util.SpUtil
@@ -123,6 +124,10 @@ class MineFragment : BaseXFragment<FragmentMineBinding>() {
         }
     }
 
+    fun setCustomServiceData(configModel:ConfigModel){
+        binding.tvGmail.text = "gmail:${configModel.app_gmail}"
+        binding.tvWhatsApp.text = configModel.app_phone
+    }
 
     override fun onResume() {
         super.onResume()

home/src/main/java/com/swago/home/innerhome/HomeVm.kt

@@ -4,6 +4,7 @@ import android.app.Application
 import androidx.lifecycle.MutableLiveData
 import com.swago.baseswago.http.SwagoException
 import com.swago.baseswago.inter.ApiManager
+import com.swago.baseswago.model.ConfigModel
 import com.swago.baseswago.model.MomentModel
 import com.swago.baseswago.model.home.BannerModel
 import com.swago.baseswago.util.BaseViewModel
@@ -66,12 +67,16 @@ class HomeVm(application: Application) : BaseViewModel(application) {
     }
 
 
+    val appConfigLiveData by lazy {
+        MutableLiveData<ConfigModel>()
+    }
     /**
      * 获取配置
      */
     fun getAppConfig(){
         requestData {
             val data = ApiManager.configApi.getAppConfig()
+            appConfigLiveData.value = data
         }
     }
 

home/src/main/java/com/swago/home/search/SearchActivity.kt

@@ -1,5 +1,7 @@
 package com.swago.home.search
 
+import android.graphics.Rect
+import android.view.View
 import androidx.activity.viewModels
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -11,6 +13,7 @@ import com.swago.baseswago.activity.BaseListActivity
 import com.swago.baseswago.cusview.SwagoRecyclerView
 import com.swago.baseswago.model.MomentModel
 import com.swago.baseswago.model.home.HomeModel
+import com.swago.baseswago.util.DpPxUtil
 import com.swago.baseswago.util.NoDoubleClickListener
 import com.swago.home.databinding.ActivitySearchBinding
 import com.swago.home.innerhome.HomeAdapter
@@ -24,7 +27,7 @@ class SearchActivity : BaseListActivity<ActivitySearchBinding, MomentModel>() {
     private val searchVm by viewModels<SearchVm>()
     private val userVm by viewModels<UserVm>()
 
-    private var searchThing = "swgo"
+    private var searchThing = "swago"
     private var position = -1
 
     override val smartRecyclerView: SwagoRecyclerView<MomentModel> by lazy {
@@ -43,6 +46,7 @@ class SearchActivity : BaseListActivity<ActivitySearchBinding, MomentModel>() {
 
     override fun initViewData() {
         setBackView(binding.toolbar.ivBack)
+        smartRecyclerView.recyclerView?.addItemDecoration(VerticalItemDecoration())
         binding.ivSearch.setOnClickListener(object:NoDoubleClickListener(){
             override fun onClick() {
                 val search = binding.etInput.text.toString()
@@ -87,4 +91,17 @@ class SearchActivity : BaseListActivity<ActivitySearchBinding, MomentModel>() {
         }
     }
 
+
+    inner class VerticalItemDecoration : RecyclerView.ItemDecoration() {
+        override fun getItemOffsets(
+            outRect: Rect,
+            view: View,
+            parent: RecyclerView,
+            state: RecyclerView.State
+        ) {
+            val margin = DpPxUtil.dip2px(20f)
+            outRect.set(0, margin, 0, 0)
+        }
+    }
+    
 }

home/src/main/java/com/swago/home/search/SearchAdapter.kt

@@ -4,6 +4,7 @@ import com.bumptech.glide.Glide
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.BaseViewHolder
 import com.google.android.material.imageview.ShapeableImageView
+import com.swago.baseswago.cusview.SwagoLevelView
 import com.swago.baseswago.model.MomentModel
 import com.swago.baseswago.model.home.HomeModel
 import com.swago.baseswago.util.AppContext
@@ -35,7 +36,8 @@ class SearchAdapter :
                     setImageResource(R.id.ivStatus, R.mipmap.follow)
                 }
                 addOnClickListener(R.id.ivStatus)
-//TODO                 setText(R.id.tvLevel)
+                val tvLevel = itemView.findViewById<SwagoLevelView>(R.id.tvLevel)
+                tvLevel.setUserLevel(item.user_level)
                 val ivAvatar = itemView.findViewById<CircleImageView>(R.id.ivAvatar)
                 Glide.with(itemView.context).load(item.user_head_img_url).centerCrop().into(ivAvatar)
             }

home/src/main/res/layout/fragment_mine.xml

@@ -324,10 +324,11 @@
 
 
     <TextView
+        android:id="@+id/tvCustomService"
         android:text="@string/contact_service"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:layout_marginBottom="30dp"
+        android:layout_marginBottom="60dp"
         android:gravity="center"
         app:layout_constraintBottom_toBottomOf="parent"
         android:textColor="#8F8F8F"
@@ -335,5 +336,29 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
+    <TextView
+        android:id="@+id/tvGmail"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:layout_marginBottom="30dp"
+        android:gravity="center"
+        app:layout_constraintTop_toBottomOf="@+id/tvCustomService"
+        android:textColor="#8F8F8F"
+        android:textSize="14dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:id="@+id/tvWhatsApp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:layout_marginBottom="30dp"
+        android:gravity="center"
+        app:layout_constraintTop_toBottomOf="@+id/tvGmail"
+        android:textColor="#8F8F8F"
+        android:textSize="14dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>

home/src/main/res/layout/item_search.xml

@@ -26,21 +26,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
-    <TextView
+    <com.swago.baseswago.cusview.SwagoLevelView
         android:id="@+id/tvLevel"
         app:layout_constraintStart_toEndOf="@+id/tvName"
         app:layout_constraintBottom_toBottomOf="@+id/tvName"
         android:layout_marginStart="5dp"
-        tools:text="Lv.3"
-        android:textSize="8dp"
-        android:textColor="#000000"
-        android:paddingStart="5dp"
-        android:paddingEnd="5dp"
-        android:paddingTop="1dp"
-        android:gravity="center"
-        android:textStyle="bold"
         app:layout_constraintTop_toTopOf="@+id/tvName"
-        android:background="@drawable/shape_9ffd88_6ef2df_5"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 

room/src/main/java/com/swago/room/base/BaseComFragment.kt

@@ -135,7 +135,9 @@ abstract class BaseComFragment<T : FragmentBaseComBinding> : BaseXFragment<T>(),
         msgVm.playSvgUrl = {
             //svg播放
             svgPlayerManager.addSvgUrl(it)
-            //飘条
+        }
+        //飘条
+        msgVm.waftFun = {
             waftManager.addNewMessage(it)
         }
         msgVm.showGiftDanDao = {
@@ -278,7 +280,7 @@ abstract class BaseComFragment<T : FragmentBaseComBinding> : BaseXFragment<T>(),
                 false
             } else {
                 val localGameVersionCode = SpUtil.readInt(gameId)
-                if (localGameVersionCode == 0 || (gameVersionCode.isEmpty() && localGameVersionCode < gameVersionCode.toInt())) {
+                if (localGameVersionCode == 0 || (gameVersionCode.isNotEmpty() && localGameVersionCode < gameVersionCode.toInt())) {
                     downLoadGamePackage(gameId, gamePackageUrl, gameVersionCode, gameName)
                     false
                 } else {

room/src/main/java/com/swago/room/game/GamePlayDialog.kt

@@ -11,6 +11,7 @@ import android.widget.FrameLayout
 import com.google.gson.Gson
 import com.swago.baseswago.baseroom.SwagoRoomManager
 import com.swago.baseswago.dialog.BaseXDFragment
+import com.swago.baseswago.dialog.PayDialog
 import com.swago.baseswago.model.live.game.GameInfoModel
 import com.swago.baseswago.util.DpPxUtil
 import com.swago.baseswago.util.SwagoInfo
@@ -131,7 +132,12 @@ class GamePlayDialog : BaseXDFragment<DialogGamePlayBinding>() {
 
         @JavascriptInterface
         fun recharge() {
+            PayDialog.newInstance().show(childFragmentManager,"PayDialog")
+        }
 
+        @JavascriptInterface
+        fun closeGame(){
+            dismissAllowingStateLoss()
         }
 
     }

room/src/main/java/com/swago/room/vm/MsgVm.kt

@@ -49,6 +49,11 @@ class MsgVm (application: Application) : AbsMsgVm(application){
      */
     var playSvgUrl:((data:IMGiftModel)->Unit)? = null
 
+    /**
+     * 礼物飘条
+     */
+    var waftFun:((data:IMGiftModel)->Unit)? = null
+
     /**
      * 礼物弹道展示
      */
@@ -93,19 +98,20 @@ class MsgVm (application: Application) : AbsMsgVm(application){
         }
         imGroupNewMsgListener.handleMsgType<CusNewMsgBean<IMGiftModel>>(svg_gift){
             SwagoRoomManager.iRoomInfo?.let { iRoomInfo ->
-                if (isReady&&iRoomInfo.getRoomId()== it.data?.roomId?:""){
+                if (isReady){
                     it.data?.let {
-                        if (it.giftType == 1||it.giftType == 2){
-                            playSvgUrl?.invoke(it)
-                        }
-                        if (it.giftType == 3){
-                            showGiftDanDao?.invoke(it)
+                        if (iRoomInfo.getRoomId()== it.roomId?:""){
+                            if (it.giftType == 1||it.giftType == 2){
+                                playSvgUrl?.invoke(it)
+                            }
+                            if (it.giftType == 3){
+                                showGiftDanDao?.invoke(it)
+                            }
+                            inComeChange?.invoke(it.incomeCount)
+                        }else{
+                            waftFun?.invoke(it)
                         }
-
-                        inComeChange?.invoke(it.incomeCount)
                     }
-
-
                 }
             }
         }

room/src/main/res/layout/item_chat.xml

@@ -15,7 +15,7 @@
         android:paddingBottom="4dp"
         android:textColor="#000"
         android:textSize="14dp"
-        android:gravity="center"
+        android:gravity="start|center"
         android:background="@drawable/shape_white_20"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"

room/src/main/res/layout/layout_user_header_view.xml

@@ -75,9 +75,11 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvUser"
+        app:layout_constraintStart_toEndOf="@+id/ivFollow"
         app:layout_constraintEnd_toStartOf="@+id/ivAudienceList"
         android:layout_marginEnd="5dp"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/cl"
+        app:layout_constraintBottom_toBottomOf="@+id/cl"
         android:maxWidth="200dp"
         android:layout_width="0dp"
         android:layout_height="30dp"/>

room/src/main/res/layout/layout_user_room.xml

@@ -24,7 +24,7 @@
         android:id="@+id/ivReport"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:layout_marginTop="100dp"
+        android:layout_marginTop="130dp"
         android:padding="5dp"
         android:layout_marginStart="10dp"
         android:src="@mipmap/icon_report"

tuikit/src/main/java/com/tencent/qcloud/tim/uikit/modules/chat/layout/input/InputLayoutUI.java

@@ -3,25 +3,25 @@ package com.tencent.qcloud.tim.uikit.modules.chat.layout.input;
 import android.Manifest;
 import android.app.AlertDialog;
 import android.content.Context;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.tencent.qcloud.tim.uikit.R;
-import com.tencent.qcloud.tim.uikit.base.TUIChatControllerListener;
 import com.tencent.qcloud.tim.uikit.base.IBaseAction;
+import com.tencent.qcloud.tim.uikit.base.TUIChatControllerListener;
 import com.tencent.qcloud.tim.uikit.base.TUIKitListenerManager;
 import com.tencent.qcloud.tim.uikit.modules.chat.base.BaseInputFragment;
 import com.tencent.qcloud.tim.uikit.modules.chat.base.ChatInfo;
-import com.tencent.qcloud.tim.uikit.modules.chat.interfaces.IInputLayout;
 import com.tencent.qcloud.tim.uikit.modules.chat.base.InputMoreActionUnit;
+import com.tencent.qcloud.tim.uikit.modules.chat.interfaces.IInputLayout;
 import com.tencent.qcloud.tim.uikit.utils.PermissionUtils;
 
 import java.util.ArrayList;
@@ -57,7 +57,7 @@ abstract class InputLayoutUI extends LinearLayout implements IInputLayout {
     /**
      * 消息发送按钮
      */
-    protected Button mSendTextButton;
+    protected TextView mSendTextButton;
 
     /**
      * 语音长按按钮

tuikit/src/main/res/layout/chat_input_layout.xml

@@ -66,14 +66,16 @@
             android:scaleType="fitXY"
             android:src="@drawable/action_more_selector" />
 
-        <Button
+        <TextView
             android:id="@+id/send_btn"
             android:layout_width="40dp"
             android:layout_height="30dp"
             android:background="@drawable/message_send_border"
             android:text="@string/send"
             android:textColor="#fff"
+            android:gravity="center"
             android:textSize="13sp"
+            android:textAllCaps="false"
             android:visibility="gone" />
 
     </LinearLayout>

user/src/main/java/com/swago/user/RoomBlackListActivity.kt

@@ -48,14 +48,14 @@ class RoomBlackListActivity : BaseListActivity<LayoutListBinding, RoomBlack>() {
         LinearLayoutManager(this)
     }
     override val loadData: (page: Int) -> Unit = {
-        userVm.getRoomBlackList(blackType,it + 1)
+        userVm.getRoomBlackList(blackType, it + 1)
     }
 
     override fun initViewData() {
         ARouter.getInstance().inject(this)
         setBackView(binding.toolbar.ivBack)
 
-        when(blackType){
+        when (blackType) {
             1 -> {
                 binding.toolbar.tvTitle.text =
                     AppContext.getContext().resources.getString(R.string.room_anchor_black_list)
@@ -67,10 +67,11 @@ class RoomBlackListActivity : BaseListActivity<LayoutListBinding, RoomBlack>() {
         }
         smartRecyclerView.recyclerView?.addItemDecoration(VerticalItemDecoration())
         adapter.setOnItemChildClickListener { _, _, position ->
-            if (adapter.data.size>position){
-               /* * black_type  用户类型 1拉黑主播 2拉黑用户
-                * type 类型(0取消拉黑1拉黑)*/
-                handleVm.blackUser(adapter.data[position].black_user_id,blackType,0)
+            if (adapter.data.size > position) {
+                /* * black_type  用户类型 1拉黑主播 2拉黑用户
+                 * type 类型(0取消拉黑1拉黑)*/
+                this.position = position
+                handleVm.blackUser(adapter.data[position].black_user_id, blackType, 0)
             }
         }
     }
@@ -81,7 +82,7 @@ class RoomBlackListActivity : BaseListActivity<LayoutListBinding, RoomBlack>() {
         }
 
         handleVm.blackTypeLiveData.observe(this) {
-            if (it == 0){
+            if (it == 0) {
                 adapter.data.removeAt(position)
                 adapter.notifyItemRemoved(position)
             }