直播间修改底部菜单修改

live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java

@@ -50,6 +50,7 @@ import com.yunbao.common.custom.CommonRefreshView;
 import com.yunbao.common.custom.ItemDecoration;
 import com.yunbao.common.custom.MyViewPager;
 import com.yunbao.common.dialog.LiveChargeDialogFragment;
+import com.yunbao.common.dialog.LiveTotalDialog;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.CommonHttpConsts;
 import com.yunbao.common.http.CommonHttpUtil;
@@ -419,6 +420,8 @@ public class LiveAudienceActivity extends LiveActivity {
 
                     }
                 });
+
+
     }
 
     //定时器
@@ -1381,8 +1384,17 @@ public class LiveAudienceActivity extends LiveActivity {
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onOpenDrawer(LiveAudienceEvent event) {
-        //从右边打开侧边栏
-        drawerLayout.openDrawer(GravityCompat.END);
+        switch (event.getType()) {
+            case SIDEBAR:
+                //从右边打开侧边栏
+                drawerLayout.openDrawer(GravityCompat.END);
+                break;
+            case BOTTOMCOLLECTION:
+                LiveTotalDialog fragment = new LiveTotalDialog();
+                fragment.show(getSupportFragmentManager(), "LiveTotalDialog");
+                break;
+        }
+
     }
 
 }

live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java

@@ -3,4 +3,28 @@ package com.yunbao.live.event;
 import com.yunbao.common.bean.BaseModel;
 
 public class LiveAudienceEvent extends BaseModel {
+    private LiveAudienceType type;
+
+    public LiveAudienceType getType() {
+        return type;
+    }
+
+    public LiveAudienceEvent setType(LiveAudienceType type) {
+        this.type = type;
+        return this;
+    }
+
+    public enum LiveAudienceType {
+        SIDEBAR(1, "侧边栏"),
+        BOTTOMCOLLECTION(2, "底部合集");
+
+        private int type;
+        private String name;
+
+        LiveAudienceType(int type, String name) {
+            this.type = type;
+            this.name = name;
+        }
+
+    }
 }

live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java

@@ -32,13 +32,16 @@ import com.opensource.svgaplayer.SVGAVideoEntity;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.Constants;
 import com.yunbao.common.bean.MsgModel;
+import com.yunbao.common.dialog.LiveTotalDialog;
 import com.yunbao.common.event.MessageIMEvent;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.http.HttpClient;
 import com.yunbao.common.manager.imrongcloud.MessageIMManager;
+import com.yunbao.common.utils.Bus;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveActivity;
 import com.yunbao.live.activity.LiveAudienceActivity;
@@ -46,6 +49,7 @@ import com.yunbao.live.bean.LiveChatBean;
 import com.yunbao.live.dialog.LiveHDDialogFragment;
 import com.yunbao.live.dialog.LiveMicUserDialogFragment;
 import com.yunbao.live.dialog.LivePromotionDialogFragment;
+import com.yunbao.live.event.LiveAudienceEvent;
 import com.yunbao.live.http.LiveHttpUtil;
 
 import org.greenrobot.eventbus.EventBus;
@@ -290,6 +294,15 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
                 }
             }
         });
+        //底部改造
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.total_image), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                Bus.get().post(new LiveAudienceEvent()
+                        .setType(LiveAudienceEvent.LiveAudienceType.BOTTOMCOLLECTION));
+
+            }
+        });
     }
 
     public static Handler handler = new Handler();

live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java

@@ -8,7 +8,6 @@ import android.os.Message;
 import android.os.SystemClock;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
@@ -107,7 +106,7 @@ import static com.yunbao.live.activity.LiveAudienceActivity.countDownTimer;
  * Created by cxf on 2018/10/9.
  * 直播间公共逻辑
  */
-public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickListener{
+public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickListener {
 
     public static Context Contexts;
     private int mOffsetY;
@@ -792,7 +791,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         ft_hot_add = (FrameLayout) findViewById(R.id.ft_hot_add);
         img_hot_gif = (ImageView) findViewById(R.id.img_hot_gif);
         findViewById(R.id.ft_hot_add).setOnClickListener(this);
-        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.open_sidebar), () -> Bus.get().post(new LiveAudienceEvent()));
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.open_sidebar), () -> Bus.get().post(new LiveAudienceEvent()
+                .setType(LiveAudienceEvent.LiveAudienceType.SIDEBAR)));
     }
 
     //点击头像

live/src/main/res/layout/view_live_audience.xml

@@ -112,7 +112,7 @@
                 android:layout_height="80dp"
                 android:layout_gravity="right"
                 android:layout_marginRight="15dp"
-                android:layout_marginBottom="18dp"
+                android:layout_marginBottom="45dp"
                 android:gravity="center_horizontal"
                 android:orientation="vertical">
 
@@ -228,8 +228,8 @@
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_alignParentBottom="true"
-            android:layout_height="45dp">
+            android:layout_height="45dp"
+            android:layout_alignParentBottom="true">
 
             <ImageView
                 android:id="@+id/btn_close"
@@ -252,7 +252,8 @@
                 android:adjustViewBounds="true"
                 android:background="@mipmap/img_bg"
                 android:padding="5dp"
-                android:src="@mipmap/zg" />
+                android:src="@mipmap/zg"
+                android:visibility="gone" />
 
 
             <RelativeLayout
@@ -260,7 +261,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_toLeftOf="@id/btn_zg">
+                android:layout_toLeftOf="@id/btn_zg"
+                android:visibility="gone">
 
                 <ImageView
                     android:layout_width="32dp"
@@ -300,7 +302,8 @@
                 android:layout_toLeftOf="@id/btn_close"
                 android:adjustViewBounds="true"
                 android:background="@mipmap/img_bg"
-                android:src="@mipmap/live_lw" />
+                android:src="@mipmap/live_lw"
+                android:visibility="gone" />
 
             <ImageView
                 android:id="@+id/btn_link_mic"
@@ -318,7 +321,8 @@
                 android:layout_centerVertical="true"
                 android:layout_marginRight="5dp"
                 android:layout_toLeftOf="@id/btn_mic"
-                android:src="@mipmap/live_user_more" />
+                android:src="@mipmap/live_user_more"
+                android:visibility="gone" />
 
 
             <ImageView
@@ -328,14 +332,58 @@
                 android:layout_centerVertical="true"
                 android:layout_marginRight="5dp"
                 android:layout_toLeftOf="@id/btn_zg1"
-                android:src="@mipmap/lianmai" />
+                android:src="@mipmap/lianmai"
+                android:visibility="gone" />
+
+
+            <ImageView
+                android:id="@+id/btn_red_pack"
+                android:layout_width="0dp"
+                android:layout_height="40dp"
+                android:layout_marginRight="5dp"
+                android:layout_toLeftOf="@id/btn_link_mic"
+                android:padding="5dp"
+                android:src="@mipmap/icon_live_red_pack"
+                android:visibility="gone" />
+
+
+            <LinearLayout
+                android:id="@+id/message_layout"
+                android:layout_width="133dp"
+                android:layout_height="30dp"
+                android:layout_centerVertical="true"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="5dp"
+                android:background="@drawable/bg_live_chat"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="25dp"
+                    android:layout_height="25dp"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="5dp"
+                    android:src="@mipmap/icon_live_msg" />
+
+                <TextView
+                    android:id="@+id/et_input"
+                    android:layout_width="match_parent"
+                    android:layout_height="30dp"
+                    android:alpha="0.5"
+                    android:gravity="center_vertical"
+                    android:hint="@string/live_say_something"
+                    android:singleLine="true"
+                    android:textColor="@color/textColor"
+                    android:textColorHint="@color/gray3"
+                    android:textSize="12sp" />
+
+            </LinearLayout>
 
             <RelativeLayout
                 android:id="@+id/msg_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_toLeftOf="@id/btn_more">
+                android:layout_toEndOf="@id/message_layout">
 
                 <RelativeLayout
                     android:id="@+id/rt_msg"
@@ -385,48 +433,34 @@
             </RelativeLayout>
 
             <ImageView
-                android:id="@+id/btn_red_pack"
-                android:layout_width="0dp"
+                android:id="@+id/total_image"
+                android:layout_width="40dp"
                 android:layout_height="40dp"
-                android:layout_marginRight="5dp"
-                android:layout_toLeftOf="@id/btn_link_mic"
-                android:padding="5dp"
-                android:src="@mipmap/icon_live_red_pack" />
-
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="30dp"
                 android:layout_centerVertical="true"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="5dp"
-                android:layout_marginRight="15dp"
-                android:layout_toLeftOf="@+id/msg_view"
-                android:background="@drawable/bg_live_chat"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:layout_width="25dp"
-                    android:layout_height="25dp"
-                    android:layout_gravity="center"
-                    android:layout_marginLeft="5dp"
-                    android:src="@mipmap/icon_live_msg" />
-
-                <TextView
-                    android:id="@+id/et_input"
-                    android:layout_width="match_parent"
-                    android:layout_height="30dp"
-                    android:alpha="0.5"
-                    android:gravity="center_vertical"
-                    android:hint="@string/live_say_something"
-                    android:singleLine="true"
-                    android:textColor="@color/textColor"
-                    android:textColorHint="@color/gray3"
-                    android:textSize="12sp" />
-
-            </LinearLayout>
+                android:layout_toEndOf="@+id/msg_view"
+                android:padding="5dp"
+                android:src="@mipmap/live_icon_more" />
 
 
+            <ImageView
+                android:id="@+id/gift_image"
+                android:layout_width="38dp"
+                android:layout_height="38dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="10dp"
+                android:layout_marginBottom="5dp"
+                android:src="@mipmap/live_lw" />
+
+            <ImageView
+                android:id="@+id/live_new_people"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="16dp"
+                android:layout_toStartOf="@id/gift_image"
+                android:padding="4dp"
+                android:src="@mipmap/live_icon_new_people_cn" />
         </RelativeLayout>