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

修改：貴族列表

Browse Source
This commit is contained in:
Martin 2024-08-16 16:55:05 +08:00
parent 86c7bd56d1
commit 2c56322b1c
8 changed files with 316 additions and 301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/res/layout/dialog_live_interaction.xml
View File

@ -270,7 +270,7 @@
<ImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@mipmap/icon_interaction_anchor_say" />
android:src="@mipmap/icon_interaction_beauty" />
<TextView
android:layout_width="wrap_content"

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.3 KiB

3
live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java
View File

@ -30,6 +30,7 @@ import com.yunbao.common.bean.UserBean;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.utils.CommonIconUtil;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.L;
import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.views.weight.ClipPathCircleImage;
@ -247,6 +248,8 @@ public class UserMoreInfoAdapter extends RefreshAdapter<UserBean> {
} else {
mRanksIcon.addView(rankImage, 0);
}
}else if(type.equals("6")){
L.e("type==6");
}
if (bean.getDress() != null && bean.getDress().getAvatar_frame() != null) {

4
live/src/main/java/com/yunbao/live/dialog/LiveInteractionDialogFragment.java
View File

@ -130,10 +130,10 @@ public class LiveInteractionDialogFragment extends AbsDialogFragment implements
findViewById(R.id.live_tool_game).setOnClickListener(this);
if (leave == 0) {
((ImageView) mLeaveView.findViewById(R.id.live_tool_leave_img)).setImageResource(R.mipmap.icon_leave);
((ImageView) mLeaveView.findViewById(R.id.live_tool_leave_img)).setImageResource(R.mipmap.icon_interaction_leave);
((TextView) mLeaveView.findViewById(R.id.live_tool_leave_text)).setText(mContext.getString(R.string.live_zslk));
} else {
((ImageView) mLeaveView.findViewById(R.id.live_tool_leave_img)).setImageResource(R.mipmap.icon_leave_p);
((ImageView) mLeaveView.findViewById(R.id.live_tool_leave_img)).setImageResource(R.mipmap.icon_interaction_leave_p);
((TextView) mLeaveView.findViewById(R.id.live_tool_leave_text)).setText(mContext.getString(R.string.live_zslk1));
}
mLiveRoomHandler = new LiveRoomHandler();

41
live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java
View File

@ -61,7 +61,7 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
private LiveGuardInfo mLiveGuardInfo;
public eightbitlab.com.blurview.BlurView blurView;
public TextView audience_btn, guard_btn, fans_btn, tags, btn, gz_view, dayRank, weekRank, title;
public TextView audience_btn,guard_btn, fans_btn, tags, btn, gz_view, dayRank, weekRank, title;
private LinearLayout tabs;
private ConstraintLayout noMoreLayout;
private TextView noMoreText;
@ -155,6 +155,7 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
audience_btn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
noble = false;
Tips = "1";
Up();
type = "guanzhong";
@ -198,7 +199,17 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
type = "weekRank";
mRefreshView.initData();
});
gz_view.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
noble = true;
Tips = "1";
Up();
userMoreInfoAdapter.setNoble(true);
type = "guanzhong";
mRefreshView.initData();
}
});
mRefreshView = mRootView.findViewById(R.id.refreshView);
view_no = mRootView.findViewById(R.id.view_no);
userMoreInfoAdapter = new UserMoreInfoAdapter(mContext, LiveUserMoreDialogFragment.this);
@ -237,7 +248,6 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
mRefreshView.setVisibility(View.GONE);
}
}
}
@Override
@ -335,9 +345,6 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
});
mRefreshView.initData();
if (noble) {
tabs.setVisibility(View.GONE);
title.setVisibility(View.VISIBLE);
title.setText(R.string.noble);
userMoreInfoAdapter.setNoble(true);
} else {
if (isOnly) {
@ -345,8 +352,6 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
title.setVisibility(View.GONE);
}
}
}
@Override
@ -372,20 +377,25 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
noMoreText.setVisibility(View.GONE);
LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) mRefreshView.getLayoutParams();
params.bottomMargin = DpUtil.dp2px(65);
if (Tips.equals("1")) {
if(noble){
tags.setText(R.string.enjoy_a_lot);
btn.setBackgroundResource(R.mipmap.btn_openvip);
btn.setText(R.string.live_ktgz);
setTextColor(audience_btn, guard_btn, fans_btn, weekRank, dayRank);
gz_view.setVisibility(View.GONE);
setTextColor(gz_view,audience_btn, guard_btn, fans_btn, weekRank, dayRank);
userMoreInfoAdapter.type = "1";
type = "guanzhong";
}else if (Tips.equals("1")) {
tags.setText(R.string.enjoy_a_lot);
btn.setBackgroundResource(R.mipmap.btn_openvip);
btn.setText(R.string.live_ktgz);
setTextColor(audience_btn, guard_btn, fans_btn, weekRank, dayRank,gz_view);
userMoreInfoAdapter.type = "1";
type = "guanzhong";
} else if (Tips.equals("2")) {
tags.setText(R.string.guard_for_your);
btn.setBackgroundResource(R.mipmap.btn_openprotection);
btn.setText(R.string.daemon_list);
setTextColor(guard_btn, audience_btn, fans_btn, dayRank, weekRank);
gz_view.setVisibility(View.GONE);
setTextColor(guard_btn, audience_btn, fans_btn, dayRank, weekRank,gz_view);
userMoreInfoAdapter.type = "2";
no_more.setImageResource(R.mipmap.ic_guard_not);
noMoreText.setText(R.string.waiting_for_you);
@ -395,8 +405,7 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
tags.setText(R.string.favorite_host_fan);
btn.setText(R.string.Join_a_fan_club);
btn.setBackgroundResource(R.mipmap.btn_joinfans);
setTextColor(fans_btn, audience_btn, guard_btn, dayRank, weekRank);
gz_view.setVisibility(View.GONE);
setTextColor(fans_btn, audience_btn, guard_btn, dayRank, weekRank,gz_view);
userMoreInfoAdapter.type = "3";
type = "fans";
no_more.setImageResource(R.mipmap.bixin);
@ -406,7 +415,6 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
bottom_msg.setVisibility(View.GONE);
type = "dayRank";
setTextColor(dayRank, audience_btn, guard_btn, fans_btn, gz_view, weekRank);
gz_view.setVisibility(View.GONE);
no_more.setImageResource(R.drawable.img_rank_empty);
noMoreText.setText(R.string.no_more_day_rank);
noMoreText.setVisibility(View.VISIBLE);
@ -415,7 +423,6 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
userMoreInfoAdapter.type = "5";
bottom_msg.setVisibility(View.GONE);
type = "weekRank";
gz_view.setVisibility(View.GONE);
no_more.setImageResource(R.drawable.img_rank_empty);
noMoreText.setText(R.string.no_more_day_rank);
setTextColor(weekRank, audience_btn, guard_btn, fans_btn, gz_view, dayRank);

2
live/src/main/res/drawable/bg_live_push_time.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="10dp"/>
<corners android:radius="11.5dp"/>
<solid android:color="#33000000"/>
</shape>

27
live/src/main/res/layout/dialog_user_more_list.xml
View File

@ -42,7 +42,7 @@
android:layout_weight="1"
android:gravity="center"
android:text="@string/day_rank"
android:textColor="#fff6f7fb"
android:textColor="#ff646464"
android:textSize="16sp" />
<TextView
@ -52,7 +52,7 @@
android:layout_weight="1"
android:gravity="center"
android:text="@string/week_rank"
android:textColor="#fff6f7fb"
android:textColor="#ff646464"
android:textSize="16sp" />
<TextView
@ -62,7 +62,17 @@
android:layout_weight="1"
android:gravity="center"
android:text="@string/live_audience"
android:textColor="#fff6f7fb"
android:textColor="#ff646464"
android:textSize="16sp" />
<TextView
android:id="@+id/gz_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="@string/aristocrat"
android:textColor="#ff646464"
android:textSize="16sp" />
<TextView
@ -87,17 +97,6 @@
android:textSize="16sp" />
</LinearLayout>
<TextView
android:id="@+id/gz_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginBottom="5dp"
android:text="@string/noble"
android:textColor="#B1B1B1"
android:textSize="13sp"
android:visibility="gone" />
<View
android:id="@+id/view_no"
android:layout_width="match_parent"

54
live/src/main/res/layout/view_ry_live_anchor.xml
View File

@ -2,11 +2,37 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:layout_gravity="bottom"
android:orientation="vertical">
<com.yunbao.common.custom.DrawableTextView
android:id="@+id/live_time"
android:layout_width="wrap_content"
android:layout_height="23dp"
android:layout_marginTop="100dp"
android:layout_gravity="end"
android:layout_centerVertical="true"
android:layout_marginEnd="10dp"
android:background="@drawable/bg_live_push_time"
android:drawablePadding="5dp"
android:gravity="center_vertical"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:text="00:00"
android:textColor="@color/white"
android:textSize="10sp"
android:visibility="invisible"
app:dt_left_drawable="@drawable/bg_push_time_point"
app:dt_left_height="4dp"
app:dt_left_width="4dp" />
<LinearLayout
android:layout_width="match_parent"
android:orientation="vertical"
android:gravity="bottom"
android:layout_height="match_parent">
<com.ms.banner.Banner
android:id="@+id/banner"
android:layout_width="78dp"
@ -25,7 +51,6 @@
android:layout_marginBottom="10dp"
android:orientation="vertical">
<LinearLayout
android:id="@+id/btn_start_dr_pk"
android:layout_width="100dp"
@ -120,7 +145,6 @@
</LinearLayout>
<LinearLayout
android:id="@+id/btn_link_mic"
android:layout_width="50dp"
@ -268,25 +292,7 @@
</LinearLayout>
<com.yunbao.common.custom.DrawableTextView
android:id="@+id/live_time"
android:layout_width="wrap_content"
android:layout_height="34dp"
android:layout_centerVertical="true"
android:layout_marginStart="42dp"
android:layout_marginEnd="10dp"
android:background="@drawable/bg_live_push_time"
android:drawablePadding="5dp"
android:gravity="center_vertical"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:text="00:00"
android:textColor="@color/white"
android:textSize="10sp"
android:visibility="invisible"
app:dt_left_drawable="@drawable/bg_push_time_point"
app:dt_left_height="4dp"
app:dt_left_width="4dp" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>