[Modify]热门房间tab调整
@@ -70,6 +70,7 @@ class CreatePrivilegeCardDialog : BaseDialog<DialogCreatePrivilegeCardBinding>()
|
||||
binding.edValid.setText(it.effectDay.toString())
|
||||
binding.edId.setText(it.erbanNoStr)
|
||||
ImageLoadUtilsV2.loadImage(binding.ivPic, it.cardUrl)
|
||||
this.url = it.cardUrl
|
||||
}
|
||||
|
||||
binding.ivPic.setOnClickListener {
|
||||
|
@@ -114,9 +114,7 @@ public class RoomOperationDialog extends BottomSheetDialog {
|
||||
optAdapter = new OptAdapter(context, null);
|
||||
addDatingAction(optAdapter);
|
||||
addWishListAction(optAdapter);
|
||||
if (AvRoomDataManager.get().isHasPrivilegeCardPermit()) {
|
||||
addPrivilegeCardAction(optAdapter);
|
||||
}
|
||||
addPKAction(optAdapter);
|
||||
addRoomPKAction(optAdapter);
|
||||
addSingleRoomPKAction(optAdapter);
|
||||
@@ -691,6 +689,9 @@ public class RoomOperationDialog extends BottomSheetDialog {
|
||||
* 特权卡
|
||||
*/
|
||||
private void addPrivilegeCardAction(OptAdapter optAdapter) {
|
||||
if (!AvRoomDataManager.get().isHasPrivilegeCardPermit()) {
|
||||
return;
|
||||
}
|
||||
RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
|
||||
if (roomInfo == null) {
|
||||
return;
|
||||
|
@@ -154,6 +154,10 @@ class PrivilegeCardFragment : BaseViewBindingFragment<FragmentPrivilegeCardBindi
|
||||
@Subscribe(threadMode = ThreadMode.MAIN)
|
||||
fun privilegeCardEvent(event: PrivilegeCardEvent?) {
|
||||
isNeedLoad = true
|
||||
if(isResumed && isNeedLoad && (TextUtils.isEmptyText(type) || type == "0")){
|
||||
loadData(true)
|
||||
isNeedLoad = false
|
||||
}
|
||||
}
|
||||
|
||||
override fun onDestroyView() {
|
||||
|
@@ -211,6 +211,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
|
||||
private View ivWeekIn;
|
||||
private View llStarWeek;
|
||||
private View rlAvatars;
|
||||
private View descLayout;
|
||||
private RelativeLayout layoutRecharge;
|
||||
private ConstraintLayout csPrivilege;
|
||||
private AppCompatTextView tvNum;
|
||||
@@ -503,6 +504,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
|
||||
ivLuckyBagIntro.setOnClickListener(this);
|
||||
findViewById(R.id.ll_gold).setOnClickListener(this);
|
||||
rlAvatars = findViewById(R.id.rl_avatars);
|
||||
descLayout = findViewById(R.id.desc_layout);
|
||||
if (giftId == 0) {
|
||||
// 更新所有礼物
|
||||
showGiftTab();
|
||||
@@ -528,8 +530,6 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
|
||||
showGiftTab(indicatorType, giftInfo);
|
||||
}
|
||||
|
||||
View descLayout = findViewById(R.id.desc_layout);
|
||||
|
||||
if (isInRoom && (userOnMic || uid == 0)) {
|
||||
descLayout.setVisibility(View.GONE);
|
||||
if (micMemberInfos != null && micMemberInfos.size() > 0) {
|
||||
@@ -695,9 +695,6 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
|
||||
if (position == GiftIndicator.TYPE_PRIVILEGE) {
|
||||
showPrivilegeEmptyView();
|
||||
if (!ListUtils.isListEmpty(currentGiftPrivilegeInfoList)) {
|
||||
privilegeView.setVisibility(View.VISIBLE);
|
||||
layoutRecharge.setVisibility(View.INVISIBLE);
|
||||
csPrivilege.setVisibility(View.VISIBLE);
|
||||
showPrivilegeView();
|
||||
}
|
||||
} else if (isKnap) {
|
||||
@@ -715,11 +712,30 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
|
||||
} else {
|
||||
showLoadFailedView();
|
||||
}
|
||||
if (position != GiftIndicator.TYPE_PRIVILEGE) {
|
||||
privilegeView.setVisibility(View.GONE);
|
||||
layoutRecharge.setVisibility(View.VISIBLE);
|
||||
csPrivilege.setVisibility(View.INVISIBLE);
|
||||
}
|
||||
return;
|
||||
} else {
|
||||
privilegeView.setVisibility(View.GONE);
|
||||
layoutRecharge.setVisibility(View.VISIBLE);
|
||||
csPrivilege.setVisibility(View.INVISIBLE);
|
||||
if (isInRoom && (userOnMic || uid == 0)) {
|
||||
descLayout.setVisibility(View.GONE);
|
||||
if (micMemberInfos != null && micMemberInfos.size() > 0) {
|
||||
llAvatarList.setVisibility(View.VISIBLE);
|
||||
rlAvatars.setVisibility(View.VISIBLE);
|
||||
} else {
|
||||
rlAvatars.setVisibility(View.GONE);
|
||||
llAvatarList.setVisibility(View.GONE);
|
||||
}
|
||||
} else {
|
||||
llAvatarList.setVisibility(View.GONE);
|
||||
descLayout.setVisibility(View.VISIBLE);
|
||||
rlAvatars.setVisibility(View.VISIBLE);
|
||||
}
|
||||
}
|
||||
currentGiftInfo = selectGiftInfo == null ? currentGiftInfoList.get(0) : selectGiftInfo;
|
||||
if (currentGiftInfo.isSendMsg()) {
|
||||
@@ -784,7 +800,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
|
||||
privilegeView.setAdapter(baseQuickAdapter);
|
||||
tvPrivilegeGive.setOnClickListener(v -> {
|
||||
if (currentGiftPrivilegeInfoList.get(mPrivilegePosition).getDailyNum() == 0) {
|
||||
SingleToastUtil.showToast("今日次数已用完");
|
||||
SingleToastUtil.showToast("今日可赠送次数不足");
|
||||
} else {
|
||||
compositeDisposable.add(GiftModel.get()
|
||||
.givePrivilegeCard(String.valueOf(baseQuickAdapter.getItem(mPrivilegePosition).getId()),
|
||||
@@ -992,6 +1008,12 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
|
||||
layoutLoading.setVisibility(View.GONE);
|
||||
gridView.setVisibility(View.GONE);
|
||||
etSendMessage.setVisibility(View.GONE);
|
||||
privilegeView.setVisibility(View.VISIBLE);
|
||||
layoutRecharge.setVisibility(View.INVISIBLE);
|
||||
csPrivilege.setVisibility(View.VISIBLE);
|
||||
descLayout.setVisibility(View.GONE);
|
||||
llAvatarList.setVisibility(View.GONE);
|
||||
rlAvatars.setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
private void showEmptyView() {
|
||||
@@ -1464,6 +1486,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
|
||||
giftIndicator.hidePosition(GiftIndicator.TYPE_WEEK);
|
||||
giftIndicator.hidePosition(GiftIndicator.TYPE_NORMAL);
|
||||
giftIndicator.hidePosition(GiftIndicator.TYPE_SING_ROOM);
|
||||
giftIndicator.hidePosition(GiftIndicator.TYPE_PRIVILEGE);
|
||||
|
||||
giftIndicator.setPosition(GiftIndicator.TYPE_DRAW_GIFT);
|
||||
updateGiftView(giftIndicator.getCurrrentType());
|
||||
|
@@ -52,7 +52,6 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="@dimen/dp_16"
|
||||
android:layout_marginTop="@dimen/dp_10"
|
||||
android:layout_marginEnd="@dimen/dp_16"
|
||||
app:layout_constraintBottom_toTopOf="@+id/tvProtocol"
|
||||
app:layout_constraintTop_toBottomOf="@+id/magicIndicator" />
|
||||
|
@@ -4,6 +4,7 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/dp_10"
|
||||
android:paddingTop="@dimen/dp_16"
|
||||
android:paddingBottom="@dimen/dp_16"
|
||||
android:background="@drawable/shape_white_16dp_round">
|
||||
|
@@ -615,5 +615,8 @@
|
||||
<color name="color_F5F6FA">#F5F6FA</color>
|
||||
<color name="color_CED1DB">#CED1DB</color>
|
||||
<color name="color_33FFDA24">#33FFDA24</color>
|
||||
<color name="color_FA940A">#FA940A</color>
|
||||
<color name="color_167FE0">#167FE0</color>
|
||||
<color name="color_BA43E0">#BA43E0</color>
|
||||
|
||||
</resources>
|
||||
|
@@ -90,6 +90,9 @@ public class ModuleHallActivity extends BaseMvpActivity<IModuleHallView, ModuleH
|
||||
super.onCreate(savedInstanceState);
|
||||
binding = ActivityModuleHallBinding.inflate(getLayoutInflater());
|
||||
setContentView(binding.getRoot());
|
||||
binding.tvCheckStream.setOnClickListener(this);
|
||||
binding.tvMemberIncome.setOnClickListener(this);
|
||||
binding.tvManageSetup.setOnClickListener(this);
|
||||
binding.ivHallMemberSearch.setOnClickListener(this);
|
||||
binding.ivHallMemberMore.setOnClickListener(this);
|
||||
binding.ivBack.setOnClickListener(this);
|
||||
@@ -343,6 +346,15 @@ public class ModuleHallActivity extends BaseMvpActivity<IModuleHallView, ModuleH
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
switch (view.getId()) {
|
||||
case R.id.tv_check_stream:
|
||||
|
||||
break;
|
||||
case R.id.tv_member_income:
|
||||
IncomeStatisticsActivity.start(ModuleHallActivity.this, hallId);
|
||||
break;
|
||||
case R.id.tv_manage_setup:
|
||||
AdminListActivity.start(ModuleHallActivity.this, hallId);
|
||||
break;
|
||||
case R.id.iv_hall_member_search:
|
||||
MemberSearchActivity.start(ModuleHallActivity.this);
|
||||
break;
|
||||
|
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 11 KiB |
After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 807 B After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 976 B After Width: | Height: | Size: 1.0 KiB |
@@ -69,7 +69,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/dp_10"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="@dimen/sp_13"
|
||||
android:textSize="@dimen/sp_12"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/iv_hall_avatar"
|
||||
@@ -106,6 +106,58 @@
|
||||
tools:itemCount="1"
|
||||
tools:listitem="@layout/item_tab_small" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/ll_option"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="15dp"
|
||||
android:layout_marginTop="@dimen/dp_20"
|
||||
android:layout_marginEnd="15dp"
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintTop_toBottomOf="@id/rv_option">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_check_stream"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:background="@drawable/bg_check_stream"
|
||||
android:paddingStart="10dp"
|
||||
android:paddingEnd="0dp"
|
||||
android:paddingTop="10dp"
|
||||
android:text="查看流水"
|
||||
android:textColor="@color/color_FA940A"
|
||||
android:textSize="14sp" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_member_income"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="6dp"
|
||||
android:layout_weight="1"
|
||||
android:background="@drawable/bg_member_income"
|
||||
android:paddingStart="10dp"
|
||||
android:paddingEnd="0dp"
|
||||
android:paddingTop="10dp"
|
||||
android:text="成员收入"
|
||||
android:textColor="@color/color_167FE0"
|
||||
android:textSize="14sp" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_manage_setup"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="6dp"
|
||||
android:layout_weight="1"
|
||||
android:background="@drawable/bg_manage_setup"
|
||||
android:paddingStart="10dp"
|
||||
android:paddingEnd="0dp"
|
||||
android:paddingTop="10dp"
|
||||
android:text="高管设置"
|
||||
android:textColor="@color/color_BA43E0"
|
||||
android:textSize="14sp" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/ll_member_list"
|
||||
android:layout_width="match_parent"
|
||||
@@ -117,7 +169,7 @@
|
||||
android:background="@drawable/bg_secondary_radius_10"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/rv_option">
|
||||
app:layout_constraintTop_toBottomOf="@id/ll_option">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
@@ -150,12 +202,14 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:drawableEnd="@drawable/ic_hall_member_more"
|
||||
android:text="管理"
|
||||
android:textColor="@color/text_normal_282828"
|
||||
android:textSize="12sp"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible" />
|
||||
tools:visibility="visible"
|
||||
android:layout_marginStart="@dimen/dp_6"
|
||||
android:drawablePadding="@dimen/dp_12"
|
||||
app:drawableStartCompat="@drawable/ic_hall_member_more" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|