Browse Source

修复bug

Pq 3 years ago
parent
commit
98cb86c427

+ 2 - 0
BaseLibrary/src/main/java/com/cooleshow/base/common/WebConstants.java

@@ -82,6 +82,8 @@ public abstract class WebConstants {
     public static final String HELP_CENTER = getBaseUrlH5() + "/#/helpCenter";
     //视频课创建
     public static final String TEACHER_VIDEO_CREATE = getBaseUrlH5() + "/#/videoCreate";
+
+    public static final String TEACHER_VIDEO_EDIT = getBaseUrlH5() + "/#/videoCreate?groupId=%s";
     //视频课详情
     public static final String TEACHER_VIDEO_DETAIL = getBaseUrlH5() + "/#/videoDetail";
     //修改视频课

+ 12 - 9
teacher/src/main/java/com/cooleshow/teacher/adapter/MineVideoCourseAdapter.java

@@ -1,5 +1,6 @@
 package com.cooleshow.teacher.adapter;
 
+import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -32,22 +33,24 @@ public class MineVideoCourseAdapter extends BaseQuickAdapter<VideoCourseListBean
 
     @Override
     protected void convert(BaseViewHolder helper, VideoCourseListBean.RowsBean item) {
-        if(item == null){
+        if (item == null) {
             return;
         }
-        helper.setText(R.id.course_name,item.lessonSubjectName);
+        helper.setText(R.id.course_name, item.lessonSubjectName);
         ImageView im_pic = helper.getView(R.id.im_pic);
         GlideUtils.INSTANCE.loadImage(getContext(), item.lessonCoverUrl, im_pic);
-        TextView tv_title=helper.getView(R.id.tv_title);
+        TextView tv_title = helper.getView(R.id.tv_title);
         tv_title.setText(item.lessonName);
-        ImageView im_header=helper.getView(R.id.im_header);
-        TextView  tv_teacher_name=helper.getView(R.id.tv_teacher_name);
+        ImageView im_header = helper.getView(R.id.im_header);
+        GlideUtils.INSTANCE.loadImage(getContext(), item.avatar, im_header);
+        TextView tv_teacher_name = helper.getView(R.id.tv_teacher_name);
         tv_teacher_name.setText(item.username);
-//        GlideUtils.INSTANCE.loadImage(getContext(), item.avatar, im_header,R.drawable.icon_teacher_default_head);
-        TextView tv_price=helper.getView(R.id.tv_price);
-//        tv_price.setText("¥"+item.coursePrice+"/"+item.courseNum+"课时");
+        TextView tv_price = helper.getView(R.id.tv_price);
         String price = "¥" + item.lessonPrice + "/" + item.lessonCount + "课时";
-        tv_price.setText( price);
+        tv_price.setText(price);
+        TextView tv_buy_num = helper.getView(R.id.tv_buy_num);
+        tv_buy_num.setText(item.countStudent + "人已购买");
+
     }
 
     @NonNull

+ 12 - 4
teacher/src/main/java/com/cooleshow/teacher/ui/course/MineVideoCourseFragment.java

@@ -108,10 +108,18 @@ public class MineVideoCourseFragment extends BaseMVPFragment<FragmentMineVideoCo
         mViewBinding.tvOpen.setOnClickListener(this);
         mineVideoCourseAdapter.setOnItemClickListener((adapter, view, position) -> {
             VideoCourseListBean.RowsBean item = (VideoCourseListBean.RowsBean) adapter.getItem(position);
-            ARouter.getInstance()
-                    .build(RouterPath.WebCenter.ACTIVITY_HTML)
-                    .withString(WebConstants.WEB_URL, WebConstants.TEACHER_VIDEO_DETAIL + "?groupId=" + item.id)
-                    .navigation();
+            if (TextUtils.equals(auditStatus, "UNPASS")) {
+                //审核失败的跳转编辑页面
+                ARouter.getInstance()
+                        .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                        .withString(WebConstants.WEB_URL, String.format(WebConstants.TEACHER_VIDEO_EDIT, item.id))
+                        .navigation();
+            } else {
+                ARouter.getInstance()
+                        .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                        .withString(WebConstants.WEB_URL, WebConstants.TEACHER_VIDEO_DETAIL + "?groupId=" + item.id)
+                        .navigation();
+            }
         });
     }
 

+ 56 - 20
teacher/src/main/res/layout/layout_mine_video_course_item.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:layout_height="wrap_content">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -21,30 +21,35 @@
             app:layout_constraintTop_toTopOf="parent"
             app:qmui_corner_radius="5dp" />
 
-         <TextView
-             android:id="@+id/course_name"
-             android:textColor="@color/white"
-             android:textSize="@dimen/sp_9"
-             android:gravity="center"
-             android:layout_marginLeft="@dimen/dp_5"
-             android:layout_marginTop="@dimen/dp_7"
-             android:background="@drawable/gray_1_radius_bg"
-             app:layout_constraintLeft_toLeftOf="@+id/im_pic"
-             app:layout_constraintTop_toTopOf="@+id/im_pic"
-             android:paddingRight="@dimen/dp_4"
-             android:paddingLeft="@dimen/dp_4"
-             android:layout_width="wrap_content"
-             android:layout_height="@dimen/dp_13"/>
         <TextView
-            android:id="@+id/tv_title"
+            android:id="@+id/course_name"
             android:layout_width="wrap_content"
+            android:layout_height="@dimen/dp_13"
+            android:layout_marginLeft="@dimen/dp_5"
+            android:layout_marginTop="@dimen/dp_7"
+            android:background="@drawable/gray_1_radius_bg"
+            android:gravity="center"
+            android:paddingLeft="@dimen/dp_4"
+            android:paddingRight="@dimen/dp_4"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_9"
+            app:layout_constraintLeft_toLeftOf="@+id/im_pic"
+            app:layout_constraintTop_toTopOf="@+id/im_pic" />
+
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginLeft="11dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="11dp"
+            android:includeFontPadding="false"
             android:lines="1"
             android:text="从零开始学竖笛视频课"
             android:textColor="@color/color_1a1a1a"
             android:textSize="@dimen/sp_14"
             app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/im_pic" />
 
         <de.hdodenhof.circleimageview.CircleImageView
@@ -60,15 +65,46 @@
 
         <TextView
             android:id="@+id/tv_teacher_name"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginLeft="6dp"
-            tools:text="李老师"
+            android:ellipsize="end"
+            android:maxLines="1"
             android:textColor="@color/color_999999"
             android:textSize="@dimen/sp_12"
             app:layout_constraintBottom_toBottomOf="@+id/im_header"
             app:layout_constraintLeft_toRightOf="@+id/im_header"
-            app:layout_constraintTop_toTopOf="@+id/im_header" />
+            app:layout_constraintRight_toLeftOf="@+id/view_line2"
+            app:layout_constraintTop_toTopOf="@+id/im_header"
+            tools:text="李老师李老师李老师李老师李老师李老师李老师李老师李老师李老师" />
+
+        <View
+            android:id="@+id/view_line2"
+            android:layout_width="1dp"
+            android:layout_height="11dp"
+            android:layout_marginStart="6dp"
+            android:background="@color/color_d3d3d3"
+            android:visibility="visible"
+            app:layout_constraintBottom_toBottomOf="@+id/tv_teacher_name"
+            app:layout_constraintLeft_toRightOf="@+id/tv_teacher_name"
+            app:layout_constraintRight_toLeftOf="@+id/tv_buy_num"
+            app:layout_constraintTop_toTopOf="@+id/tv_teacher_name" />
+
+        <TextView
+            android:id="@+id/tv_buy_num"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:includeFontPadding="false"
+            android:text="0人已购买"
+            android:textColor="@color/color_ff802c"
+            android:textSize="@dimen/sp_11"
+            android:visibility="visible"
+            app:layout_constraintBottom_toBottomOf="@+id/view_line2"
+            app:layout_constraintLeft_toRightOf="@+id/view_line2"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/view_line2"
+            tools:text="6人已购买" />
 
         <TextView
             android:id="@+id/tv_price"