MIDI/midi-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1：修改头像框出现了布局变更问题

Browse Source
This commit is contained in:
梁小江
2025-09-13 17:12:57 +08:00
parent 1d348784ea
commit 74b3e6c92d
8 changed files with 105 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/deploymentTargetSelector.xml generated
View File

@@ -4,10 +4,10 @@
<selectionStates>
<SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" />
<DropdownSelection timestamp="2025-09-09T08:46:46.893032600Z">
<DropdownSelection timestamp="2025-09-12T11:20:24.786143600Z">
<Target type="DEFAULT_BOOT">
<handle>
<DeviceId pluginId="PhysicalDevice" identifier="serial=34V0224723026458" />
<DeviceId pluginId="Default" identifier="serial=emulator-5554;connection=d14b13d7" />
</handle>
</Target>
</DropdownSelection>

21
moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialog.java
View File

@@ -114,8 +114,6 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
Dialog dialog = super.onCreateDialog(savedInstanceState);
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
dialog.setCancelable(true);
if (!EventBus.getDefault().isRegistered(this))
EventBus.getDefault().register(this);
return dialog;
}
@@ -739,7 +737,7 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
}
}
private void UpView(BlindBoxBean.XlhData xlhData) {
public void UpView(BlindBoxBean.XlhData xlhData) {
if (xlhData != null) {
this.xlhData = xlhData;
int currentNum = xlhData.getCurrent_num();
@@ -876,17 +874,17 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
}
// TODO: 2025/8/29 接收im推送过来的消息
@Subscribe(threadMode = ThreadMode.MAIN)
public void onMusicPlay(RoomMessageEvent message) {
if (message.getMsgType() == 1056) {
UpView(message.getText().getXlh_data());
}
}
// @Subscribe(threadMode = ThreadMode.MAIN)
// public void onMusicPlay(RoomMessageEvent message) {
// if (message.getMsgType() == 1056) {
// UpView(message.getText().getXlh_data());
// }
// }
@Override
public void onDestroyView() {
super.onDestroyView();
// releaseResources();
releaseResources();
}
@Override
@@ -939,9 +937,6 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
player.release();
player = null;
}
if (!EventBus.getDefault().isRegistered(this)) {
EventBus.getDefault().unregister(this);
}
// 建议进行垃圾回收
System.gc();
}

3
moduleUtil/src/main/res/layout/room_view_friendship_wheat.xml
View File

@@ -35,7 +35,8 @@
android:scaleType="fitCenter"
android:visibility="gone"
tools:visibility="visible"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintHeight_percent="1"
app:layout_constraintWidth_percent="1.05"
app:layout_constraintBottom_toBottomOf="@id/riv"
app:layout_constraintEnd_toEndOf="@id/riv"
app:layout_constraintStart_toStartOf="@id/riv"

11
moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.java
View File

@@ -97,6 +97,7 @@ import com.xscm.moduleutil.bean.room.RoomAuction;
import com.xscm.moduleutil.bean.room.RoomOnline;
import com.xscm.moduleutil.color.ThemeableDrawableUtils;
import com.xscm.moduleutil.dialog.RechargeDialogFragment;
import com.xscm.moduleutil.dialog.giftLottery.GiftLotteryDialog;
import com.xscm.moduleutil.event.ColoseCardEvent;
import com.xscm.moduleutil.event.EffectEvent;
import com.xscm.moduleutil.event.MusicEvent;
@@ -968,7 +969,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
private BlockingQueue<String> roomMessageEventQueue = new LinkedBlockingQueue<>();
int i = 0;
@Subscribe(threadMode = ThreadMode.MAIN)
// @Subscribe(threadMode = ThreadMode.MAIN)
public void roomInfoEvent(RoomMessageEvent messageEvent) {
if (messageEvent == null) return;
@@ -1073,6 +1074,12 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
} else if (mRoomInfoResp.getRoom_info().getType_id().equals("7")) {
roomFragment.friendshipRoomFragmentEvent(messageEvent);
}
}else if(msgType==1056){
GiftLotteryDialog dialog = (GiftLotteryDialog) getSupportFragmentManager()
.findFragmentByTag("GiftLotteryDialog");
if (dialog != null && dialog.isVisible()) {
dialog.UpView( messageEvent.getText().getXlh_data());
}
}
}
@@ -3228,7 +3235,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
if (mRoomInfoResp.getRoom_info().getType_id().equals("6")) {
maxHeightDp = 453;
} else if (mRoomInfoResp.getRoom_info().getType_id().equals("7")) {
maxHeightDp = 333;
maxHeightDp = 413;
}
adjustLayoutHeights();

6
moduleroom/src/main/java/com/example/moduleroom/fragment/FriendshipRoomFragment.java
View File

@@ -745,8 +745,10 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
* 心动数值变化
*/
public void friendHeartNumberDidChanged(List<FriendInfo.HeartList> heartLists) {
// 更新心动数值显示
roomInfoResp.getFriend_info().setHeart_list(heartLists);
if (roomInfoResp.getFriend_info()!=null) {
// 更新心动数值显示
roomInfoResp.getFriend_info().setHeart_list(heartLists);
}
configHeart();
configPowerBtn();
}

31
moduleroom/src/main/java/com/example/moduleroom/fragment/PublicScreenEaseChatFragment.java
View File

@@ -725,7 +725,10 @@ public class PublicScreenEaseChatFragment extends BaseMvpFragment<PublicScreenEa
messageInfos.add(info);
}
// 发送事件总线消息
EventBus.getDefault().post(message);
// EventBus.getDefault().post(message);
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).roomInfoEvent(message);
}
}
if (!messageInfos.isEmpty()) {
@@ -778,7 +781,10 @@ public class PublicScreenEaseChatFragment extends BaseMvpFragment<PublicScreenEa
case 1059:
case 1025:
case 1058:
EventBus.getDefault().post(message);
// EventBus.getDefault().post(message);
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).roomInfoEvent(message);
}
break;
case 124:
@@ -808,7 +814,10 @@ public class PublicScreenEaseChatFragment extends BaseMvpFragment<PublicScreenEa
easeChatAdapter.addData(info);
scrollToBottomIfNeed();
}
EventBus.getDefault().post(message);
// EventBus.getDefault().post(message);
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).roomInfoEvent(message);
}
break;
case 1003:
@@ -833,14 +842,20 @@ public class PublicScreenEaseChatFragment extends BaseMvpFragment<PublicScreenEa
break;
case 1005:
EventBus.getDefault().post(message);
// EventBus.getDefault().post(message);
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).roomInfoEvent(message);
}
if (text != null && text.getText() != null) {
addSingleMessage(message);
}
break;
default:
EventBus.getDefault().post(message);
// EventBus.getDefault().post(message);
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).roomInfoEvent(message);
}
break;
}
}
@@ -885,7 +900,11 @@ public class PublicScreenEaseChatFragment extends BaseMvpFragment<PublicScreenEa
}
private void postAndAddMessage(RoomMessageEvent message) {
EventBus.getDefault().post(message);
// EventBus.getDefault().post(message);
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).roomInfoEvent(message);
}
addSingleMessage(message);
}

33
moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java
View File

@@ -101,6 +101,16 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
String[] permissions = {Manifest.permission.RECORD_AUDIO};
private WheatFeedingDialogFragment wheatFeedingDialogFragment;
private SingSongFragment singSongFragment; /// 二卡八 --pk
private RoomKtvFragment ktvFragment; /// KTV
private RoomAuctionFragment roomAuctionFragment;///拍卖
private FriendshipRoomFragment friendshipRoomFragment; //交友
private RoomCabinFragment roomCabinFragment;// 小黑屋
@Override
public void initArgs(Bundle arguments) {
@@ -123,17 +133,6 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
@Override
public void onDestroy() {
super.onDestroy();
// if (EventBus.getDefault().isRegistered(this)) {
// EventBus.getDefault().unregister(this);
// }
//
// // 释放SVGA动画资源
// if (mBinding != null && mBinding.svgaNobility != null) {
// mBinding.svgaNobility.release();
// }
//
// releaseAllResources();
onFragmentShowDestroy();
}
@@ -348,23 +347,29 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
/// 交友房时间发生延时
public void friendTimeDelayWithTime(long end_time) {
FriendshipRoomFragment friendshipRoomFragment = findFragmentByTag(FriendshipRoomFragment.class);
if (friendshipRoomFragment != null)
if (friendshipRoomFragment != null) {
friendshipRoomFragment.upRoomInfo(mRoomInfoResp);
friendshipRoomFragment.friendTimeDelayWithTime(end_time);
}
}
/// 心动值发生变化
public void friendHeartNumberDidChanged(List<FriendInfo.HeartList> heartLists) {
FriendshipRoomFragment friendshipRoomFragment = findFragmentByTag(FriendshipRoomFragment.class);
if (friendshipRoomFragment != null)
if (friendshipRoomFragment != null) {
friendshipRoomFragment.upRoomInfo(mRoomInfoResp);
friendshipRoomFragment.friendHeartNumberDidChanged(heartLists);
}
}
/// 交友房麦位发生变化
public void friendSeatDidChanged(List<RoomPitBean> pitArr) {
FriendshipRoomFragment friendshipRoomFragment = findFragmentByTag(FriendshipRoomFragment.class);
if (friendshipRoomFragment != null)
if (friendshipRoomFragment != null) {
friendshipRoomFragment.upRoomInfo(mRoomInfoResp);
friendshipRoomFragment.friendSeatDidChanged(pitArr);
}
}
public void upFriendList(List<RoomPitBean> pitArr) {

72
moduleroom/src/main/res/layout/fragment_friendship_room.xml
View File

@@ -88,9 +88,9 @@
android:id="@+id/tv_hand"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:gravity="center"
android:paddingStart="@dimen/dp_3"
android:paddingEnd="@dimen/dp_3"
android:gravity="center"
android:text="牵手良缘"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
@@ -102,8 +102,8 @@
android:id="@+id/tv_ks"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_17"
android:background="@mipmap/jiaoy_ks"
android:layout_marginTop="@dimen/dp_10"
android:background="@mipmap/jiaoy_ks"
android:gravity="center"
android:text="开始"
android:textColor="@color/white"
@@ -119,14 +119,14 @@
android:layout_marginTop="10dp"
android:background="@mipmap/jiaoy_djs"
android:gravity="center"
android:visibility="gone"
tools:visibility="visible"
android:text="倒计时"
android:textColor="#D7CBFF"
android:textSize="@dimen/sp_12"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="@+id/tv_heart"
app:layout_constraintStart_toStartOf="@+id/tv_heart"
app:layout_constraintTop_toBottomOf="@+id/tv_heart" />
app:layout_constraintTop_toBottomOf="@+id/tv_heart"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -157,28 +157,28 @@
app:layout_constraintTop_toTopOf="@id/background_image"
app:loopCount="0"
app:source="heart_line_31.svga"
tools:visibility="visible"/>
tools:visibility="visible" />
<!-- <ImageView-->
<!-- android:id="@+id/im2"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="@dimen/dp_57"-->
<!-- android:scaleType="fitXY"-->
<!-- android:src="@mipmap/jiaoy_xian"-->
<!-- app:layout_constraintBottom_toBottomOf="@id/wheat_view2"-->
<!-- app:layout_constraintEnd_toStartOf="@+id/wheat_view5"-->
<!-- app:layout_constraintStart_toEndOf="@+id/wheat_view2"-->
<!-- app:layout_constraintTop_toTopOf="@id/wheat_view2"-->
<!-- android:visibility="gone"/>-->
<ImageView
android:id="@+id/im_x2"
android:layout_width="0dp"
android:layout_height="@dimen/dp_57"
android:scaleType="fitXY"
android:src="@mipmap/jiaoy_xian"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/background_image"
app:layout_constraintEnd_toEndOf="@id/background_image"
app:layout_constraintStart_toStartOf="@id/background_image"
app:layout_constraintTop_toTopOf="@id/background_image" />
<ImageView
android:id="@+id/im_p"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_35"
android:scaleType="fitCenter"
android:src="@mipmap/jiao_p2"
android:layout_marginBottom="@dimen/dp_35"
app:layout_constraintBottom_toBottomOf="@+id/background_image"
app:layout_constraintEnd_toEndOf="@+id/background_image"
app:layout_constraintStart_toStartOf="@+id/background_image"
@@ -188,8 +188,8 @@
android:id="@+id/tv_2"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_30"
android:gravity="center"
android:layout_marginTop="@dimen/dp_25"
android:gravity="center"
android:textColor="@color/colorPrimary"
android:textSize="@dimen/sp_24"
android:textStyle="bold"
@@ -198,23 +198,23 @@
app:layout_constraintStart_toStartOf="@+id/im_p"
app:layout_constraintTop_toTopOf="@+id/im_p"
tools:text="5200" />
<!-- android:background="@drawable/jiaoy_tv_x"-->
<!-- android:background="@drawable/jiaoy_tv_x"-->
<TextView
android:id="@+id/tv_ys"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_24"
android:layout_marginStart="@dimen/dp_10"
android:background="@mipmap/jiaoy_yc"
android:layout_marginTop="@dimen/dp_10"
android:background="@mipmap/jiaoy_yc"
android:gravity="center"
android:text="延时"
android:textColor="@color/white"
android:textSize="12sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/wheat_view2"
app:layout_constraintBottom_toTopOf="@+id/wheat_view3"
app:layout_constraintStart_toEndOf="@+id/wheat_view2"
app:layout_constraintTop_toBottomOf="@+id/tv_2"
app:layout_constraintBottom_toBottomOf="@+id/wheat_view2"
tools:visibility="visible" />
<TextView
@@ -228,9 +228,9 @@
android:textColor="@color/white"
android:textSize="12sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/tv_ys"
app:layout_constraintEnd_toStartOf="@+id/wheat_view5"
app:layout_constraintTop_toTopOf="@+id/tv_ys"
app:layout_constraintBottom_toBottomOf="@+id/tv_ys"
tools:visibility="visible" />
@@ -238,10 +238,10 @@
android:id="@+id/wheat_view1"
android:layout_width="@dimen/dp_52"
android:layout_height="wrap_content"
android:layout_marginTop="-20dp"
app:layout_constraintStart_toEndOf="@+id/wheat_view9"
app:layout_constraintTop_toBottomOf="@+id/wheat_view9"
app:layout_constraintTop_toTopOf="@id/background_image"
android:layout_marginTop="-20dp"
app:room_make_pic="@mipmap/jiaoy"
app:room_make_wheat_number="1" />
@@ -249,9 +249,9 @@
android:id="@+id/wheat_view2"
android:layout_width="@dimen/dp_52"
android:layout_height="wrap_content"
android:layout_marginTop="-20dp"
app:layout_constraintEnd_toStartOf="@+id/wheat_view1"
app:layout_constraintTop_toBottomOf="@+id/wheat_view1"
android:layout_marginTop="-20dp"
app:room_make_pic="@mipmap/jiaoy"
app:room_make_wheat_number="2" />
@@ -259,9 +259,9 @@
android:id="@+id/wheat_view3"
android:layout_width="@dimen/dp_52"
android:layout_height="wrap_content"
android:layout_marginTop="-10dp"
app:layout_constraintStart_toEndOf="@+id/wheat_view2"
app:layout_constraintTop_toBottomOf="@+id/wheat_view2"
android:layout_marginTop="-10dp"
app:room_make_pic="@mipmap/jiaoy"
app:room_make_wheat_number="3" />
@@ -269,9 +269,9 @@
android:id="@+id/wheat_view6"
android:layout_width="@dimen/dp_52"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="@id/wheat_view1"
app:layout_constraintBottom_toBottomOf="@+id/wheat_view1"
app:layout_constraintEnd_toStartOf="@+id/wheat_view10"
app:layout_constraintTop_toTopOf="@id/wheat_view1"
app:room_make_pic="@mipmap/jiaoy_n"
app:room_make_wheat_number="6" />
@@ -279,10 +279,10 @@
android:id="@+id/wheat_view5"
android:layout_width="@dimen/dp_52"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="@+id/wheat_view2"
app:layout_constraintStart_toEndOf="@+id/wheat_view6"
app:layout_constraintTop_toBottomOf="@+id/wheat_view6"
app:layout_constraintTop_toTopOf="@+id/wheat_view2"
app:layout_constraintBottom_toBottomOf="@+id/wheat_view2"
app:room_make_pic="@mipmap/jiaoy_n"
app:room_make_wheat_number="5" />
@@ -290,10 +290,10 @@
android:id="@+id/wheat_view4"
android:layout_width="@dimen/dp_52"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="@id/wheat_view3"
app:layout_constraintEnd_toStartOf="@+id/wheat_view5"
app:layout_constraintTop_toBottomOf="@+id/wheat_view5"
app:layout_constraintTop_toTopOf="@+id/wheat_view3"
app:layout_constraintBottom_toBottomOf="@id/wheat_view3"
app:room_make_pic="@mipmap/jiaoy_n"
app:room_make_wheat_number="4" />
@@ -313,16 +313,16 @@
tools:visibility="visible" />
<ImageView
android:id="@+id/im1"
android:id="@+id/im_x1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:scaleType="fitXY"
android:src="@mipmap/jiaoy_xian"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/wheat_view1"
app:layout_constraintEnd_toStartOf="@+id/wheat_view6"
app:layout_constraintStart_toEndOf="@+id/wheat_view1"
app:layout_constraintTop_toTopOf="@id/wheat_view1"
android:visibility="gone"/>
app:layout_constraintTop_toTopOf="@id/wheat_view1" />
<TextView
android:id="@+id/tv_1"
@@ -355,16 +355,16 @@
tools:visibility="visible" />
<ImageView
android:id="@+id/im3"
android:id="@+id/im_x3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="@dimen/dp_57"
android:scaleType="fitXY"
android:src="@mipmap/jiaoy_xian"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/wheat_view3"
app:layout_constraintEnd_toStartOf="@+id/wheat_view4"
app:layout_constraintStart_toEndOf="@+id/wheat_view3"
app:layout_constraintTop_toTopOf="@id/wheat_view3"
android:visibility="gone"/>
app:layout_constraintTop_toTopOf="@id/wheat_view3" />
<TextView
android:id="@+id/tv_3"