diff --git a/config.gradle b/config.gradle index 9c9604d4b..9778093f9 100644 --- a/config.gradle +++ b/config.gradle @@ -4,14 +4,14 @@ ext { buildToolsVersion: "29.0.2", minSdkVersion : 21, targetSdkVersion : 31, - versionCode : 441, + versionCode : 442, versionName : "6.5.4" ] manifestPlaceholders = [ //正式、 -// serverHost : "https://napi.yaoulive.com", + serverHost : "https://napi.yaoulive.com", // 测试 - serverHost : "https://ceshi.yaoulive.com", +// serverHost : "https://ceshi.yaoulive.com", diff --git a/live/src/main/java/com/yunbao/live/views/FrameGiftViewHolder.java b/live/src/main/java/com/yunbao/live/views/FrameGiftViewHolder.java index e67b1baef..1c205691e 100644 --- a/live/src/main/java/com/yunbao/live/views/FrameGiftViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/FrameGiftViewHolder.java @@ -63,20 +63,20 @@ public class FrameGiftViewHolder extends RecyclerView.ViewHolder { public void showData(int contextLayoutGiftHeight, LiveGiftBean model) { //设置高度 - itemView.post(new Runnable() { - @Override - public void run() { - GridLayoutManager.LayoutParams linearParams = (GridLayoutManager.LayoutParams) itemView.getLayoutParams(); - int giftHeight = 607; - if (contextLayoutGiftHeight > 607) { - giftHeight = 607; - } else { - giftHeight = contextLayoutGiftHeight; - } - linearParams.height = (giftHeight - 30) / 2; - itemView.setLayoutParams(linearParams); - } - }); +// itemView.post(new Runnable() { +// @Override +// public void run() { +// GridLayoutManager.LayoutParams linearParams = (GridLayoutManager.LayoutParams) itemView.getLayoutParams(); +// int giftHeight = 607; +// if (contextLayoutGiftHeight > 607) { +// giftHeight = 607; +// } else { +// giftHeight = contextLayoutGiftHeight; +// } +// linearParams.height = (giftHeight - 30) / 2; +//// itemView.setLayoutParams(linearParams); +// } +// }); giftLayout.setSelected(model.isChecked()); if (model.isChecked()) { giftIcon.startAnimation(mAnimation); diff --git a/live/src/main/java/com/yunbao/live/views/LiveParcelItemViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveParcelItemViewHolder.java index 97db3a9ea..0f289c78d 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveParcelItemViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveParcelItemViewHolder.java @@ -62,14 +62,14 @@ public class LiveParcelItemViewHolder extends RecyclerView.ViewHolder { public void showData(int contextLayoutGiftHeight, LiveGiftBean model) { //设置高度 - itemView.post(new Runnable() { - @Override - public void run() { - GridLayoutManager.LayoutParams linearParams = (GridLayoutManager.LayoutParams) itemView.getLayoutParams(); - linearParams.height = contextLayoutGiftHeight / 2; - itemView.setLayoutParams(linearParams); - } - }); +// itemView.post(new Runnable() { +// @Override +// public void run() { +// GridLayoutManager.LayoutParams linearParams = (GridLayoutManager.LayoutParams) itemView.getLayoutParams(); +// linearParams.height = contextLayoutGiftHeight / 2; +//// itemView.setLayoutParams(linearParams); +// } +// }); giftLayout.setSelected(model.isChecked()); if (model.isChecked()) { giftIcon.startAnimation(mAnimation); diff --git a/live/src/main/res/layout/fragment_live_gift_item.xml b/live/src/main/res/layout/fragment_live_gift_item.xml index d2fae8429..56018b419 100644 --- a/live/src/main/res/layout/fragment_live_gift_item.xml +++ b/live/src/main/res/layout/fragment_live_gift_item.xml @@ -7,6 +7,7 @@ diff --git a/live/src/main/res/layout/item_frame_gift.xml b/live/src/main/res/layout/item_frame_gift.xml index b43e18e44..b650e2808 100644 --- a/live/src/main/res/layout/item_frame_gift.xml +++ b/live/src/main/res/layout/item_frame_gift.xml @@ -2,7 +2,7 @@ @@ -20,8 +20,8 @@ + android:layout_width="50dp" + android:layout_height="50dp" /> + android:textSize="10sp" /> + android:textSize="9sp" /> diff --git a/live/src/main/res/layout/item_live_parcel.xml b/live/src/main/res/layout/item_live_parcel.xml index 69e853d96..46662180f 100644 --- a/live/src/main/res/layout/item_live_parcel.xml +++ b/live/src/main/res/layout/item_live_parcel.xml @@ -2,7 +2,7 @@ @@ -27,8 +27,8 @@ + android:layout_width="50dp" + android:layout_height="50dp" />