修改直播间购物车流程

tclive/src/main/java/com/daya/tclive/ui/TCStudentLiveRoomActivity.java

@@ -580,6 +580,11 @@ public class TCStudentLiveRoomActivity extends BaseMVPActivity<AcTtLiveroomLayou
         viewBinding.flVideoContainer.setOnClickListener(this);
         viewBinding.ivVoiceSwitch.setOnClickListener(this);
         viewBinding.viewLiveStatus.tvRetry.setOnClickListener(this);
+        viewBinding.tvAppointmentCourse.setOnClickListener(this);
+        viewBinding.tvLiveCourse.setOnClickListener(this);
+        viewBinding.tvVideoCourse.setOnClickListener(this);
+        viewBinding.tvMusicSheet.setOnClickListener(this);
+        viewBinding.ivAvatar.setOnClickListener(this);
     }
 
     @Override
@@ -647,15 +652,21 @@ public class TCStudentLiveRoomActivity extends BaseMVPActivity<AcTtLiveroomLayou
                 ToastUtil.getInstance().show(TCStudentLiveRoomActivity.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);
+            }
+//            //购物车
+//            if (isFullScreen()) {
+//                changeOrientation();
+//                android.os.Message message = android.os.Message.obtain();
+//                message.what = OPEN_SHOP_CAR_DIALOG;
+//                mHandler.sendMessageDelayed(message, 500);
+//            } else {
+//                showShopCarDialog();
+//            }
             return;
         }
 
@@ -685,6 +696,47 @@ public class TCStudentLiveRoomActivity extends BaseMVPActivity<AcTtLiveroomLayou
             play();
             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);
+            sendShowFloatWindowAction(SEND_JUMP_OTHER_PAGE_MSG);
+            return;
+        }
+
+        if (id == R.id.iv_avatar) {
+            //跳转老师主页
+            if (roomInfo != null) {
+                ARouter.getInstance()
+                        .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                        .withString(WebConstants.WEB_URL, WebConstants.STUDENT_TEACHER_HOME + roomInfo.speakerId)
+                        .navigation();
+            }
+            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";
+        }
+        if (roomInfo != null) {
+            ARouter.getInstance()
+                    .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                    .withString(WebConstants.WEB_URL, WebConstants.STUDENT_TEACHER_HOME + roomInfo.speakerId + "&tabs=" + params)
+                    .navigation();
+        }
     }
 
     @SuppressLint("CheckResult")
@@ -2036,15 +2088,15 @@ public class TCStudentLiveRoomActivity extends BaseMVPActivity<AcTtLiveroomLayou
 //                }
 //            }
 
-            if (TextUtils.isEmpty(roomInfo.getShopCarUrl())) {
-                //隐藏购物车
-                mViewShopCarAnim.setVisibility(View.GONE);
-                mIvShopCar.setVisibility(View.GONE);
-            } else {
-                //显示购物车
-                mViewShopCarAnim.setVisibility(View.VISIBLE);
-                mIvShopCar.setVisibility(View.INVISIBLE);
-            }
+//            if (TextUtils.isEmpty(roomInfo.getShopCarUrl())) {
+//                //隐藏购物车
+//                mViewShopCarAnim.setVisibility(View.GONE);
+//                mIvShopCar.setVisibility(View.GONE);
+//            } else {
+//                //显示购物车
+//                mViewShopCarAnim.setVisibility(View.VISIBLE);
+//                mIvShopCar.setVisibility(View.INVISIBLE);
+//            }
             //黑名单模式
             isEnableAll = roomInfo.blacklistFlag == 1;//1是黑名单 0否
             updateInputTip();

tclive/src/main/res/layout/ac_tt_liveroom_layout.xml

@@ -425,6 +425,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"