修改学生端直播间UI

BaseLibrary/src/main/res/values/colors.xml

@@ -96,6 +96,7 @@
     <color name="color_f97215">#F97215</color>
     <color name="color_ff4444">#FF4444</color>
     <color name="color_808080">#808080</color>
+    <color name="color_416fff">#416FFF</color>
 
     <color name="color_25292e">#25292E</color>
     <color name="color_F8F8F8">#F8F8F8</color>

student/src/main/java/com/cooleshow/student/ui/live/LiveRoomActivity.java

@@ -29,7 +29,9 @@ import android.widget.Toast;
 
 import com.airbnb.lottie.LottieAnimationView;
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.bumptech.glide.Glide;
+import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
@@ -279,6 +281,10 @@ public class LiveRoomActivity extends BaseMVPActivity<ActivityLiveroomLayoutBind
         mViewLiveStatus.setOnClickListener(this);
         mViewShopCarAnim.setOnClickListener(this);
         mFlLiveView.setOnClickListener(this);
+        viewBinding.tvAppointmentCourse.setOnClickListener(this);
+        viewBinding.tvLiveCourse.setOnClickListener(this);
+        viewBinding.tvVideoCourse.setOnClickListener(this);
+        viewBinding.tvMusicSheet.setOnClickListener(this);
     }
 
     @Override
@@ -419,18 +425,10 @@ public class LiveRoomActivity extends BaseMVPActivity<ActivityLiveroomLayoutBind
         }
 
         if (id == R.id.view_shop_car_anim) {
-            if (liveIsFinish) {
-                ToastUtil.getInstance().show(LiveRoomActivity.this, "直播已结束");
-                return;
-            }
-            //购物车
-            if (isFullScreen()) {
-                changeOrientation();
-                android.os.Message message = android.os.Message.obtain();
-                message.what = OPEN_SHOP_CAR_DIALOG;
-                mHandler.sendMessageDelayed(message, 500);
+            if (viewBinding.llShopCarMenu.getVisibility() != View.VISIBLE) {
+                viewBinding.llShopCarMenu.setVisibility(View.VISIBLE);
             } else {
-                showShopCarDialog();
+                viewBinding.llShopCarMenu.setVisibility(View.GONE);
             }
             return;
         }
@@ -443,6 +441,33 @@ public class LiveRoomActivity extends BaseMVPActivity<ActivityLiveroomLayoutBind
             }
             return;
         }
+
+        if (id == R.id.tv_appointment_course || id == R.id.tv_live_course
+                || id == R.id.tv_video_course || id == R.id.tv_music_sheet) {
+            //约课 直播课 视频课 曲谱
+            startTeacherHomePage(id);
+            return;
+        }
+    }
+
+    private void startTeacherHomePage(int viewId) {
+        String params = "";
+        if (viewId == R.id.tv_appointment_course) {
+            params = "practice";
+        }
+        if (viewId == R.id.tv_live_course) {
+            params = "live";
+        }
+        if (viewId == R.id.tv_video_course) {
+            params = "video";
+        }
+        if (viewId == R.id.tv_music_sheet) {
+            params = "music";
+        }
+        ARouter.getInstance()
+                .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                .withString(WebConstants.WEB_URL, WebConstants.STUDENT_TEACHER_HOME + mRoomInfoBean.speakerId + "&tabs=" + params)
+                .navigation();
     }
 
 

student/src/main/res/layout/activity_liveroom_layout.xml

@@ -251,6 +251,7 @@
         app:layout_constraintRight_toLeftOf="@+id/iv_mic"
         app:layout_constraintTop_toTopOf="@+id/icon_add_like" />
 
+
     <ImageView
         android:id="@+id/icon_add_like"
         android:layout_width="wrap_content"
@@ -272,11 +273,11 @@
         app:layout_constraintTop_toTopOf="@+id/icon_add_like" />
 
     <View
-        android:visibility="invisible"
         android:id="@+id/view_center"
         android:layout_width="1px"
         android:layout_height="1px"
         android:layout_marginTop="50dp"
+        android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -332,9 +333,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="11dp"
+        android:layout_marginBottom="10dp"
         android:background="@drawable/shape_live_barrage_for_snap_up_msg"
         android:paddingStart="10dp"
-        android:layout_marginBottom="10dp"
         android:paddingTop="3dp"
         android:paddingEnd="10dp"
         android:paddingBottom="3dp"
@@ -354,6 +355,68 @@
 
     </FrameLayout>
 
+
+    <LinearLayout
+        android:id="@+id/ll_shop_car_menu"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:background="@drawable/bg_live_shop_car_menu"
+        android:orientation="vertical"
+        android:paddingTop="10dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/iv_shop_car"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_shop_car"
+        app:layout_constraintRight_toRightOf="@+id/iv_shop_car">
+
+        <TextView
+            android:id="@+id/tv_appointment_course"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:background="@drawable/bg_live_shop_car_item"
+            android:gravity="center"
+            android:text="约课"
+            android:textColor="@color/color_416fff"
+            android:textSize="@dimen/sp_13" />
+
+        <TextView
+            android:id="@+id/tv_live_course"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="7dp"
+            android:background="@drawable/bg_live_shop_car_item"
+            android:gravity="center"
+            android:text="直播课"
+            android:textColor="@color/color_416fff"
+            android:textSize="@dimen/sp_13" />
+
+        <TextView
+            android:id="@+id/tv_video_course"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="7dp"
+            android:background="@drawable/bg_live_shop_car_item"
+            android:gravity="center"
+            android:text="视频课"
+            android:textColor="@color/color_416fff"
+            android:textSize="@dimen/sp_13" />
+
+        <TextView
+            android:id="@+id/tv_music_sheet"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="7dp"
+            android:background="@drawable/bg_live_shop_car_item"
+            android:gravity="center"
+            android:text="乐谱"
+            android:textColor="@color/color_416fff"
+            android:textSize="@dimen/sp_13" />
+    </LinearLayout>
+
     <androidx.constraintlayout.widget.Group
         android:id="@+id/group_views"
         android:layout_width="wrap_content"