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

UI样式调整

Browse Source
This commit is contained in:
ningwenqiang
2024-09-19 16:56:57 +08:00
parent 4f4034c1d0
commit 9d3ed3632a
10 changed files with 89 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
live/src/main/java/com/yunbao/live/dialog/LiveAnchorSayPopDialog.java
View File

@@ -93,6 +93,7 @@ public class LiveAnchorSayPopDialog extends AbsDialogPopupWindow {
sayBg = anchorDemo.findViewById(R.id.anchorSayBg);
list = findViewById(R.id.anchor_say_list);
saySwitch = findViewById(R.id.say_switch);
sayEdit = findViewById(R.id.anchor_say_edit);
titleEdit = findViewById(R.id.titleEdit);

32
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@@ -292,6 +292,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
public static ImageView newMessage, atMessage;
//多人PK
static TextView time;
@@ -3403,6 +3404,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
private void startNewPart2Flipper(View view){
if(view == null)
return;
if (newPart2Flipper.getVisibility() != View.VISIBLE){
newPart2Flipper.setVisibility(View.VISIBLE);
}
// 获取当前翻转动画器中的视图数量
newPart2Flipper.getChildCount();
// 检查传入的视图是否已存在于翻转动画器中
@@ -3469,13 +3473,13 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
if (flipper.getChildCount() > 0) {
flipper.removeAllViews();
}
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(DpUtil.dp2px(16), DpUtil.dp2px(16));
LinearLayout.LayoutParams textParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
textParams.leftMargin = DpUtil.dp2px(5);
params.leftMargin = DpUtil.dp2px(5);
View hotView = LayoutInflater.from(mContext).inflate(R.layout.view_wish_list, null);
// LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(DpUtil.dp2px(16), DpUtil.dp2px(16));
// LinearLayout.LayoutParams textParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
// textParams.leftMargin = DpUtil.dp2px(5);
// params.leftMargin = DpUtil.dp2px(5);
View hotView = LayoutInflater.from(mContext).inflate(R.layout.view_wish_list2, null);
hotView.setTag("hotView");
View hourView = LayoutInflater.from(mContext).inflate(R.layout.view_wish_list, null);
View hourView = LayoutInflater.from(mContext).inflate(R.layout.view_wish_list2, null);
hourView.setTag("hourView");
ImageView hotPic = hotView.findViewById(R.id.wish_pic);
ImageView hourPic = hourView.findViewById(R.id.wish_pic);
@@ -3483,15 +3487,15 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
mHourRank = hourView.findViewById(R.id.wish_index);
mHotText.setText("0");
mHourRank.setText("熱度加成");
mHotText.setLayoutParams(textParams);
mHourRank.setLayoutParams(textParams);
// mHotText.setLayoutParams(textParams);
// mHourRank.setLayoutParams(textParams);
mHotText.setGravity(Gravity.CENTER);
mHourRank.setGravity(Gravity.CENTER);
setHourRankData(Long.parseLong(model.getRank()));
hotPic.setImageResource(R.mipmap.ic_live_hour_rank);
hourPic.setImageResource(R.drawable.icon_heat_new);
hotPic.setLayoutParams(params);
hourPic.setLayoutParams(params);
hourPic.setImageResource(R.mipmap.ic_live_hot_rank);
// hotPic.setLayoutParams(params);
// hourPic.setLayoutParams(params);
flipper.addView(hotView);
flipper.addView(hourView);
flipper.startFlipping();
@@ -3542,7 +3546,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
mHotText.setGravity(Gravity.CENTER);
mHourRank.setGravity(Gravity.CENTER);
setHourRankData(info.get(0).getRank());
hotPic.setImageResource(R.drawable.icon_time_new);
hotPic.setImageResource(R.mipmap.ic_live_hour_rank);
hourPic.setImageResource(R.drawable.icon_heat_new);
hotPic.setLayoutParams(params);
hourPic.setLayoutParams(params);
@@ -3878,9 +3882,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}
public static int pkEndIndex = 0;
//PK结束，结果展示
public static void pkEndList(int result) {
if (result == 0) {
img_pk_fist_l.setBackgroundResource(R.mipmap.icon_red_no1);
img_pk_fist_r.setBackgroundResource(R.mipmap.icon_blue_no1);
@@ -3978,6 +3982,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
//双人pk显示
public void UpPkTwo() {
//if
if (lt_pk_line.getVisibility() == View.VISIBLE) return;
ScreenDimenUtil util = ScreenDimenUtil.getInstance();
int mScreenWdith = util.getScreenWdith();
@@ -4011,6 +4016,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
//双人pk关闭
public void closePkTwo() {
Log.e("LiveRoomViewHolder", "closePkTwo: 隐藏PK信息" + goto_room_view.getVisibility());
mPkRankTopIcon.setVisibility(View.GONE);
lt_pk_line.setVisibility(View.GONE);

22
live/src/main/res/layout/view_live_room_part2.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout_height="36dp">
tools:layout_height="30dp">
<!-- 新手任务 -->
@@ -163,7 +163,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFC949 "
android:textSize="12sp"
android:textSize="9sp"
app:layout_constraintStart_toStartOf="@+id/newWishTitleTv"
app:layout_constraintTop_toBottomOf="@+id/newWishTitleTv"
tools:text="5" />
@@ -174,7 +174,7 @@
android:layout_height="wrap_content"
android:gravity="bottom"
android:textColor="#FFFFFF"
android:textSize="10sp"
android:textSize="9sp"
app:layout_constraintBottom_toBottomOf="@+id/newWishNowTv"
app:layout_constraintStart_toEndOf="@+id/newWishNowTv"
tools:text="/26" />
@@ -185,6 +185,7 @@
android:layout_width="0dp"
android:layout_height="2dp"
android:layout_marginEnd="10dp"
android:layout_marginStart="1dp"
android:progressDrawable="@drawable/bg_gift_progressbar"
app:layout_constraintEnd_toStartOf="@+id/newWishImg"
app:layout_constraintStart_toStartOf="@+id/newWishTitleTv"
@@ -197,7 +198,7 @@
android:layout_height="wrap_content"
android:visibility="gone"
app:constraint_referenced_ids="newWishBgView,newWishImg,newWishTitleTv,newWishNowTv,newWishTotalTv,wish_progressbar"
tools:visibility="invisible" />
tools:visibility="visible" />
<ViewFlipper
android:id="@+id/wishViewFlipper"
@@ -205,6 +206,7 @@
android:layout_height="match_parent"
android:layout_marginEnd="10dp"
android:flipInterval="5000"
android:visibility="gone"
android:inAnimation="@anim/anim_marquee_in"
android:outAnimation="@anim/anim_marquee_out"
tools:background="@drawable/bg_live_item_rank"
@@ -254,7 +256,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFC949 "
android:textSize="12sp"
android:textSize="9sp"
app:layout_constraintStart_toStartOf="@+id/newWeekTitleTv"
app:layout_constraintTop_toBottomOf="@+id/newWeekTitleTv"
tools:text="5" />
@@ -265,7 +267,7 @@
android:layout_height="wrap_content"
android:gravity="bottom"
android:textColor="#FFFFFF"
android:textSize="10sp"
android:textSize="9sp"
app:layout_constraintBottom_toBottomOf="@+id/newWeekNowTv"
app:layout_constraintStart_toEndOf="@+id/newWeekNowTv"
tools:text="/26" />
@@ -276,6 +278,7 @@
android:layout_width="0dp"
android:layout_height="2dp"
android:layout_marginEnd="10dp"
android:layout_marginStart="1dp"
android:progressDrawable="@drawable/bg_gift_progressbar"
app:layout_constraintEnd_toStartOf="@+id/newWeekImg"
app:layout_constraintStart_toStartOf="@+id/newWeekTitleTv"
@@ -307,10 +310,11 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@mipmap/icon_arrow_right_3"
android:layout_marginEnd="4dp"
app:layout_constraintBottom_toBottomOf="@+id/goddessSayBgView"
app:layout_constraintDimensionRatio="1"
app:layout_constraintEnd_toEndOf="@+id/goddessSayBgView"
app:layout_constraintHeight_percent="0.5"
app:layout_constraintHeight_percent="0.34"
app:layout_constraintTop_toTopOf="@+id/goddessSayBgView" />
<TextView
@@ -319,7 +323,7 @@
android:layout_height="match_parent"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:singleLine="true"
android:paddingStart="5dp"
android:paddingEnd="1dp"
android:textColor="@color/white"
@@ -336,7 +340,7 @@
android:layout_height="wrap_content"
android:visibility="gone"
app:constraint_referenced_ids="goddessSayBgView,goddessSayTitleTv,goddessSayImg"
tools:visibility="gone" />
tools:visibility="visible" />

5
live/src/main/res/layout/view_live_room_part2_item.xml
View File

@@ -47,7 +47,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFC949 "
android:textSize="12sp"
android:textSize="9sp"
app:layout_constraintStart_toStartOf="@+id/newItemTitleTv"
app:layout_constraintTop_toBottomOf="@+id/newItemTitleTv"
tools:text="5" />
@@ -58,7 +58,7 @@
android:layout_height="wrap_content"
android:gravity="bottom"
android:textColor="#FFFFFF"
android:textSize="10sp"
android:textSize="9sp"
app:layout_constraintBottom_toBottomOf="@+id/newItemNowTv"
app:layout_constraintStart_toEndOf="@+id/newItemNowTv"
tools:text="/26" />
@@ -69,6 +69,7 @@
android:layout_width="0dp"
android:layout_height="2dp"
android:layout_marginEnd="10dp"
android:layout_marginStart="1dp"
android:progressDrawable="@drawable/bg_gift_progressbar"
app:layout_constraintEnd_toStartOf="@+id/newItemImg"
app:layout_constraintStart_toStartOf="@+id/newItemTitleTv"

41
live/src/main/res/layout/view_wish_list2.xml Normal file
View File

@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/transparent"
tools:background="@drawable/bg_live_item"
tools:layout_height="23dp">
<ImageView
android:id="@+id/wish_pic"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:src="@mipmap/ic_live_hot_rank"
android:layout_marginStart="7dp"
android:layout_width="10dp"
android:layout_height="wrap_content" />
<com.yunbao.common.views.weight.MarqueeTextView
android:id="@+id/wish_index"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/wish_pic"
android:layout_width="0dp"
android:layout_height="wrap_content"
tools:text="热度加成"
android:layout_marginStart="2dp"
android:ellipsize="marquee"
android:focusable="true"
android:gravity="center"
android:focusableInTouchMode="true"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
android:textColor="#FFFFFFFF"
app:layout_constraintEnd_toEndOf="parent"
android:textSize="10sp" />
</androidx.constraintlayout.widget.ConstraintLayout>

BIN
live/src/main/res/mipmap-hdpi/ic_live_hot_rank.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 548 B

BIN
live/src/main/res/mipmap-mdpi/ic_live_hot_rank.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 349 B

BIN
live/src/main/res/mipmap-xhdpi/ic_live_hot_rank.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 789 B

BIN
live/src/main/res/mipmap-xxxhdpi/ic_live_hot_rank.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB