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

1:修改拍卖房魅力清除

Browse Source 
2:修改发现等待
This commit is contained in:
梁小江
2025-09-24 17:16:05 +08:00
parent 407b21c33f
commit ea82b59b0a
7 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomMakeWheatView.java
View File

@@ -174,6 +174,11 @@ public class RoomMakeWheatView extends BaseWheatView {
// }); // });
} }
public void setmTvTime(String charm){
mTvTime.setText(StringUtil.toWan2(pitBean.getCharm(),1));
}
private onCharmClickListener mOnCharmClickListener; private onCharmClickListener mOnCharmClickListener;
// //
public void setmOnCharmClickListener(onCharmClickListener mOnCharmClickListener) { public void setmOnCharmClickListener(onCharmClickListener mOnCharmClickListener) {

2
modulecircle/src/main/java/com/example/modulecircle/activity/DynamicDetailActivity.java
View File

@@ -249,7 +249,7 @@ public class DynamicDetailActivity extends BaseMvpActivity<CirclePresenter, Acti
if (type == 1){ if (type == 1){
finish(); finish();
}else { }else {
MvpPre.topicId(zone_id, 2); // MvpPre.topicId(zone_id, 2);
} }
// finish(); // finish();
} }

2
modulecircle/src/main/java/com/example/modulecircle/fragment/CircleCategoryFragment.java
View File

@@ -244,7 +244,7 @@ public class CircleCategoryFragment extends BaseMvpFragment<CirclePresenter, Fra
@Override @Override
public void setLikeZone(int type) { public void setLikeZone(int type) {
MvpPre.getCircleList(page + "", "10"); // MvpPre.getCircleList(page + "", "10");
} }
@Override @Override

10
moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
View File

@@ -341,11 +341,11 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
// 房主显示全部 // 房主显示全部
if (roleLevel == 1) { if (roleLevel == 1) {
if (onMic) { if (onMic) {
if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic) { if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy) {
return false; return false;
} }
}else { }else {
if (type==RoomSettingBean.QXRoomSettingTypeRoomBgMusic){ if (type==RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy){
return false; return false;
} }
} }
@@ -357,11 +357,11 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
type == RoomSettingBean.QXRoomSettingTypeRoomClearMessage || type == QXRoomSettingTypeRoomOrderMic || type == RoomSettingBean.QXRoomSettingTypeRoomFloatingScreen type == RoomSettingBean.QXRoomSettingTypeRoomClearMessage || type == QXRoomSettingTypeRoomOrderMic || type == RoomSettingBean.QXRoomSettingTypeRoomFloatingScreen
|| type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomBgImage || type == -1) { || type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomBgImage || type == -1) {
if (onMic) { if (onMic) {
if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic) { if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy) {
return false; return false;
} }
}else { }else {
if (type==RoomSettingBean.QXRoomSettingTypeRoomBgMusic){ if (type==RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy){
return false; return false;
} }
} }
@@ -372,7 +372,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
) { ) {
return true; return true;
}else { }else {
if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic){ if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy){
return false; return false;
} }
} }

14
moduleroom/src/main/java/com/example/moduleroom/fragment/RoomAuctionFragment.java
View File

@@ -1060,7 +1060,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
if (pitBean3!=null){ if (pitBean3!=null){
if (pitBean3.getUser_id().equals(messageEvent.getText().getUser_id())) { if (pitBean3.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean3.setCharm(""); pitBean3.setCharm("");
mBinding.ivAuction1.setCharm("0"); mBinding.ivAuction1.setmTvTime("0");
return; return;
} }
} }
@@ -1068,7 +1068,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
if (pitBean4!=null) { if (pitBean4!=null) {
if (pitBean4.getUser_id().equals(messageEvent.getText().getUser_id())) { if (pitBean4.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean4.setCharm(""); pitBean4.setCharm("");
mBinding.ivAuction2.setCharm("0"); mBinding.ivAuction2.setmTvTime("0");
return; return;
} }
} }
@@ -1076,7 +1076,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
if (pitBean5!=null) { if (pitBean5!=null) {
if (pitBean5.getUser_id().equals(messageEvent.getText().getUser_id())) { if (pitBean5.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean5.setCharm(""); pitBean5.setCharm("");
mBinding.ivAuction3.setCharm("0"); mBinding.ivAuction3.setmTvTime("0");
return; return;
} }
} }
@@ -1229,17 +1229,17 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
if (mBinding.ivAuction1.pitBean != null) { if (mBinding.ivAuction1.pitBean != null) {
RoomPitBean pitBean3 = mBinding.ivAuction1.pitBean; RoomPitBean pitBean3 = mBinding.ivAuction1.pitBean;
pitBean3.setCharm(""); pitBean3.setCharm("");
mBinding.ivAuction1.setCharm("0"); mBinding.ivAuction1.setmTvTime("0");
} }
if (mBinding.ivAuction2.pitBean != null) { if (mBinding.ivAuction2.pitBean != null) {
RoomPitBean pitBean4 = mBinding.ivAuction2.pitBean; RoomPitBean pitBean4 = mBinding.ivAuction2.pitBean;
pitBean4.setCharm(""); pitBean4.setCharm("");
mBinding.ivAuction2.setCharm("0"); mBinding.ivAuction2.setmTvTime("0");
} }
if (mBinding.ivAuction3.pitBean != null) { if (mBinding.ivAuction3.pitBean != null) {
RoomPitBean pitBean5 = mBinding.ivAuction3.pitBean; RoomPitBean pitBean5 = mBinding.ivAuction3.pitBean;
pitBean5.setCharm(""); pitBean5.setCharm("");
mBinding.ivAuction3.setCharm("0"); mBinding.ivAuction3.setmTvTime("0");
} }
} }
@@ -1399,7 +1399,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
if (targetWheatView != null) { if (targetWheatView != null) {
targetWheatView.pitBean.setCharm(charm); targetWheatView.pitBean.setCharm(charm);
targetWheatView.setCharm(charm); targetWheatView.setmTvTime(charm);
} }
} }

8
modulevocal/src/main/res/layout/activity_my_money.xml
View File

@@ -136,7 +136,7 @@
app:layout_constraintTop_toBottomOf="@+id/tv_zd"> app:layout_constraintTop_toBottomOf="@+id/tv_zd">
<TextView <TextView
android:layout_width="@dimen/dp_56" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_21" android:layout_height="@dimen/dp_21"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
@@ -168,7 +168,7 @@
app:layout_constraintTop_toBottomOf="@+id/r_1"> app:layout_constraintTop_toBottomOf="@+id/r_1">
<TextView <TextView
android:layout_width="@dimen/dp_56" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_21" android:layout_height="@dimen/dp_21"
android:text="@string/diamond_income_expense" android:text="@string/diamond_income_expense"
android:layout_centerInParent="true" android:layout_centerInParent="true"
@@ -212,7 +212,7 @@
app:layout_constraintTop_toBottomOf="@+id/tv_qt"> app:layout_constraintTop_toBottomOf="@+id/tv_qt">
<TextView <TextView
android:layout_width="@dimen/dp_56" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_21" android:layout_height="@dimen/dp_21"
android:text="@string/diamond_to_coin" android:text="@string/diamond_to_coin"
android:layout_centerInParent="true" android:layout_centerInParent="true"
@@ -245,7 +245,7 @@
app:layout_constraintTop_toBottomOf="@+id/r_3"> app:layout_constraintTop_toBottomOf="@+id/r_3">
<TextView <TextView
android:layout_width="@dimen/dp_56" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_21" android:layout_height="@dimen/dp_21"
android:text="@string/diamond_to_bangka" android:text="@string/diamond_to_bangka"
android:layout_centerInParent="true" android:layout_centerInParent="true"

1
modulevocal/src/main/res/layout/room_fragment_my_room_list.xml
View File

@@ -179,6 +179,7 @@
app:layout_constraintStart_toEndOf="@+id/rl_mx" app:layout_constraintStart_toEndOf="@+id/rl_mx"
android:gravity="center" android:gravity="center"
android:text="房间补贴" android:text="房间补贴"
android:visibility="gone"
/> />