diff --git a/common/src/main/java/com/yunbao/common/adapter/LiveNewRoleInteractionGamesAdapter.java b/common/src/main/java/com/yunbao/common/adapter/LiveNewRoleInteractionGamesAdapter.java
index 3d17bf60e..109792917 100644
--- a/common/src/main/java/com/yunbao/common/adapter/LiveNewRoleInteractionGamesAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/LiveNewRoleInteractionGamesAdapter.java
@@ -15,6 +15,7 @@ import com.yunbao.common.event.CustomDrawerPopupEvent;
import com.yunbao.common.event.LiveNewRoleEvent;
import com.yunbao.common.event.NewRoleCustomDrawerPopupEvent;
import com.yunbao.common.utils.Bus;
+import com.yunbao.common.views.InteractionGamesChildBottomViewHolder;
import com.yunbao.common.views.InteractionGamesChildViewHolder;
import java.util.ArrayList;
@@ -34,14 +35,14 @@ public class LiveNewRoleInteractionGamesAdapter extends RecyclerView.Adapter {
@Override
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View runGamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_live_new_role_fun_games_child_view3, parent, false);
- return new InteractionGamesChildViewHolder(runGamesView);
+ return new InteractionGamesChildBottomViewHolder(runGamesView,mContext);
}
@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
- InteractionGamesChildViewHolder childViewHolder = (InteractionGamesChildViewHolder) holder;
+ InteractionGamesChildBottomViewHolder childViewHolder = (InteractionGamesChildBottomViewHolder) holder;
childViewHolder.setData(child.get(position), rigts);
- childViewHolder.setItemViewClicks(new InteractionGamesChildViewHolder.InteractionGamesCallBack() {
+ childViewHolder.setItemViewClicks(new InteractionGamesChildBottomViewHolder.InteractionGamesCallBack() {
@Override
public void onItemViewClicks(CustomSidebarChildModel model, boolean rigts) {
diff --git a/common/src/main/java/com/yunbao/common/adapter/LiveNewRolerPopupAdapter.java b/common/src/main/java/com/yunbao/common/adapter/LiveNewRolerPopupAdapter.java
index ef0105714..1af67bb6c 100644
--- a/common/src/main/java/com/yunbao/common/adapter/LiveNewRolerPopupAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/LiveNewRolerPopupAdapter.java
@@ -45,7 +45,7 @@ public class LiveNewRolerPopupAdapter extends RecyclerView.Adapter {
return new LiveNewRoleRigtsInterestsViewHolder(rightsInterestsView,showRed);
default:
View gamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_live_new_role_interaction_games_view, parent, false);
- return new LiveNewRoleInteractionGamesViewHolder(gamesView);
+ return new LiveNewRoleInteractionGamesViewHolder(gamesView,mContext);
}
}
diff --git a/common/src/main/java/com/yunbao/common/views/InteractionGamesChildBottomViewHolder.java b/common/src/main/java/com/yunbao/common/views/InteractionGamesChildBottomViewHolder.java
new file mode 100644
index 000000000..82ce39f46
--- /dev/null
+++ b/common/src/main/java/com/yunbao/common/views/InteractionGamesChildBottomViewHolder.java
@@ -0,0 +1,68 @@
+package com.yunbao.common.views;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.bean.CustomSidebarChildModel;
+import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+
+public class InteractionGamesChildBottomViewHolder extends RecyclerView.ViewHolder {
+ private ImageView funGamePic;
+ private TextView funGameName;
+
+ private Context mContext;
+
+ public InteractionGamesChildBottomViewHolder(@NonNull View itemView, Context context) {
+ super(itemView);
+ this.mContext = context;
+ funGamePic = itemView.findViewById(R.id.fun_game_pic);
+ funGameName = itemView.findViewById(R.id.fun_game_name);
+ }
+
+ public void setData(CustomSidebarChildModel model, boolean rigts) {
+ ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams((int)
+ (mContext.getResources().getDisplayMetrics().widthPixels / 4.5),
+ ViewGroup.LayoutParams.WRAP_CONTENT);
+ itemView.setLayoutParams(layoutParams);
+ if (rigts) {
+ ImgLoader.display(itemView.getContext(), model.getIcon(), funGamePic);
+ } else {
+ ImgLoader.display(itemView.getContext(), model.getResIcon(), funGamePic);
+ }
+ funGameName.setText(model.getTitle());
+ if (!TextUtils.isEmpty(model.getSudGameIsNew())&&TextUtils.equals(model.getSudGameIsNew(),"1")){
+ itemView.findViewById(R.id.icon_new_game).setVisibility(View.VISIBLE);
+ }else {
+ itemView.findViewById(R.id.icon_new_game).setVisibility(View.GONE);
+ }
+ ViewClicksAntiShake.clicksAntiShake(itemView, new ViewClicksAntiShake.ViewClicksCallBack() {
+ @Override
+ public void onViewClicks() {
+ if (interactionGamesCallBack != null) {
+ interactionGamesCallBack.onItemViewClicks(model, rigts);
+ }
+
+
+ }
+ });
+ }
+
+ private InteractionGamesCallBack interactionGamesCallBack;
+
+ public void setItemViewClicks(InteractionGamesCallBack callBack) {
+ interactionGamesCallBack = callBack;
+ }
+
+ public interface InteractionGamesCallBack {
+ void onItemViewClicks(CustomSidebarChildModel model, boolean rigts);
+ }
+}
diff --git a/common/src/main/java/com/yunbao/common/views/LiveNewRoleInteractionGamesViewHolder.java b/common/src/main/java/com/yunbao/common/views/LiveNewRoleInteractionGamesViewHolder.java
index 4a30f3397..01fb96bdb 100644
--- a/common/src/main/java/com/yunbao/common/views/LiveNewRoleInteractionGamesViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/LiveNewRoleInteractionGamesViewHolder.java
@@ -1,11 +1,13 @@
package com.yunbao.common.views;
+import android.content.Context;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.yunbao.common.R;
@@ -21,14 +23,14 @@ public class LiveNewRoleInteractionGamesViewHolder extends RecyclerView.ViewHold
private RecyclerView childList;
private ImageView selectMoreIcon;
boolean isShowMore = true;
-
- public LiveNewRoleInteractionGamesViewHolder(@NonNull View itemView) {
+ public LiveNewRoleInteractionGamesViewHolder(@NonNull View itemView, Context context) {
super(itemView);
sendGoodGift = itemView.findViewById(R.id.send_good_gift);
childList = itemView.findViewById(R.id.child_list);
selectMoreIcon = itemView.findViewById(R.id.select_more_icon);
funGamesAdapter = new LiveNewRoleInteractionGamesAdapter(itemView.getContext(), true);
- childList.setLayoutManager(new GridLayoutManager(itemView.getContext(), 4));
+ LinearLayoutManager layoutManager = new LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false);
+ childList.setLayoutManager(layoutManager);
childList.setAdapter(funGamesAdapter);
}
diff --git a/common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java b/common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java
index 9bb18cb88..fd4cc66ba 100644
--- a/common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java
+++ b/common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java
@@ -98,7 +98,7 @@ public class LiveSudGamePopup extends BottomPopupView {
gameTitle.setText(mCreateSudRoomModel.getSudGameName());
roomName.setText(mCreateSudRoomModel.getRoomName());
roomNumber.setText(mCreateSudRoomModel.getSudGameRoomId());
- ImgLoader.display(getContext(), mCreateSudRoomModel.getAvatar(), mAvatar);
+ //ImgLoader.display(getContext(), mCreateSudRoomModel.getAvatar(), mAvatar);
}
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.exit), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
diff --git a/common/src/main/java/com/yunbao/common/views/RigtsInterestsViewHolder.java b/common/src/main/java/com/yunbao/common/views/RigtsInterestsViewHolder.java
index 0edee2dc5..0b671fdfc 100644
--- a/common/src/main/java/com/yunbao/common/views/RigtsInterestsViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/RigtsInterestsViewHolder.java
@@ -27,7 +27,7 @@ public class RigtsInterestsViewHolder extends RecyclerView.ViewHolder {
sendGoodGift = itemView.findViewById(R.id.send_good_gift);
childList = itemView.findViewById(R.id.child_list);
funGamesAdapter = new FunGamesAdapter(itemView.getContext(), false);
- childList.setLayoutManager(new GridLayoutManager(itemView.getContext(), 3));
+ childList.setLayoutManager(new GridLayoutManager(itemView.getContext(), 4));
childList.setAdapter(funGamesAdapter);
}
diff --git a/common/src/main/res/drawable/bg_live_sud_game_top_new.xml b/common/src/main/res/drawable/bg_live_sud_game_top_new.xml
index cddd65f5b..dc541bd75 100644
--- a/common/src/main/res/drawable/bg_live_sud_game_top_new.xml
+++ b/common/src/main/res/drawable/bg_live_sud_game_top_new.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/common/src/main/res/drawable/dialog_live_sud_game_name_bg.xml b/common/src/main/res/drawable/dialog_live_sud_game_name_bg.xml
new file mode 100644
index 000000000..904801aa2
--- /dev/null
+++ b/common/src/main/res/drawable/dialog_live_sud_game_name_bg.xml
@@ -0,0 +1,9 @@
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/common/src/main/res/layout/activity_sud_game.xml b/common/src/main/res/layout/activity_sud_game.xml
index 7688f57b5..698d0617c 100644
--- a/common/src/main/res/layout/activity_sud_game.xml
+++ b/common/src/main/res/layout/activity_sud_game.xml
@@ -2,6 +2,8 @@
@@ -14,7 +16,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/common/src/main/res/layout/view_fun_games_view.xml b/common/src/main/res/layout/view_fun_games_view.xml
index 6da8f3b5a..a28b889fc 100644
--- a/common/src/main/res/layout/view_fun_games_view.xml
+++ b/common/src/main/res/layout/view_fun_games_view.xml
@@ -41,7 +41,6 @@
android:id="@+id/child_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
-
android:layout_marginBottom="16dp" />
-
-
+
-
+
-
+
+
+
+
-
+ android:gravity="center"
+ android:maxLines="1"
+ android:text="@string/guard_guard"
+ android:textColor="#9A9A9A"
+ app:autoSizeMaxTextSize="14sp"
+ app:autoSizeMinTextSize="5sp"
+ app:autoSizeStepGranularity="1sp"
+ app:autoSizeTextType="uniform"
+ android:textSize="14sp" />
+
-
\ No newline at end of file
diff --git a/common/src/main/res/mipmap-xxhdpi/bg_live_sud_game_back_new2.png b/common/src/main/res/mipmap-xxhdpi/bg_live_sud_game_back_new2.png
new file mode 100644
index 000000000..867b7a5b0
Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/bg_live_sud_game_back_new2.png differ
diff --git a/common/src/main/res/mipmap-xxhdpi/icon_min_game_new.png b/common/src/main/res/mipmap-xxhdpi/icon_min_game_new.png
index b4aa97974..201572e1e 100644
Binary files a/common/src/main/res/mipmap-xxhdpi/icon_min_game_new.png and b/common/src/main/res/mipmap-xxhdpi/icon_min_game_new.png differ
diff --git a/common/src/main/res/mipmap-xxhdpi/icon_sud_history_live_new.png b/common/src/main/res/mipmap-xxhdpi/icon_sud_history_live_new.png
index f9c550e28..447280a7b 100644
Binary files a/common/src/main/res/mipmap-xxhdpi/icon_sud_history_live_new.png and b/common/src/main/res/mipmap-xxhdpi/icon_sud_history_live_new.png differ
diff --git a/common/src/main/res/mipmap-xxhdpi/live_dialog_top_game_icon.png b/common/src/main/res/mipmap-xxhdpi/live_dialog_top_game_icon.png
new file mode 100644
index 000000000..65fc17742
Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/live_dialog_top_game_icon.png differ
diff --git a/live/src/main/res/layout/dialog_live_guard.xml b/live/src/main/res/layout/dialog_live_guard.xml
index ecbe80255..79b41d55d 100644
--- a/live/src/main/res/layout/dialog_live_guard.xml
+++ b/live/src/main/res/layout/dialog_live_guard.xml
@@ -169,9 +169,8 @@
android:id="@+id/guard_imageView"
android:layout_width="58dp"
android:layout_height="58dp"
- android:layout_centerInParent="true"
android:layout_centerHorizontal="true"
- android:layout_centerVertical="true"
+ android:layout_marginTop="20dp"
android:scaleType="centerCrop"
android:src="@mipmap/guardian_img_wings"
android:visibility="visible"
diff --git a/live/src/main/res/layout/view_live_audience.xml b/live/src/main/res/layout/view_live_audience.xml
index f3e474019..5bbcef852 100644
--- a/live/src/main/res/layout/view_live_audience.xml
+++ b/live/src/main/res/layout/view_live_audience.xml
@@ -515,7 +515,7 @@
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
- android:layout_marginEnd="150dp"
+ android:layout_marginEnd="144dp"
android:layout_marginBottom="-2dp"
android:text="99"
android:textColor="#FFB403"
diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml
index 4902096e3..f6483c19a 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -745,8 +745,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
- android:layout_marginTop="100dp"
- android:visibility="gone" />
+ android:layout_marginTop="140dp"
+ android:visibility="gone"
+ tools:visibility="visible"/>