From 93aa8e55e54c96351d6170f0bc4f99b1b6a1d857 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Sat, 2 Sep 2023 10:10:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=8B=E7=82=B9=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.gradle                                              | 3 ++-
 .../main/java/com/yunbao/live/dialog/LiveGiftPopup.java    | 3 +++
 .../java/com/yunbao/live/views/LiveRoomViewHolder.java     | 1 +
 .../main/java/com/yunbao/main/activity/MainActivity.java   | 1 +
 .../java/com/yunbao/main/views/MainHomeViewHolder.java     | 7 -------
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/config.gradle b/config.gradle
index 5f3bc3427..f96322d1c 100644
--- a/config.gradle
+++ b/config.gradle
@@ -18,7 +18,8 @@ ext {
             //百度语音识别
 
             baiduAppId       : "23774720",
-            baiduAppKey      : "zgCgFhUKEOV7I3ZXDFpTfnRB",
+            baiduAppKey      : "zgCgFhUKEOV7I3ZXDFpTfnR B",
+
             baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
 //            true表示谷歌支付 false
             isGooglePlay     :  false,
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
index 2be645be7..6422a5f6d 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
@@ -325,6 +325,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
                 StringBuffer htmlUrl = new StringBuffer();
                 htmlUrl.append(CommonAppConfig.HOST)
                         .append(liveGiftModel.getOperateUrl())
+                        .append("?uid=")
                         .append(userInfo.getId())
                         .append("&token=")
                         .append(userInfo.getToken())
@@ -799,6 +800,8 @@ public class LiveGiftPopup extends AbsDialogFragment {
         if (!TextUtils.isEmpty(liveGiftModel.getOperateImage())) {
             operateImage.setVisibility(View.VISIBLE);
             ImgLoader.display(getContext(), liveGiftModel.getOperateImage(), operateImage);
+        }else {
+            operateImage.setVisibility(View.GONE);
         }
 
     }
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 1e56d38a0..3909d443e 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -3014,6 +3014,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         } else if (i == R.id.ft_hot_add) {
             ((LiveActivity) mContext).openHotListWindow(1);
         } else if (i == R.id.user_guard) {
+            MobclickAgent.onEvent(mContext, "anchor_avatar_guard", "守护按钮");
             // ((LiveActivity) mContext).openUserMoreListWindow(2, true);
             ((LiveActivity) mContext).openNewGuardListWindow(mContext instanceof LiveRyAnchorActivity);
         }
diff --git a/main/src/main/java/com/yunbao/main/activity/MainActivity.java b/main/src/main/java/com/yunbao/main/activity/MainActivity.java
index a88fdfdac..b5df237a6 100644
--- a/main/src/main/java/com/yunbao/main/activity/MainActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/MainActivity.java
@@ -1010,6 +1010,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
         new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
             @Override
             public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
+                MobclickAgent.onEvent(mContext, "home_page_enter_room", "首页点击直播间");
                 RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal));
             }
 
diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
index 74ad6b9e4..c96c1f535 100644
--- a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
@@ -38,16 +38,9 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
         img_trophy = (ImageView) findViewById(R.id.img_trophy);
 
         ImgLoader.display(mContext, "https://downs.yaoulive.com/gif_trophy.gif", img_trophy);
-        MobclickAgent.onPageStart(mPageName);
 
     }
 
-    @Override
-    public void release() {
-        super.release();
-        MobclickAgent.onPageEnd(mPageName);
-    }
-
     public void setCurPosition(int position) {
         mViewPager.setCurrentItem(position);
     }