diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java index d34c4cff5..c3d19a0ce 100644 --- a/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java +++ b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java @@ -15,8 +15,10 @@ import android.widget.TextView; import androidx.annotation.Nullable; import androidx.databinding.DataBindingUtil; +import androidx.fragment.app.DialogFragment; import androidx.fragment.app.Fragment; +import com.chwl.app.avroom.activity.RoomTitleEditActivity; import com.chwl.app.ui.utils.ImageLoadUtilsV2; import com.chwl.app.ui.widget.GiftDialog; import com.chwl.app.ui.widget.UserInfoDialog; @@ -117,7 +119,6 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe if (roomFragment instanceof HomePartyRoomFragment) { ((HomePartyRoomFragment) roomFragment).onNewIntent(intent); } - } @Override @@ -193,6 +194,7 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe @Override public void onSetListener() { + gameMainBinding.ivRoomNotice.setOnClickListener(this); roomMore.setOnClickListener(this); ivFollowRoom.setOnClickListener(this); // ivRoomShare.setOnClickListener(this); @@ -400,6 +402,12 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe ivFollowRoom.setImageResource(AvRoomDataManager.get().isRoomFans ? R.drawable.room_ic_collect_yes : R.drawable.room_ic_collect_no); setIdOnlineData(); + + if (AvRoomDataManager.get().getRoomType() != RoomInfo.ROOMTYPE_GAME) { + gameMainBinding.ivRoomNotice.setVisibility(View.VISIBLE); + } else { + gameMainBinding.ivRoomNotice.setVisibility(View.GONE); + } } } @@ -421,6 +429,9 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe @Override public void onClick(View v) { switch (v.getId()) { + case R.id.iv_room_notice: + showRoomIntroduction(AvRoomDataManager.get().isRoomOwner() || AvRoomDataManager.get().isRoomAdmin()); + break; case R.id.room_more: int gravity = Gravity.END; if(UiUtils.INSTANCE.isRtl(requireContext())){ @@ -582,4 +593,22 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe } } + + private void showRoomIntroduction(Boolean modify) { + var isModify = modify; + RoomInfo info = AvRoomDataManager.get().mCurrentRoomInfo; + if (info == null) { + return; + } + if (SuperAdminUtil.isSuperAdmin()) { + isModify = false; + } + if (isModify) { + RoomTitleEditActivity.startForResult(getActivity(), info.getRoomDesc(), info.getIntroduction()); + } else { + DialogFragment dialogFragment = + RoomTitleDialogFragment.getInstance(info.getRoomDesc(), info.getIntroduction()); + dialogFragment.show(requireActivity().getSupportFragmentManager(), "roomTitle"); + } + } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_chatroom_game_main.xml b/app/src/main/res/layout/fragment_chatroom_game_main.xml index 61c0cbab7..39e2dd378 100644 --- a/app/src/main/res/layout/fragment_chatroom_game_main.xml +++ b/app/src/main/res/layout/fragment_chatroom_game_main.xml @@ -130,6 +130,16 @@ android:scaleType="centerInside" android:src="@drawable/room_ic_collect_no" app:layout_constraintBottom_toBottomOf="@id/space_title_bar" + app:layout_constraintEnd_toStartOf="@id/iv_room_notice" + app:layout_constraintTop_toTopOf="@id/space_title_bar" /> + + diff --git a/app/src/main/res/layout/item_boss_micro.xml b/app/src/main/res/layout/item_boss_micro.xml index f23b11ca5..6d3956a6b 100644 --- a/app/src/main/res/layout/item_boss_micro.xml +++ b/app/src/main/res/layout/item_boss_micro.xml @@ -280,6 +280,7 @@ @@ -339,6 +340,7 @@ @@ -289,6 +290,7 @@