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

6.5.4礼物冠名

Browse Source
This commit is contained in:
18401019693 2023-08-16 20:01:46 +08:00
parent b2297b062e
commit 17a2f5e091
6 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.gradle
View File

@ -4,14 +4,14 @@ ext {
buildToolsVersion: "29.0.2", buildToolsVersion: "29.0.2",
minSdkVersion : 21, minSdkVersion : 21,
targetSdkVersion : 31, targetSdkVersion : 31,
versionCode : 441, versionCode : 442,
versionName : "6.5.4" versionName : "6.5.4"
] ]
manifestPlaceholders = [ manifestPlaceholders = [
//正式、 //正式、
// serverHost : "https://napi.yaoulive.com", serverHost : "https://napi.yaoulive.com",
// 测试 // 测试
serverHost : "https://ceshi.yaoulive.com", // serverHost : "https://ceshi.yaoulive.com",

28
live/src/main/java/com/yunbao/live/views/FrameGiftViewHolder.java
View File

@ -63,20 +63,20 @@ public class FrameGiftViewHolder extends RecyclerView.ViewHolder {
public void showData(int contextLayoutGiftHeight, LiveGiftBean model) { public void showData(int contextLayoutGiftHeight, LiveGiftBean model) {
//设置高度 //设置高度
itemView.post(new Runnable() { // itemView.post(new Runnable() {
@Override // @Override
public void run() { // public void run() {
GridLayoutManager.LayoutParams linearParams = (GridLayoutManager.LayoutParams) itemView.getLayoutParams(); // GridLayoutManager.LayoutParams linearParams = (GridLayoutManager.LayoutParams) itemView.getLayoutParams();
int giftHeight = 607; // int giftHeight = 607;
if (contextLayoutGiftHeight > 607) { // if (contextLayoutGiftHeight > 607) {
giftHeight = 607; // giftHeight = 607;
} else { // } else {
giftHeight = contextLayoutGiftHeight; // giftHeight = contextLayoutGiftHeight;
} // }
linearParams.height = (giftHeight - 30) / 2; // linearParams.height = (giftHeight - 30) / 2;
itemView.setLayoutParams(linearParams); //// itemView.setLayoutParams(linearParams);
} // }
}); // });
giftLayout.setSelected(model.isChecked()); giftLayout.setSelected(model.isChecked());
if (model.isChecked()) { if (model.isChecked()) {
giftIcon.startAnimation(mAnimation); giftIcon.startAnimation(mAnimation);

16
live/src/main/java/com/yunbao/live/views/LiveParcelItemViewHolder.java
View File

@ -62,14 +62,14 @@ public class LiveParcelItemViewHolder extends RecyclerView.ViewHolder {
public void showData(int contextLayoutGiftHeight, LiveGiftBean model) { public void showData(int contextLayoutGiftHeight, LiveGiftBean model) {
//设置高度 //设置高度
itemView.post(new Runnable() { // itemView.post(new Runnable() {
@Override // @Override
public void run() { // public void run() {
GridLayoutManager.LayoutParams linearParams = (GridLayoutManager.LayoutParams) itemView.getLayoutParams(); // GridLayoutManager.LayoutParams linearParams = (GridLayoutManager.LayoutParams) itemView.getLayoutParams();
linearParams.height = contextLayoutGiftHeight / 2; // linearParams.height = contextLayoutGiftHeight / 2;
itemView.setLayoutParams(linearParams); //// itemView.setLayoutParams(linearParams);
} // }
}); // });
giftLayout.setSelected(model.isChecked()); giftLayout.setSelected(model.isChecked());
if (model.isChecked()) { if (model.isChecked()) {
giftIcon.startAnimation(mAnimation); giftIcon.startAnimation(mAnimation);

1
live/src/main/res/layout/fragment_live_gift_item.xml
View File

@ -7,6 +7,7 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/frame_gift_list" android:id="@+id/frame_gift_list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_gravity="bottom"
android:overScrollMode="never" android:overScrollMode="never"
android:layout_height="match_parent" /> android:layout_height="match_parent" />

10
live/src/main/res/layout/item_frame_gift.xml
View File

@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/gift_layout" android:id="@+id/gift_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="95dp"
android:background="@drawable/background_gift_select" android:background="@drawable/background_gift_select"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
@ -20,8 +20,8 @@
<ImageView <ImageView
android:id="@+id/gift_icon" android:id="@+id/gift_icon"
android:layout_width="55dp" android:layout_width="50dp"
android:layout_height="55dp" /> android:layout_height="50dp" />
<TextView <TextView
@ -30,7 +30,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="1dp" android:layout_marginTop="1dp"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="11sp" /> android:textSize="10sp" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -48,7 +48,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="10sp" /> android:textSize="9sp" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

6
live/src/main/res/layout/item_live_parcel.xml
View File

@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/gift_layout" android:id="@+id/gift_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="95dp"
android:background="@drawable/background_gift_select" android:background="@drawable/background_gift_select"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
@ -27,8 +27,8 @@
<ImageView <ImageView
android:id="@+id/gift_icon" android:id="@+id/gift_icon"
android:layout_width="55dp" android:layout_width="50dp"
android:layout_height="55dp" /> android:layout_height="50dp" />
<TextView <TextView
android:id="@+id/expire" android:id="@+id/expire"