diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/CirleListAdapter.java b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/CirleListAdapter.java index 77ce1f28..22fb7efb 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/CirleListAdapter.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/CirleListAdapter.java @@ -94,8 +94,6 @@ public class CirleListAdapter extends BaseQuickAdapter 0) { - roomAdapter = new GiftRoomAdapter(getActivity(), data, 0, "0"); + roomAdapter = new GiftRoomAdapter(CommonAppContext.getInstance(), data, 0, "0"); mBinding.rvGift.setAdapter(roomAdapter); } } diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java index 2183d6c5..fad4b298 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java @@ -17,6 +17,7 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.Build; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; @@ -178,11 +179,7 @@ public class ImageUtils { Logger.e("Resource ID is 0 or invalid"); } } - - - - - public static void loadHeadCC(String path, ImageView mImageView) { + public static void loadSetErrorImg(String path, ImageView mImageView,int errorRes) { if (mImageView == null) { return; } @@ -194,10 +191,63 @@ public class ImageUtils { return; } } - Glide.with(mImageView).load(path).error(R.mipmap.default_avatar).placeholder(R.mipmap.default_avatar).centerCrop().diskCacheStrategy(DiskCacheStrategy.ALL).into(mImageView); + Glide.with(mImageView).load(path).error(errorRes).placeholder(errorRes).centerCrop().diskCacheStrategy(DiskCacheStrategy.ALL).into(mImageView); } + + + + public static void loadHeadCC(String path, ImageView mImageView) { + if (mImageView == null) { + return; + } + Context context = mImageView.getContext(); + if (context instanceof android.app.Activity) { + android.app.Activity activity = (android.app.Activity) context; + if (activity.isFinishing() || (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && activity.isDestroyed())) { + return; + } + } + Glide.with(mImageView).load(path).error(R.mipmap.default_avatar).placeholder(R.mipmap.default_avatar).centerCrop().diskCacheStrategy(DiskCacheStrategy.ALL).into(mImageView); + } + + public static void loadHeadCC(String path, ImageView mImageView, LinearLayout.LayoutParams params) { + if (mImageView == null) { + return; + } + Context context = mImageView.getContext(); + if (context instanceof android.app.Activity) { + android.app.Activity activity = (android.app.Activity) context; + if (activity.isFinishing() || (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && activity.isDestroyed())) { + return; + } + } + Glide.with(mImageView).asBitmap().load(path).error(R.mipmap.default_avatar).placeholder(R.mipmap.default_avatar) + .diskCacheStrategy(DiskCacheStrategy.ALL) + // 添加加载监听 + .listener(new RequestListener() { + @Override + public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) { + // 加载失败（显示默认图），可处理异常 + Log.e("Glide", "图片加载失败", e); + return false; // 返回 false，Glide 会继续执行默认的错误处理（显示 error 图） + } + + @Override + public boolean onResourceReady(Bitmap resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) { + // 加载成功！resource 就是最终的 Bitmap 对象 + int imageWidth = resource.getWidth(); // 图片原始宽度 + int imageHeight = resource.getHeight(); // 图片原始高度 + params.width = (int)(imageWidth * 1.3); + // 这里可以使用宽高（如打印、适配布局等） + Log.d("GlideImageSize", "宽度：" + imageWidth + "，高度：" + imageHeight); + return false; // 返回 false，Glide 会继续执行默认的图片设置（显示到 mImageView） + } + }) + .into(mImageView); + } + public static void loadCompressImg(String path, ImageView mImageView, int width, int height) { Glide.with(mImageView) .load(path) diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/plaza/activity/DynamicListActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/plaza/activity/DynamicListActivity.java index a939f0d4..d865410d 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/plaza/activity/DynamicListActivity.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/plaza/activity/DynamicListActivity.java @@ -142,15 +142,6 @@ public class DynamicListActivity extends BaseMvpActivity list) { if (list == null || list.isEmpty()) return; -// if (page == 1){ -// circleList.clear(); -// } -// -// List oldList = new ArrayList<>(cirleListAdapter.getData()); -// circleList.addAll(list); -// -// DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(new CircleListDiffCallback(oldList, circleList), false); -// cirleListAdapter.setNewDiffData(diffResult,circleList); circleList.addAll(list); cirleListAdapter.setNewData(circleList); } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt index 65e1e1bc..22ba8d79 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt @@ -179,7 +179,6 @@ import java.nio.charset.StandardCharsets import java.util.Arrays import java.util.Date import java.util.stream.Collectors -import kotlin.math.E @Route(path = ARouteConstants.ROOM_DETAILS) class RoomActivity : BaseMvpActivity(), @@ -1601,11 +1600,11 @@ class RoomActivity : BaseMvpActivity(), private fun handleMsgType1013(messageEvent: RoomMessageEvent, text: T?) { if (text == null || mRoomUserBean == null) return - val userId2 = SpUtil.getUserId() + val userId = SpUtil.getUserId() - if (text.action == 1 && mRoomUserBean!!.user_id == userId2 && mRoomUserBean!!.pit_number == 9) { + if (text.action == 1 && mRoomUserBean!!.user_id == userId && mRoomUserBean!!.pit_number == 9) { queren(text.fromUserInfo.nickname) - } else if (text.action == 4 && text.fromUserInfo.user_id == userId2) { + } else if (text.action == 4 && text.fromUserInfo.user_id == userId) { queren1(text.fromUserInfo.nickname) } else { roomFragment?.handleRoomMessage(messageEvent) @@ -1681,35 +1680,41 @@ class RoomActivity : BaseMvpActivity(), switchMic(2) } - val typeId = mRoomInfoResp!!.room_info.type_id - if ("2" == typeId) { - if ("9" == pitNumber) { - mRoomInfoResp!!.room_info.pit_list[pitNumber.toInt() - 1] = - getPitBean(messageEvent, 1) - if (mRoomInfoResp!!.user_info != null) { - mRoomInfoResp!!.user_info.pit_number = pitNumber.toInt() + val typeId = RoomType.fromTypeId(mRoomInfoResp?.room_info?.type_id) + + when (typeId) { + RoomType.AUCTION -> { + if ("9" == pitNumber) { + mRoomInfoResp!!.room_info.pit_list[0] = getPitBean(messageEvent,1) + if (mRoomInfoResp!!.user_info != null) { + mRoomInfoResp!!.user_info.pit_number = pitNumber.toInt() + } } - } - roomFragment!!.upRoomInfoData(mRoomInfoResp) - roomFragment!!.handleRoomMessage(messageEvent) - } else if ("3" == typeId || "4" == typeId || "1" == typeId || "8" == typeId) { - val labelId = mRoomInfoResp!!.room_info.label_id - if ("2" == labelId) { - roomFragment!!.handleRoomMessage(messageEvent) - } else if ("1" == labelId) { - mRoomInfoResp!!.room_info.pit_list[pitNumber.toInt() - 1] = - getPitBean(messageEvent, 1) roomFragment!!.upRoomInfoData(mRoomInfoResp) roomFragment!!.handleRoomMessage(messageEvent) } - } else if ("7" == typeId) { - mBinding!!.rlMore.visibility = View.GONE - mBinding!!.rlMisc.visibility = View.GONE + RoomType.DATING -> { + val labelId = mRoomInfoResp!!.room_info.label_id + if ("2" == labelId) { + roomFragment!!.handleRoomMessage(messageEvent) + } else if ("1" == labelId) { + mRoomInfoResp!!.room_info.pit_list[pitNumber.toInt() - 1] = + getPitBean(messageEvent, 1) + roomFragment!!.upRoomInfoData(mRoomInfoResp) + roomFragment!!.handleRoomMessage(messageEvent) + } + } + RoomType.MUTUAL_ENTERTAINMENT -> { + mBinding!!.rlMore.visibility = View.GONE + mBinding!!.rlMisc.visibility = View.GONE + + roomFragment!!.handleRoomMessage(messageEvent) + } + else ->{ + roomFragment!!.updateSeatViewExchangedWithPitArray(mRoomInfoResp) + } + } - roomFragment!!.handleRoomMessage(messageEvent) - } else { - roomFragment!!.updateSeatViewExchangedWithPitArray(mRoomInfoResp) - } } private fun handleMsgType1004(messageEvent: RoomMessageEvent, text: T?) { diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java index 0b71fb2b..af729537 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java @@ -106,20 +106,22 @@ public class RoomFragment extends BaseMvpFragment { -// if (view.getId() == R.id.task_type){ -// TextView tv = (TextView) view; -// if (tv.getText().toString().equals("领取金币")){ -// GiftBoxBean.TaskDataBean taskDataBean = (GiftBoxBean.TaskDataBean) adapter.getItem(position); -// MvpPre.dailyTasksOpenBox(taskDataBean.getDaily_tasks().get(position).getTask_id()+""); -// } -// } -// }); - } @Override diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/RoomOnlineAdapter.java b/MainModule/src/main/java/com/xscm/modulemain/adapter/RoomOnlineAdapter.java index 114089d4..34a7cecb 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/adapter/RoomOnlineAdapter.java +++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/RoomOnlineAdapter.java @@ -98,15 +98,16 @@ public class RoomOnlineAdapter extends BaseMultiItemQuickAdapter + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + tools:context=".activity.RoomActivity"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:animateLayoutChanges="true" + android:background="@color/transparent" + android:clipChildren="false" + android:clipToPadding="false" + android:keepScreenOn="true"> + android:id="@+id/cl_xsb" + android:layout_width="@dimen/dp_72" + android:layout_height="@dimen/dp_30" + android:layout_marginTop="@dimen/dp_60" + android:layout_marginEnd="@dimen/dp_10" + android:layout_marginBottom="@dimen/dp_100" + android:background="@mipmap/room_xsb" + android:elevation="4dp" + android:gravity="right" + android:visibility="invisible" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:visibility="visible"> + android:id="@+id/tv_xlh" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right|center" + android:gravity="center|right" + android:paddingEnd="@dimen/dp_4" + android:text="小时榜" + android:textColor="@color/white" + android:textSize="13sp" /> + android:id="@+id/drv_red" + android:layout_width="@dimen/dp_65" + android:layout_height="@dimen/dp_65" + android:layout_marginTop="@dimen/dp_160" + android:elevation="4dp" + android:gravity="center" + android:visibility="invisible" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:visibility="visible"> - + android:id="@+id/red_bj" + android:layout_width="@dimen/dp_58" + android:layout_height="@dimen/dp_58" + android:layout_gravity="center" + android:scaleType="fitCenter" + android:src="@mipmap/red_bj" /> + + android:id="@+id/red_num" + android:layout_width="wrap_content" + android:layout_height="@dimen/dp_18" + android:layout_gravity="top|end" + android:layout_marginStart="-20dp" + android:layout_marginTop="@dimen/dp_5" + android:textColor="#FFFEB2" + android:textSize="14sp" + android:visibility="invisible" + tools:text="x0" + tools:visibility="visible" /> + android:id="@+id/cl_day_task" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/dp_10" + android:elevation="4dp" + android:gravity="right" + android:visibility="invisible" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:visibility="visible"> + android:id="@+id/im_day_task" + android:layout_width="@dimen/dp_80" + android:layout_height="@dimen/dp_60" + android:scaleType="fitCenter" + android:src="@mipmap/day_task" /> + android:id="@+id/iv_bg" + android:layout_width="0dp" + android:layout_height="0dp" + android:scaleType="centerCrop" + android:src="@mipmap/room_bj" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + android:id="@+id/iv_bg_mask" + android:layout_width="0dp" + android:layout_height="0dp" + android:background="@color/color_40000000" + android:scaleType="centerCrop" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + android:id="@+id/room_top" + layout="@layout/room_top" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_35" + android:clipChildren="false" + android:clipToPadding="false" + android:elevation="2dp" + app:layout_constraintTop_toTopOf="parent" /> + + + app:layout_constraintTop_toTopOf="parent" /> - - + android:id="@+id/ease_container" + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_marginTop="@dimen/dp_12" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/vp_room_pager"> + android:id="@+id/svga_ride" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:minHeight="@dimen/dp_80" /> + android:id="@+id/input_menu1" + android:layout_width="0dp" + android:layout_height="wrap_content" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> + android:id="@+id/ll_bottom" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/dp_15" + android:animateLayoutChanges="true" + android:gravity="center_vertical" + android:orientation="horizontal" + android:paddingLeft="@dimen/dp_16" + android:paddingRight="@dimen/dp_16" + app:layout_constraintBottom_toTopOf="@+id/input_menu1" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent"> + android:layout_width="0dp" + android:layout_height="@dimen/dp_36" + android:layout_weight="1.4" + android:background="@drawable/room_bottom_bg" + android:gravity="center_vertical" + android:orientation="horizontal" + android:paddingLeft="@dimen/dp_5" + android:paddingRight="@dimen/dp_5"> + android:id="@+id/iv_emoji" + android:layout_width="@dimen/dp_24" + android:layout_height="@dimen/dp_24" + android:layout_marginLeft="@dimen/dp_5" + android:src="@mipmap/xiaox_bq" /> + android:id="@+id/iv_chat" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/dp_10" + android:layout_marginRight="@dimen/dp_10" + android:text="说点什么" + android:textColor="#80ffffff" + android:textSize="@dimen/sp_13" /> + android:layout_width="0dp" + android:layout_height="1dp" + android:layout_weight="0.2" /> + android:id="@+id/rl_voive" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/dp_5" + android:layout_weight="0.3"> + android:id="@+id/im_voive" + android:layout_width="@dimen/dp_24" + android:layout_height="@dimen/dp_24" + android:layout_centerInParent="true" + android:src="@mipmap/room_voice_kg" /> + android:id="@+id/rl_mic" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/dp_5" + android:layout_weight="0.3" + android:gravity="center_vertical"> + android:id="@+id/iv_mic" + android:layout_width="@dimen/dp_24" + android:layout_height="@dimen/dp_24" + android:layout_centerInParent="true" + android:src="@mipmap/room_microphone_off" + android:visibility="visible" + tools:visibility="visible" /> + android:id="@+id/rl_message" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/dp_5" + android:layout_weight="0.3"> + android:id="@+id/iv_message" + android:layout_width="@dimen/dp_24" + android:layout_height="@dimen/dp_24" + android:layout_centerInParent="true" + android:src="@mipmap/room_message" + android:visibility="visible" /> @@ -301,377 +300,376 @@ + android:id="@+id/iv_message_dot" + android:layout_width="@dimen/dp_14" + android:layout_height="@dimen/dp_14" + android:layout_alignParentEnd="true" + android:background="@drawable/ease_bg_msg_count" + android:gravity="center" + android:paddingLeft="@dimen/dp_5" + android:paddingTop="1.5dp" + android:paddingRight="@dimen/dp_5" + android:paddingBottom="2dp" + android:textColor="@color/white" + android:textSize="@dimen/sp_8" + android:visibility="gone" + tools:text="99+" + tools:visibility="visible" /> + android:id="@+id/rl_more" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/dp_5" + android:layout_weight="0.3"> + android:id="@+id/iv_more" + android:layout_width="@dimen/dp_24" + android:layout_height="@dimen/dp_24" + android:layout_centerInParent="true" + android:src="@mipmap/room_pk" /> + android:id="@+id/rl_misc" + android:layout_width="0dp" + android:layout_height="20dp" + android:layout_marginEnd="@dimen/dp_5" + android:layout_weight="0.3"> + android:id="@+id/iv_misc" + android:layout_width="@dimen/dp_24" + android:layout_height="@dimen/dp_24" + android:layout_centerInParent="true" + android:src="@mipmap/room_mis" /> + android:id="@+id/rl_gift" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/dp_5" + android:layout_weight="0.3"> + android:id="@+id/iv_gift" + android:layout_width="@dimen/dp_24" + android:layout_height="@dimen/dp_24" + android:layout_centerInParent="true" + android:src="@mipmap/room_gift" /> + android:id="@+id/rl_sett" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="0.3"> + android:id="@+id/iv_sett" + android:layout_width="@dimen/dp_24" + android:layout_height="@dimen/dp_24" + android:layout_centerInParent="true" + android:src="@mipmap/room_sett" /> + android:id="@+id/ll_input" + android:layout_width="0dp" + android:layout_height="0dp" + android:orientation="horizontal" + android:visibility="gone" + app:layout_constraintBottom_toTopOf="@id/ll_bottom" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + + + - - - - + app:layout_constraintTop_toTopOf="parent" /> + android:id="@+id/gift_show_progress" + android:layout_width="60dp" + android:layout_height="60dp" + app:backColor="#FF9800" + app:backWidth="3dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:progColor="#888888" + app:progWidth="3dp" + app:progress="0" /> + android:id="@+id/cl_first_charge" + android:layout_width="@dimen/dp_98" + android:layout_height="@dimen/dp_43" + android:layout_marginBottom="@dimen/dp_14" + android:visibility="gone" + app:layout_constraintBottom_toTopOf="@+id/iv_sound_effects" + app:layout_constraintEnd_toEndOf="parent" + tools:visibility="visible"> + android:id="@+id/iv_first_charge" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:scaleType="centerInside" + android:src="@mipmap/paimai" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + android:id="@+id/tv_first_charge" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/dp_34" + android:gravity="center" + android:text="排麦模式" + android:textColor="#FFFFFF" + android:textSize="12sp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/iv_first_charge" + app:layout_constraintTop_toTopOf="parent" /> + android:id="@+id/tv_first" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/dp_15" + android:textColor="#FFFFFF" + android:textSize="12sp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tv_first_charge" + tools:text="0人排队" /> + android:id="@+id/iv_sound_effects" + android:layout_width="@dimen/dp_56" + android:layout_height="@dimen/dp_27" + android:layout_marginEnd="@dimen/dp_16" + android:layout_marginBottom="@dimen/dp_14" + android:src="@mipmap/room_sound_effects" + android:visibility="gone" + app:layout_constraintBottom_toTopOf="@+id/iv_wheat_feeding" + app:layout_constraintEnd_toEndOf="parent" + tools:visibility="visible" /> + android:id="@+id/iv_wheat_feeding" + android:layout_width="@dimen/dp_56" + android:layout_height="@dimen/dp_27" + android:layout_marginEnd="@dimen/dp_16" + android:layout_marginBottom="@dimen/dp_100" + android:src="@mipmap/room_wheat_feeding" + android:translationZ="@dimen/dp_2" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + tools:visibility="visible" /> + android:id="@+id/xlh_rk" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/dp_10" + android:layout_marginBottom="@dimen/dp_100" + android:background="@color/transparent" + android:gravity="center_vertical|center" + android:orientation="vertical" + android:visibility="invisible" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:visibility="visible"> + android:id="@+id/xlh_im" + android:layout_width="@dimen/dp_80" + android:layout_height="@dimen/dp_80" + android:layout_gravity="center_vertical" + android:src="@mipmap/xlh_rk_bj" + app:riv_oval="true" /> + android:id="@+id/tv_djs" + android:layout_width="wrap_content" + android:layout_height="@dimen/dp_18" + android:layout_gravity="center_vertical" + android:textColor="#FFEBBD" + android:textSize="@dimen/sp_12" + android:visibility="visible" + tools:text="倒计时：12:12" /> - + > + android:layout_width="wrap_content" + android:layout_height="@dimen/dp_65" + android:layout_gravity="center" + android:gravity="center" + android:orientation="horizontal"> + android:id="@+id/cl" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="-5dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@+id/im_hq"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:scaleType="fitXY" + android:src="@mipmap/headline_b" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + android:id="@+id/head_avate" + android:layout_width="@dimen/dp_28" + android:layout_height="@dimen/dp_28" + android:layout_marginStart="@dimen/dp_26" + android:src="@mipmap/default_avatar" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:riv_oval="true" /> + android:id="@+id/headName" + android:layout_width="wrap_content" + android:layout_height="@dimen/dp_18" + android:layout_marginStart="@dimen/dp_4" + android:textColor="#FFFF0B" + android:textSize="@dimen/sp_12" + android:textStyle="bold" + app:layout_constraintStart_toEndOf="@+id/head_avate" + app:layout_constraintTop_toTopOf="parent" + tools:text="名称" /> + android:id="@+id/head_cone" + android:layout_width="wrap_content" + android:layout_height="@dimen/dp_18" + android:layout_marginStart="@dimen/dp_4" + android:gravity="center" + android:textColor="@color/color_FFFFF0F0" + android:textSize="@dimen/sp_12" + android:textStyle="bold" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@+id/head_avate" + app:layout_constraintTop_toBottomOf="@+id/headName" + tools:text="内容" /> + android:id="@+id/iv_quan_qiang" + android:layout_width="@dimen/dp_22" + android:layout_height="@dimen/dp_22" + android:src="@mipmap/tt_q" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/im_yc" + app:layout_constraintTop_toTopOf="parent" /> + android:id="@+id/iv_quan_c" + android:layout_width="@dimen/dp_22" + android:layout_height="@dimen/dp_22" + android:layout_marginEnd="@dimen/dp_8" + android:src="@mipmap/tt_c" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/iv_quan_qiang" + app:layout_constraintTop_toTopOf="parent" /> + android:id="@+id/im_yc" + android:layout_width="@dimen/dp_22" + android:layout_height="@dimen/dp_22" + android:src="@mipmap/tt_yc" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + android:id="@+id/im_hq" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:scaleType="fitXY" + android:src="@mipmap/heab_t" + android:visibility="visible" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> @@ -679,63 +677,62 @@ + android:id="@+id/fullscreen_container" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@android:color/black" + android:visibility="gone" /> + android:id="@+id/iv_exit_fullscreen" + android:layout_width="@dimen/dp_24" + android:layout_height="@dimen/dp_24" + android:layout_gravity="start|top" + android:layout_marginStart="@dimen/dp_16" + android:layout_marginTop="@dimen/dp_16" + android:layout_marginEnd="@dimen/dp_50" + android:layout_marginBottom="@dimen/dp_46" + android:src="@mipmap/quan" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" /> + android:id="@+id/flaoat" + android:layout_width="@dimen/dp_240" + android:layout_height="@dimen/dp_135" + android:translationZ="1000dp" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:visibility="visible"> + android:id="@+id/fl_screenshare" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + android:id="@+id/iv_quan" + android:layout_width="@dimen/dp_18" + android:layout_height="@dimen/dp_18" + android:layout_gravity="end|bottom" + android:layout_marginEnd="@dimen/dp_16" + android:layout_marginBottom="@dimen/dp_5" + android:src="@mipmap/quan" + android:translationZ="10dp" /> + android:id="@+id/gift_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:translationZ="9999dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@+id/room_top" /> \ No newline at end of file diff --git a/MainModule/src/main/res/layout/item_onlie_room.xml b/MainModule/src/main/res/layout/item_onlie_room.xml index 046d4ac9..3875d993 100644 --- a/MainModule/src/main/res/layout/item_onlie_room.xml +++ b/MainModule/src/main/res/layout/item_onlie_room.xml @@ -6,7 +6,7 @@ android:id="@+id/item" android:layout_height="@dimen/dp_50" android:layout_marginStart="@dimen/dp_16" - android:layout_marginTop="@dimen/dp_5" + android:layout_marginTop="@dimen/dp_10" android:layout_marginEnd="@dimen/dp_16">