From 43ac37b9e929e08deaca115d285342bf15cd80d9 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Thu, 1 Sep 2022 13:28:30 +0800
Subject: [PATCH] =?UTF-8?q?add:=E7=9B=B4=E6=92=AD=E9=97=B4=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E5=90=88=E9=9B=86=E6=96=B0=E5=A2=9E=E4=B8=BE=E6=8A=A5?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/view_live_total.xml   |  21 ++++++++++++++++++
 .../mipmap-xxhdpi/live_more_icon_report.png   | Bin 0 -> 5374 bytes
 .../live/activity/LiveAudienceActivity.java   |   4 ++++
 .../yunbao/live/dialog/LiveTotalDialog.java   |  16 +++++++++++--
 .../yunbao/live/event/LiveAudienceEvent.java  |   3 ++-
 5 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 common/src/main/res/mipmap-xxhdpi/live_more_icon_report.png

diff --git a/common/src/main/res/layout/view_live_total.xml b/common/src/main/res/layout/view_live_total.xml
index 5408563cc..58178fddf 100644
--- a/common/src/main/res/layout/view_live_total.xml
+++ b/common/src/main/res/layout/view_live_total.xml
@@ -207,6 +207,27 @@
                 android:textColor="#FF9A9A9A"
                 android:textSize="12sp" />
         </LinearLayout>
+        <LinearLayout
+            android:id="@+id/report_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="23dp"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:src="@mipmap/live_more_icon_report" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                android:text="@string/report"
+                android:textColor="#FF9A9A9A"
+                android:textSize="12sp" />
+        </LinearLayout>
     </LinearLayout>
 
 
diff --git a/common/src/main/res/mipmap-xxhdpi/live_more_icon_report.png b/common/src/main/res/mipmap-xxhdpi/live_more_icon_report.png
new file mode 100644
index 0000000000000000000000000000000000000000..914b4cfae4d19ec56017a4f6b961c28d358418a6
GIT binary patch
literal 5374
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

literal 0
HcmV?d00001

diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
index 9c84145ca..22166c9b8 100644
--- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
@@ -624,6 +624,7 @@ public class LiveAudienceActivity extends LiveActivity {
                 break;
             case BOTTOM_COLLECTION:
                 LiveTotalDialog liveTotalDialog = new LiveTotalDialog();
+                liveTotalDialog.setAnchorBean(mLiveBean);
                 liveTotalDialog.show(getSupportFragmentManager(), "LiveTotalDialog");
                 break;
             case GIFT_POPUP:
@@ -767,6 +768,9 @@ public class LiveAudienceActivity extends LiveActivity {
 //                verticalViewPager.setCurrentItem(0);
                 getDrawer();
                 break;
+            case REPORT:
+                LiveReportActivity.forward(mContext, event.getBean().getUid());
+                break;
 
         }
 
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveTotalDialog.java b/live/src/main/java/com/yunbao/live/dialog/LiveTotalDialog.java
index 5d0e6170b..81850c1b7 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveTotalDialog.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveTotalDialog.java
@@ -15,8 +15,8 @@ import com.yunbao.common.dialog.AbsDialogFragment;
 import com.yunbao.common.http.base.HttpCallback;
 import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.utils.Bus;
-import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
+import com.yunbao.live.bean.LiveBean;
 import com.yunbao.live.event.LiveAudienceEvent;
 
 import org.greenrobot.eventbus.Subscribe;
@@ -30,6 +30,7 @@ import java.util.List;
 public class LiveTotalDialog extends AbsDialogFragment {
     private RecyclerView funGamesList;
     private FunGamesAdapter gamesAdapter;
+    private LiveBean anchorBean;//主播bean
 
     @Override
     protected int getLayoutId() {
@@ -46,6 +47,10 @@ public class LiveTotalDialog extends AbsDialogFragment {
         return true;
     }
 
+    public void setAnchorBean(LiveBean anchorBean) {
+        this.anchorBean = anchorBean;
+    }
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
@@ -109,11 +114,18 @@ public class LiveTotalDialog extends AbsDialogFragment {
                 }
         );
         //活动中心
-        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.activity_center),()->{
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.activity_center), () -> {
             Bus.get().post(new LiveAudienceEvent()
                     .setType(LiveAudienceEvent.LiveAudienceType.ACTIVITY_CENTER));
             dismiss();
         });
+        //举报
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.report_layout), () -> {
+            Bus.get().post(new LiveAudienceEvent()
+                    .setBean(anchorBean)
+                    .setType(LiveAudienceEvent.LiveAudienceType.REPORT));
+            dismiss();
+        });
     }
 
     @Override
diff --git a/live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java b/live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java
index 0626a282d..abd971209 100644
--- a/live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java
+++ b/live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java
@@ -113,7 +113,8 @@ public class LiveAudienceEvent extends BaseModel {
         OPEN_PARAMETERS(12, "开放参数"),
         ACTIVITY_CENTER(13, "活動中心"),
         LIVE_ROOM_EXCEPTION(14, "直播间异常"),
-        REFRESH_THE_LIVEl_PAGE(15, "刷新直播页面");
+        REFRESH_THE_LIVEl_PAGE(15, "刷新直播页面"),
+        REPORT(16, "舉報");
 
         private int type;
         private String name;