修改视频课测试样式问题

BaseLibrary/src/main/java/com/cooleshow/base/utils/UiUtils.java

@@ -293,6 +293,10 @@ public class UiUtils {
         return buyCount + "人已购买";
     }
 
+    public static String getBuyNumTip2(String lessonPrice, String buyCount) {
+        return buyCount + "人已学习";
+    }
+
     public static String getLiveCoursePriceText(String lessonPrice, int lessonCount) {
         String price = "￥" + lessonPrice;
         try {

student/src/main/java/com/cooleshow/student/adapter/VideoCourseListAdapter.java

@@ -1,6 +1,9 @@
 package com.cooleshow.student.adapter;
 
+import android.text.TextUtils;
+import android.view.View;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 
@@ -8,6 +11,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.module.BaseLoadMoreModule;
 import com.chad.library.adapter.base.module.LoadMoreModule;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
+import com.cooleshow.base.constanst.VideoCoursePayType;
 import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.student.R;
@@ -32,16 +36,33 @@ public class VideoCourseListAdapter extends BaseQuickAdapter<SelectMyGroupBean.R
         holder.setText(R.id.tv_title, data.lessonName);
         //头像
         ImageView cir_avatar = holder.getView(R.id.cir_avatar);
-        GlideUtils.INSTANCE.loadImage(getContext(), data.avatar, cir_avatar,R.drawable.icon_teacher_default_head);
+        GlideUtils.INSTANCE.loadImage(getContext(), data.avatar, cir_avatar, R.drawable.icon_teacher_default_head);
         //老师名称
         holder.setText(R.id.tv_author_name, data.userName);
         //声部
-        holder.setText(R.id.course_name,data.lessonSubjectName);
-        //购买人数
-        holder.setText(R.id.tv_buy_num, UiUtils.getBuyNumTip(data.lessonPrice,data.countStudent));
+        holder.setText(R.id.course_name, data.lessonSubjectName);
+
         //￥120/4课时
-        String price= UiUtils.getVideoCoursePriceText(data.lessonPrice, data.lessonCount);
-        holder.setText(R.id.tv_price, price);
+        TextView tv_price = holder.getView(R.id.tv_price);
+        boolean isVipType = TextUtils.equals(data.payType, VideoCoursePayType.VIP.getId());
+        if (isVipType) {
+            tv_price.setText("会员");
+            tv_price.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_c76e21));
+        } else {
+            //收费
+            tv_price.setText(UiUtils.getVideoCoursePriceText2(data.lessonPrice));
+            if (UiUtils.isFree(data.lessonPrice)) {
+                tv_price.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_20bea0));
+            } else {
+                tv_price.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_ff0000));
+            }
+        }
+        TextView tv_price_unit = holder.getView(R.id.tv_price_unit);
+        tv_price_unit.setText(String.format("/%d课时", data.lessonCount));
+
+        TextView tv_buy_num = holder.getView(R.id.tv_buy_num);
+        //购买人数
+        tv_buy_num.setText(UiUtils.getBuyNumTip2(data.lessonPrice, data.countStudent));
     }
 
     @NonNull

student/src/main/java/com/cooleshow/student/bean/SelectMyGroupBean.java

@@ -33,6 +33,8 @@ public class SelectMyGroupBean {
         public int teacherId;
         public String userName;
 
+        public String payType;
+
     }
 
 }

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

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:paddingBottom="12dp"
     android:background="@drawable/bg_white_10dp"
     android:layout_marginTop="12dp">
 
@@ -48,6 +49,8 @@
         android:textColor="@color/color_1a1a1a"
         android:textSize="@dimen/sp_14"
         android:textStyle="bold"
+        android:maxLines="1"
+        android:ellipsize="end"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/iv_bg"
@@ -74,11 +77,14 @@
         android:textSize="@dimen/sp_12"
         android:maxLines="1"
         android:ellipsize="end"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintWidth_default="wrap"
         app:layout_constraintRight_toLeftOf="@+id/view_line2"
         app:layout_constraintBottom_toBottomOf="@+id/cir_avatar"
         app:layout_constraintLeft_toRightOf="@+id/cir_avatar"
         app:layout_constraintTop_toTopOf="@+id/cir_avatar"
-        tools:text="李老师李老师李老师李老师李老师李老师" />
+        tools:text="李" />
 
     <View
         android:id="@+id/view_line2"
@@ -96,29 +102,40 @@
         android:paddingEnd="5dp"
         app:layout_constraintRight_toRightOf="parent"
         android:id="@+id/tv_buy_num"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="6dp"
         android:includeFontPadding="false"
         android:textColor="@color/color_ff802c"
         android:textSize="@dimen/sp_11"
         android:visibility="visible"
+        android:maxLines="1"
         app:layout_constraintBottom_toBottomOf="@+id/view_line2"
         app:layout_constraintLeft_toRightOf="@+id/view_line2"
         app:layout_constraintTop_toTopOf="@+id/view_line2"
-        tools:text="6人已购买" />
+        tools:text="李老师李老师李老师李老师李老师李老师123" />
 
     <TextView
         android:id="@+id/tv_price"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
-        android:paddingBottom="12dp"
+        android:layout_marginTop="5dp"
         android:textColor="@color/color_2dc7aa"
-        android:textSize="@dimen/sp_14"
+        android:textSize="@dimen/sp_16"
         android:textStyle="bold"
         app:layout_constraintLeft_toLeftOf="@+id/cir_avatar"
         app:layout_constraintTop_toBottomOf="@+id/cir_avatar"
-        tools:text="￥120/4课时" />
+        tools:text="￥120" />
 
+
+    <TextView
+        android:id="@+id/tv_price_unit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingStart="5dp"
+        android:text="/4课时"
+        android:textColor="@color/color_999999"
+        android:textSize="@dimen/sp_14"
+        app:layout_constraintBaseline_toBaselineOf="@+id/tv_price"
+        app:layout_constraintLeft_toRightOf="@+id/tv_price" />
 </androidx.constraintlayout.widget.ConstraintLayout>

teacher/src/main/java/com/cooleshow/teacher/adapter/MineVideoCourseAdapter.java

@@ -71,8 +71,8 @@ public class MineVideoCourseAdapter extends BaseQuickAdapter<VideoCourseListBean
 
         //购买人数
         TextView tv_buy_num = helper.getView(R.id.tv_buy_num);
-        tv_buy_num.setText(UiUtils.getBuyNumTip(item.lessonPrice, item.countStudent));
-        if (isVipType || TextUtils.equals(auditStatus, MineVideoCourseActivity.TYPE_DOING)) {
+        tv_buy_num.setText(UiUtils.getBuyNumTip2(item.lessonPrice, item.countStudent));
+        if (TextUtils.equals(auditStatus, MineVideoCourseActivity.TYPE_DOING)) {
             tv_buy_num.setVisibility(View.GONE);
         } else {
             tv_buy_num.setVisibility(View.VISIBLE);

teacher/src/main/java/com/cooleshow/teacher/adapter/VideoCourseListAdapter.java

@@ -60,12 +60,7 @@ public class VideoCourseListAdapter extends BaseQuickAdapter<VideoCourseListBean
         tv_price_unit.setText(String.format("/%d课时", item.lessonCount));
         //购买人数
         TextView tv_buy_num = helper.getView(R.id.tv_buy_num);
-        tv_buy_num.setText(UiUtils.getBuyNumTip(item.lessonPrice, item.countStudent));
-        if (isVipType) {
-            tv_buy_num.setVisibility(View.GONE);
-        } else {
-            tv_buy_num.setVisibility(View.VISIBLE);
-        }
+        tv_buy_num.setText(UiUtils.getBuyNumTip2(item.lessonPrice, item.countStudent));
         //上架状态
         TextView tv_course_status_tip = helper.getView(R.id.tv_course_status_tip);
         tv_course_status_tip.setText("已上架");

teacher/src/main/res/layout/item_video_course_list_layout.xml

@@ -90,7 +90,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginRight="11dp"
-        android:paddingStart="7dp"
+        android:paddingStart="5dp"
         android:text="/4课时"
         android:textColor="@color/color_999999"
         android:textSize="@dimen/sp_14"

teacher/src/main/res/layout/layout_mine_video_course_item.xml

@@ -90,7 +90,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginRight="11dp"
-        android:paddingStart="7dp"
+        android:paddingStart="5dp"
         android:text="/4课时"
         android:textColor="@color/color_999999"
         android:textSize="@dimen/sp_14"