yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复PK显示问题：【是用户先进 主播后挂断会显示对方信息角标】

Browse Source 
调整直播间游戏半屏UI
调整战令UI
This commit is contained in:
zlzw
2024-01-23 15:28:13 +08:00
parent aa62dda844
commit 47077a465a
16 changed files with 361 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/main/java/com/yunbao/main/activity/MainActivity.java
View File

@@ -192,7 +192,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
private View floatRedPacket;
private View floatWarOrder;
private View floatWarOrder;//战令浮窗
private List<AnchorStartLiveBean> startListNotifyList = new ArrayList<>();

52
main/src/main/java/com/yunbao/main/adapter/BattlePassRewardAdapter.java
View File

@@ -12,6 +12,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
@@ -49,7 +50,7 @@ public class BattlePassRewardAdapter extends RecyclerView.Adapter<BattlePassRewa
private List<Map<Integer, LiveBattlePassRewardsBean.LiveBattlePassReward>> mList = new ArrayList<>();
private int userLevel;
private BattlePassUserInfoBean userType;
private String quintessenceSpendMoney,enjoySpendMoney;
private String quintessenceSpendMoney, enjoySpendMoney;
private OnItemClickListener<LiveBattlePassRewardsBean.LiveBattlePassReward> onItemClickListener;
public void setList(List<Map<Integer, LiveBattlePassRewardsBean.LiveBattlePassReward>> mList) {
@@ -89,11 +90,11 @@ public class BattlePassRewardAdapter extends RecyclerView.Adapter<BattlePassRewa
}
public void setQuintessenceSpendMoney(String quintessenceSpendMoney) {
this.quintessenceSpendMoney=quintessenceSpendMoney;
this.quintessenceSpendMoney = quintessenceSpendMoney;
}
public void setEnjoySpendMoney(String enjoySpendMoney) {
this.enjoySpendMoney=enjoySpendMoney;
this.enjoySpendMoney = enjoySpendMoney;
}
public class VH extends RecyclerView.ViewHolder {
@@ -107,6 +108,10 @@ public class BattlePassRewardAdapter extends RecyclerView.Adapter<BattlePassRewa
ImageView tab1Received, tab2Received, tab3Received;
TextView tab1Title, tab2Title, tab3Title;
LinearLayout tab1TopMoneySubscript, tab2TopMoneySubscript, tab3TopMoneySubscript;
TextView tab1TopMoney, tab2TopMoney, tab3TopMoney;
ImageView tab1TopMoneyIcon, tab2TopMoneyIcon, tab3TopMoneyIcon;
Map<Integer, LiveBattlePassRewardsBean.LiveBattlePassReward> data;
@@ -137,6 +142,15 @@ public class BattlePassRewardAdapter extends RecyclerView.Adapter<BattlePassRewa
tab1Received = itemView.findViewById(R.id.tab_1_item_received);
tab2Received = itemView.findViewById(R.id.tab_2_item_received);
tab3Received = itemView.findViewById(R.id.tab_3_item_received);
tab1TopMoneySubscript = itemView.findViewById(R.id.tab_1_top_money_layout);
tab2TopMoneySubscript = itemView.findViewById(R.id.tab_2_top_money_layout);
tab3TopMoneySubscript = itemView.findViewById(R.id.tab_3_top_money_layout);
tab1TopMoney = itemView.findViewById(R.id.tab_1_top_money_text);
tab2TopMoney = itemView.findViewById(R.id.tab_2_top_money_text);
tab3TopMoney = itemView.findViewById(R.id.tab_3_top_money_text);
tab1TopMoneyIcon = itemView.findViewById(R.id.tab_1_top_money_icon);
tab2TopMoneyIcon = itemView.findViewById(R.id.tab_2_top_money_icon);
tab3TopMoneyIcon = itemView.findViewById(R.id.tab_3_top_money_icon);
}
int level = 0;
@@ -222,7 +236,28 @@ public class BattlePassRewardAdapter extends RecyclerView.Adapter<BattlePassRewa
}
});
}), tab1, tab2, tab3);
getAllView(((reward, view) -> {
view.setVisibility(View.VISIBLE);
switch (reward.getSendGiftType()) {
case 0:
view.setImageResource(R.mipmap.diamond);
break;
case 1:
view.setImageResource(R.mipmap.gold_coin);
break;
default:
view.setVisibility(View.GONE);
}
}), tab1TopMoneyIcon, tab2TopMoneyIcon, tab3TopMoneyIcon);
getAllView(((reward, view) -> {
view.setText(String.valueOf(reward.getSendRewardNeedcoin()));
if (reward.getSendGiftType() == 999) {
view.setText(reward.getSendRewardRestrictTime() + (WordUtil.isNewZh() ? "天" : "Day"));
if (reward.getSendRewardRestrictTime().equals("0")) {
view.setText(WordUtil.isNewZh()?"永久":"Forever");
}
}
}), tab1TopMoney, tab2TopMoney, tab3TopMoney);
}
private void getReward(LiveBattlePassRewardsBean.LiveBattlePassReward reward) {
@@ -232,9 +267,9 @@ public class BattlePassRewardAdapter extends RecyclerView.Adapter<BattlePassRewa
}
if (reward.getLock() == 1) {
//ToastUtil.show("锁了");
if(reward.getLiveBattlePassTypeId()==2){
if (reward.getLiveBattlePassTypeId() == 2) {
showBuyType(true);
}else{
} else {
showBuyType(false);
}
return;
@@ -306,13 +341,14 @@ public class BattlePassRewardAdapter extends RecyclerView.Adapter<BattlePassRewa
setVisibility(View.INVISIBLE, type - 1, tab1Layout, tab2Layout, tab3Layout);
}
}
private void showBuyType(boolean is){
private void showBuyType(boolean is) {
new XPopup.Builder(itemView.getContext())
.enableDrag(false)
.maxWidth(DeviceUtils.getScreenHeight((Activity) itemView.getContext()) - DpUtil.dp2px(34))
.asCustom(new ActivateEliteBattleOrderPopupWindow(
itemView.getContext(),
is?quintessenceSpendMoney:enjoySpendMoney,
is ? quintessenceSpendMoney : enjoySpendMoney,
is,
new LiberalBattlePassPopupWindow.LiberalBattlePassCallback() {
@Override

42
main/src/main/res/layout/activity_battlepass.xml
View File

@@ -80,18 +80,38 @@
android:layout_height="wrap_content"
android:src="@mipmap/ic_zl_tab3_unselect" />
</LinearLayout>
<include
layout="@layout/view_battlepass_user"
<androidx.core.widget.NestedScrollView
android:layout_marginTop="16dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp" />
android:layout_height="match_parent">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include
layout="@layout/view_battlepass_user"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/context_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:background="@drawable/background_order_dialog" />
<!-- <androidx.constraintlayout.widget.ConstraintLayout
android:layout_marginTop="10dp"
android:layout_width="match_parent"
android:background="@drawable/background_order_dialog_out_layout"
android:layout_height="match_parent">
</androidx.constraintlayout.widget.ConstraintLayout>-->
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/context_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:background="@drawable/background_order_dialog" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

150
main/src/main/res/layout/item_battlepass_reward_type_top.xml
View File

@@ -44,9 +44,9 @@
android:layout_height="7dp"
android:layout_marginBottom="70dp"
android:background="@drawable/bg_text_battlepass_reward_point"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/reward_lv"
app:layout_constraintStart_toStartOf="@+id/reward_lv"
app:layout_constraintBottom_toBottomOf="parent" />
app:layout_constraintStart_toStartOf="@+id/reward_lv" />
<LinearLayout
android:layout_width="wrap_content"
@@ -74,24 +74,57 @@
<ImageView
android:id="@+id/tab_1"
android:layout_width="0dp"
android:layout_marginBottom="14dp"
android:layout_margin="12dp"
android:layout_height="0dp"
android:layout_margin="12dp"
android:layout_marginBottom="14dp"
android:src="@mipmap/ic_integral"
app:layout_constraintBottom_toBottomOf="@id/tab_1_bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/tab_1_bg" />
<LinearLayout
android:id="@+id/tab_1_top_money_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:background="@mipmap/ic_zl_battlpas_exchange_top_subscript"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/tab_1_top_money_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="1dp"
android:layout_marginBottom="1dp"
android:layout_marginEnd="1dp"
android:textColor="#fff"
android:textSize="11sp"
tools:text="10000" />
<ImageView
android:id="@+id/tab_1_top_money_icon"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_marginEnd="1dp"
android:src="@mipmap/gold_coin" />
</LinearLayout>
<ImageView
android:id="@+id/tab_1_unlock"
android:layout_width="match_parent"
android:layout_height="0dp"
android:src="@mipmap/bg_zl_battlepass_reward_item_unlock"
android:visibility="gone"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/tab_1_bg" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@+id/tab_1_bg"/>
<ImageView
android:id="@+id/tab_1_item_unlock"
@@ -101,6 +134,7 @@
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/tab_1_bg"
app:layout_constraintEnd_toEndOf="@id/tab_1_bg" />
<ImageView
android:id="@+id/tab_1_item_received"
android:layout_width="49.5dp"
@@ -113,21 +147,23 @@
android:id="@+id/tab_1_subscript"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:src="@mipmap/ic_zl_battlpas_exchange_subscript"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tab_1_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:ellipsize="end"
android:maxLines="1"
android:text="甜蜜氣球\n&amp;積分30"
android:textColor="#0D21B2"
android:textSize="12sp"
android:textStyle="bold"
android:maxLines="1"
android:ellipsize="end"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tab_1_bg" />
@@ -152,23 +188,55 @@
android:id="@+id/tab_2"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_margin="12dp"
android:layout_marginBottom="14dp"
android:src="@mipmap/ic_integral"
app:layout_constraintBottom_toBottomOf="@id/tab_2_bg"
android:layout_marginBottom="14dp"
android:layout_margin="12dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/tab_2_bg" />
<LinearLayout
android:id="@+id/tab_2_top_money_layout"
android:layout_width="wrap_content"
android:layout_height="15dp"
android:layout_marginTop="4dp"
android:background="@mipmap/ic_zl_battlpas_exchange_top_subscript2"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/tab_2_top_money_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="1dp"
android:layout_marginBottom="1dp"
android:layout_marginEnd="1dp"
android:textColor="#fff"
android:textSize="11sp"
tools:text="7天" />
<ImageView
android:id="@+id/tab_2_top_money_icon"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_marginEnd="1dp"
android:visibility="gone"
android:src="@mipmap/diamond" />
</LinearLayout>
<ImageView
android:id="@+id/tab_2_unlock"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@mipmap/bg_zl_battlepass_reward_item_unlock"
android:visibility="gone"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/tab_2_bg" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@+id/tab_2_bg" />
<ImageView
android:id="@+id/tab_2_item_unlock"
@@ -178,6 +246,7 @@
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="@id/tab_2_bg"
app:layout_constraintEnd_toEndOf="@id/tab_2_bg" />
<ImageView
android:id="@+id/tab_2_item_received"
android:layout_width="49.5dp"
@@ -190,19 +259,21 @@
android:id="@+id/tab_2_subscript"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:src="@mipmap/ic_zl_battlpas_exchange_subscript2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tab_2_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:ellipsize="end"
android:maxLines="1"
android:text="甜蜜氣球\n&amp;積分30"
android:textColor="#0D21B2"
android:textSize="12sp"
android:maxLines="1"
android:ellipsize="end"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -213,6 +284,7 @@
android:id="@+id/tab_3_layout"
android:layout_width="73dp"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/tab_3_bg"
android:layout_width="match_parent"
@@ -221,35 +293,73 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/tab_3"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="14dp"
android:layout_margin="12dp"
android:layout_marginBottom="14dp"
android:src="@mipmap/ic_integral"
app:layout_constraintBottom_toBottomOf="@id/tab_3_bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/tab_3_bg" />
app:layout_constraintTop_toTopOf="@id/tab_3_bg" />
<LinearLayout
android:id="@+id/tab_3_top_money_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:background="@mipmap/ic_zl_battlpas_exchange_top_subscript"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/tab_3_top_money_text"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="1dp"
android:layout_marginBottom="1dp"
android:textColor="#fff"
android:textSize="12sp"
tools:text="100000" />
<ImageView
android:id="@+id/tab_3_top_money_icon"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_marginEnd="1dp"
android:src="@mipmap/diamond" />
</LinearLayout>
<ImageView
android:id="@+id/tab_3_unlock"
android:background="@mipmap/bg_zl_battlepass_reward_item_unlock"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@mipmap/bg_zl_battlepass_reward_item_unlock"
android:visibility="visible"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@+id/tab_3_bg"
/>
<ImageView
android:id="@+id/tab_3_item_unlock"
android:layout_width="wrap_content"
android:layout_marginBottom="4dp"
tools:visibility="g"
android:layout_height="wrap_content"
android:src="@mipmap/ic_zl_battlepass_reward_item_unlock"
app:layout_constraintBottom_toBottomOf="@id/tab_3_bg"
app:layout_constraintEnd_toEndOf="@id/tab_3_bg" />
<ImageView
android:id="@+id/tab_3_item_received"
android:layout_width="49.5dp"
@@ -259,20 +369,24 @@
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="@id/tab_3_bg"
app:layout_constraintEnd_toEndOf="@id/tab_3_bg" />
<ImageView
android:id="@+id/tab_3_subscript"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:src="@mipmap/ic_zl_battlpas_exchange_subscript"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tab_3_title"
android:maxLines="1"
android:ellipsize="end"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:ellipsize="end"
android:maxLines="1"
android:text="甜蜜氣球\n&amp;積分30"
android:textColor="#0D21B2"
android:textSize="12sp"

BIN
main/src/main/res/mipmap-xxhdpi/ic_zl_battlpas_exchange_top_subscript.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
main/src/main/res/mipmap-xxhdpi/ic_zl_battlpas_exchange_top_subscript2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB