From 8611817a6a6a4480c66ff1c5b5ce820c11076bda Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Wed, 17 May 2023 13:26:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A4=BC=E7=89=A9=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E5=88=87=E6=8D=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yunbao/live/dialog/LiveGiftDialogFragment.java    |  7 +++++++
 .../com/yunbao/live/views/LiveRoomViewHolder.java     |  5 ++++-
 .../com/yunbao/main/activity/EditProfileActivity.java | 11 +++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java
index 3b5a2fdbe..4ccb32f71 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java
@@ -209,6 +209,13 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
             type = position;
             type_name = bean.getName();
             upData();
+            if (mBtnSendGroup != null && mBtnSendGroup.getVisibility() == View.VISIBLE) {
+                mBtnChooseCount.setVisibility(View.INVISIBLE);
+                mArrow.setVisibility(View.INVISIBLE);
+                mBtnSend.setVisibility(View.VISIBLE);
+                mBtnSend.setEnabled(false);
+                mBtnSend.setBackgroundDrawable(mDrawable2);
+            }
             //点击礼物，展示礼物列表
             mCurrentId = 0;
             if (mViewPager != null) {
diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
index 1b409fe14..a49925831 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -4999,7 +4999,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                             call.setType(TopBannerCustomViewHolder.TYPE_CALL_ANCHOR);
                             mTopBannerList.add(0, call);
                             topBanner1.update(mTopBannerList);
-                            topBanner2.update(mTopBannerList);
+                            if (topBanner2.getVisibility()==View.VISIBLE){
+                                topBanner2.update(mTopBannerList);
+                            }
+
                         }
 
                     }
diff --git a/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java b/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java
index ceb99c7c6..61df9bfd0 100644
--- a/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java
@@ -4,6 +4,7 @@ import android.app.Dialog;
 import android.content.Intent;
 import android.graphics.Color;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
@@ -15,6 +16,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.lxj.xpopup.XPopup;
 import com.lxj.xpopup.core.BasePopupView;
 import com.lxj.xpopup.interfaces.XPopupCallback;
+import com.lzy.okgo.model.Response;
 import com.sahooz.library.Country;
 import com.sahooz.library.CountryPicker;
 import com.sahooz.library.OnPick;
@@ -29,6 +31,7 @@ import com.yunbao.common.bean.UserBean;
 import com.yunbao.common.event.UpdateFieldEvent;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.HttpCallback;
+import com.yunbao.common.http.JsonBean;
 import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.interfaces.ActivityResultCallback;
 import com.yunbao.common.interfaces.CommonCallback;
@@ -128,6 +131,7 @@ public class EditProfileActivity extends AbsActivity {
                     MainHttpUtil.updateAvatar(file, new HttpCallback() {
                         @Override
                         public void onSuccess(int code, String msg, String[] info) {
+                            Log.e("updateAvatar", "code:" + code + " msg:" + msg + "  info[0]:" + info[0].toString());
                             if (code == 0 && info.length > 0) {
                                 ToastUtil.show(R.string.edit_profile_update_avatar_success);
                                 UserBean bean = CommonAppConfig.getInstance().getUserBean();
@@ -150,12 +154,19 @@ public class EditProfileActivity extends AbsActivity {
                                 EventBus.getDefault().post(new UpdateFieldEvent());
                             }
                         }
+
+                        @Override
+                        public void onError(Response<JsonBean> response) {
+                            super.onError(response);
+                            Log.e("updateAvatar", "onFailure");
+                        }
                     });
                 }
             }
 
             @Override
             public void onFailure() {
+
             }
         });
         mUserBean = CommonAppConfig.getInstance().getUserBean();