From 78db3eca67d1afc83914d1cf2e14f221cc824dcc Mon Sep 17 00:00:00 2001
From: wushaocheng <15876365887@163.com>
Date: Mon, 14 Nov 2022 18:54:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=A0=E9=80=81=E7=A4=BC=E7=89=A9=E7=BB=99?=
 =?UTF-8?q?=E8=87=AA=E5=B7=B1=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erban/ui/widget/GiftAvatarAdapter.java    | 34 +++++++++++--------
 .../erban/ui/widget/UserInfoDialog.java       | 29 ++++++++++++++--
 app/src/main/res/values/strings.xml           |  1 +
 gradle.properties                             |  4 +--
 4 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftAvatarAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftAvatarAdapter.java
index 28bf63ca6..0225ab706 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftAvatarAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftAvatarAdapter.java
@@ -59,17 +59,13 @@ public class GiftAvatarAdapter extends RecyclerView.Adapter<GiftAvatarAdapter.Vi
     }
 
     public List<MicMemberInfo> getSelectedMember() {
-        if (selectType == SELECT_TYPE_WHOLE_MIC) {
-            return micMemberInfos;
-        } else {
-            List<MicMemberInfo> selectedMembers = new ArrayList<>();
-            for (MicMemberInfo micMemberInfo : micMemberInfos) {
-                if (micMemberInfo.isSelected()) {
-                    selectedMembers.add(micMemberInfo);
-                }
+        List<MicMemberInfo> selectedMembers = new ArrayList<>();
+        for (MicMemberInfo micMemberInfo : micMemberInfos) {
+            if (micMemberInfo.isSelected()) {
+                selectedMembers.add(micMemberInfo);
             }
-            return selectedMembers;
         }
+        return selectedMembers;
     }
 
     @Override
@@ -101,14 +97,18 @@ public class GiftAvatarAdapter extends RecyclerView.Adapter<GiftAvatarAdapter.Vi
 
             if (micMemberInfo.getMicPosition() == AvRoomDataManager.POSITION_BOSS_MIC) {
                 holder.micNumber.setText(ResUtil.getString(R.string.ui_widget_giftavataradapter_01));
-            } else if(micMemberInfo.getMicPosition() == AvRoomDataManager.POSITION_USER_NO_MIC){
-                holder.micNumber.setVisibility(View.GONE);
             } else if (micMemberInfo.getMicPosition() == AvRoomDataManager.POSITION_VIP_MIC) {
                 holder.micNumber.setText("VIP");
             } else {
                 holder.micNumber.setText(String.valueOf(micMemberInfo.getMicPosition() + 1));
             }
 
+            if(micMemberInfo.getMicPosition() == AvRoomDataManager.POSITION_USER_NO_MIC){
+                holder.micNumber.setVisibility(View.GONE);
+            }else {
+                holder.micNumber.setVisibility(View.VISIBLE);
+            }
+
             if (micMemberInfo.isInPkMode()) {
                 int boardColor = context.getResources().getColor(R.color.color_FFFFFF);
                 int solidColor = context.getResources().getColor(R.color.appColor);
@@ -120,7 +120,12 @@ public class GiftAvatarAdapter extends RecyclerView.Adapter<GiftAvatarAdapter.Vi
                 holder.micNumber.setSolid(solidColor);
                 holder.avatar.setBorderColor(boardColor);
             }
-            if (selectType == SELECT_TYPE_WHOLE_MIC || micMemberInfo.isSelected()) {
+            if (selectType == SELECT_TYPE_WHOLE_MIC && micMemberInfo.isSelected()) {
+                //选中
+                holder.avatarCover.setVisibility(View.GONE);
+                holder.micNumberCover.setVisibility(View.GONE);
+                holder.avatar.setBorderColor(context.getResources().getColor(R.color.appColor));
+            } else if (micMemberInfo.isSelected()) {
                 //选中
                 holder.avatarCover.setVisibility(View.GONE);
                 holder.micNumberCover.setVisibility(View.GONE);
@@ -157,11 +162,10 @@ public class GiftAvatarAdapter extends RecyclerView.Adapter<GiftAvatarAdapter.Vi
                 for (MicMemberInfo micMemberInfo : micMemberInfos) {
                     micMemberInfo.setSelected(false);
                 }
-                micMemberInfos.get(0).setSelected(true);
             } else {
                 selectType = SELECT_TYPE_WHOLE_MIC;
                 for (MicMemberInfo micMemberInfo : micMemberInfos) {
-                    micMemberInfo.setSelected(true);
+                    micMemberInfo.setSelected(!AvRoomDataManager.get().isOwner(micMemberInfo.getAccount()));
                 }
             }
         }
@@ -173,7 +177,7 @@ public class GiftAvatarAdapter extends RecyclerView.Adapter<GiftAvatarAdapter.Vi
 
     private boolean isSelectAll() {
         for (MicMemberInfo micMemberInfo : micMemberInfos) {
-            if (!micMemberInfo.isSelected()) {
+            if (!micMemberInfo.isSelected() && !AvRoomDataManager.get().isOwner(micMemberInfo.getAccount())) {
                 return false;
             }
         }
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java
index efa8ce459..ed4b0d0e1 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java
@@ -157,6 +157,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
 
     private HomePartyModel homePartyModel;
     private boolean isInRoom; // true:房间内打开 false:房间外打开
+    private GiftDialog.OnGiftDialogBtnClickListener giftDialogBtnClickListener;
 
     private SuperAdminModel mSuperAdminModel;
 
@@ -169,7 +170,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
 
     private RecyclerView recyclerViewSkill;
 
-    private UserInfoDialog(Context context, UserInfo userInfo, long uid, List<ViewItem> buttons, boolean isInRoom) {
+    private UserInfoDialog(Context context, UserInfo userInfo, long uid, List<ViewItem> buttons, boolean isInRoom,GiftDialog.OnGiftDialogBtnClickListener listener) {
         super(context, R.style.ErbanUserInfoDialog);
         this.context = context;
         this.uid = uid;
@@ -179,6 +180,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
         homePartyModel = new HomePartyModel();
         mSuperAdminModel = new SuperAdminModel();
         this.isInRoom = isInRoom;
+        this.giftDialogBtnClickListener = listener;
     }
 
     public static void showNewUserInfoDialog(Context context, long uid) {
@@ -206,7 +208,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
                             isInRoom,
                             listener
                     );
-                    new UserInfoDialog(context, userInfo, uid, list, isInRoom).show();
+                    new UserInfoDialog(context, userInfo, uid, list, isInRoom,listener).show();
                     loadingDialog.dismiss();
                 }, throwable -> {
                     SingleToastUtil.showToast(throwable.getMessage());
@@ -873,6 +875,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
                 AvRoomDataManager.get().isDatingVipMic(micPosition);
         //超管逻辑
         if (SuperAdminUtil.isSuperAdmin()) {
+            buttonItems.add(createGiveGiftMicItem());//添加送礼物按钮
             if (isTargetOnMic) {
                 if (isMySelf) {
                     buttonItems.add(createDownMicItem());
@@ -903,7 +906,8 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
         if (AvRoomDataManager.get().isRoomOwner()) {
             //房主操作
             if (isMySelf) {
-                //开闭麦麦
+                buttonItems.add(createGiveGiftMicItem());//添加送礼物按钮
+                //开闭麦
                 if (micPosition != AvRoomDataManager.POSITON_NOT_ON_MIC) {
                     if (roomMicInfo != null) {
                         if (roomMicInfo.isMicMute()) {
@@ -968,6 +972,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
             }
             return buttonItems;
         } else if (AvRoomDataManager.get().isRoomAdmin()) {
+            buttonItems.add(createGiveGiftMicItem());//添加送礼物按钮
             //管理员操作
             if (isMySelf) {
                 //开闭麦
@@ -1046,7 +1051,10 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
         } else {
             //游客操作
             if (isMySelf && isTargetOnMic) {
+                buttonItems.add(createGiveGiftMicItem());
                 buttonItems.add(createDownMicItem());
+            }else if(isMySelf){
+                buttonItems.add(createGiveGiftMicItem());
             }
             return buttonItems;
         }
@@ -1059,6 +1067,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
     private void handleInviteMicItem(List<TextView> buttonItems) {
         if (!SuperAdminUtil.isSuperAdmin() &&
                 !(AvRoomDataManager.get().isSingleRoom() && AvRoomDataManager.get().isOpenAnotherPKMode())) {
+//            buttonItems.add(createGiveGiftMicItem());
             buttonItems.add(createInviteMicItem());
         }
     }
@@ -1284,6 +1293,20 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
         return textView;
     }
 
+    private TextView createGiveGiftMicItem() {
+        TextView textView = getTextView(getString(R.string.give_gift));
+        textView.setOnClickListener(view -> {
+            GiftDialog dialog = new GiftDialog(context, uid, isInRoom, false, true);
+            if (giftDialogBtnClickListener != null) {
+                dialog.setGiftDialogBtnClickListener(giftDialogBtnClickListener);
+            }
+            dialog.show();
+            dismiss();
+        });
+        return textView;
+
+    }
+
     private TextView createInviteMicItem() {
         TextView textView = getTextView(getString(R.string.ui_widget_userinfodialog_028));
         textView.setOnClickListener(v -> {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9b8aaa0a2..e3cc8c6e3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4959,5 +4959,6 @@
     <string name="live_income">主播收入</string>
     <string name="diamond_income">鉆石收入</string>
     <string name="department_of_management">所屬廳</string>
+    <string name="give_gift">送礼物</string>
 
 </resources>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index f9d5822d3..78c946d79 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,5 +24,5 @@ only_arm64=false
 
 channel_file=channel.txt
 
-version_name=1.2.0
-version_code=120
\ No newline at end of file
+version_name=1.2.1
+version_code=121
\ No newline at end of file