修改价格显示问题

student/src/main/java/com/cooleshow/student/ui/course/GroupCourseGroupDetailActivity.java

@@ -252,6 +252,9 @@ public class GroupCourseGroupDetailActivity extends BaseMVPActivity<AcGroupCours
 
         //价格
         viewBinding.tvPrice.setText(UiUtils.getLiveCoursePriceTextForStu(bean.getCoursePrice()));
+        boolean isFree = UiUtils.isFree(bean.getCoursePrice());
+        viewBinding.tvPriceSymbol.setVisibility(isFree ? View.GONE : View.VISIBLE);
+
 
         viewBinding.tvPriceUnit.setText(String.format("/%d课时", bean.getCourseNum()));
 

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

@@ -258,13 +258,22 @@
                             android:textStyle="bold"
                             app:layout_constraintBaseline_toBaselineOf="@+id/tv_course_completed_title"
                             app:layout_constraintLeft_toRightOf="@+id/tv_course_total_title" />
-
+                        <TextView
+                            android:id="@+id/tv_price_symbol"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="¥"
+                            android:textColor="@color/color_f44541"
+                            android:textSize="@dimen/sp_14"
+                            android:textStyle="bold"
+                            app:layout_constraintBaseline_toBaselineOf="@+id/tv_price"
+                            app:layout_constraintRight_toLeftOf="@+id/tv_price" />
 
                         <TextView
                             android:id="@+id/tv_price"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="￥120"
+                            tools:text="120"
                             android:textColor="@color/color_f44541"
                             android:textSize="@dimen/sp_20"
                             android:textStyle="bold"

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

@@ -1,6 +1,7 @@
 package com.cooleshow.teacher.adapter;
 
 import android.text.TextUtils;
+import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -59,6 +60,9 @@ public class GroupCourseListAdapter extends BaseQuickAdapter<MineLiveCourseListB
         TextView tv_price_unit = holder.getView(R.id.tv_price_unit);
         tv_price.setText(UiUtils.getLiveCoursePriceText(data.coursePrice, data.courseNum));
         tv_price_unit.setText(String.format("/%d课时", data.courseNum));
+        boolean isFree = UiUtils.isFree(data.getCoursePrice());
+        View tv_price_symbol = holder.getView(R.id.tv_price_symbol);
+        tv_price_symbol.setVisibility(isFree ? View.GONE : View.VISIBLE);
     }
 
     @NonNull

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

@@ -15,6 +15,7 @@ import com.cooleshow.base.utils.TimeUtils;
 import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.MineLiveCourseListBean;
+import com.cooleshow.teacher.ui.course.MineGroupCourseActivity;
 import com.cooleshow.teacher.ui.course.MineLiveCourseActivity;
 
 import androidx.annotation.NonNull;
@@ -57,17 +58,22 @@ public class MineGroupCourseAdapter extends BaseQuickAdapter<MineLiveCourseListB
 
         //学生购买人数
         TextView tv_student_count = helper.getView(R.id.tv_buy_num);
-        tv_student_count.setText(UiUtils.getBuyNumTip(item.coursePrice, String.valueOf(item.studentCount)));
-        if (TextUtils.equals(type, MineLiveCourseActivity.TYPE_NOT_SALE)) {
-            tv_student_count.setVisibility(View.INVISIBLE);
-        } else {
             tv_student_count.setVisibility(View.VISIBLE);
+        if (TextUtils.equals(type, MineGroupCourseActivity.TYPE_ING)|| TextUtils.equals(type, MineGroupCourseActivity.TYPE_COMPLETE)) {
+            tv_student_count.setText(UiUtils.getBuyNumTip(item.coursePrice, String.valueOf(item.getStudentCount())));
+        } else {
+            String tip = String.format("剩余%d个名额", item.getMaxStudentNum() - item.getStudentCount());
+            tv_student_count.setText(tip);
         }
         //课程价格
         TextView tv_price = helper.getView(R.id.tv_price);
         tv_price.setText(UiUtils.getLiveCoursePriceText(item.coursePrice, item.courseNum));
         TextView tv_price_unit = helper.getView(R.id.tv_price_unit);
         tv_price_unit.setText(String.format("/%d课时", item.courseNum));
+        boolean isFree = UiUtils.isFree(item.getCoursePrice());
+        View tv_price_symbol = helper.getView(R.id.tv_price_symbol);
+        tv_price_symbol.setVisibility(isFree ? View.GONE : View.VISIBLE);
+
         //声部
         helper.setText(R.id.tv_course_name, item.subjectName);
 

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

@@ -70,6 +70,10 @@ public class MineLiveCourseAdapter extends BaseQuickAdapter<MineLiveCourseListBe
         tv_price.setText(UiUtils.getLiveCoursePriceText(item.coursePrice, item.courseNum));
         TextView tv_price_unit = helper.getView(R.id.tv_price_unit);
         tv_price_unit.setText(String.format("/%d课时", item.courseNum));
+        boolean isFree = UiUtils.isFree(item.getCoursePrice());
+        View tv_price_symbol = helper.getView(R.id.tv_price_symbol);
+        tv_price_symbol.setVisibility(isFree ? View.GONE : View.VISIBLE);
+
         //声部
         helper.setText(R.id.tv_course_name, item.subjectName);
 

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

@@ -60,6 +60,9 @@ public class MineLiveCourseListAdapter extends BaseQuickAdapter<MineLiveCourseLi
         TextView tv_price_unit = holder.getView(R.id.tv_price_unit);
         tv_price.setText(UiUtils.getLiveCoursePriceText(data.coursePrice, data.courseNum));
         tv_price_unit.setText(String.format("/%d课时", data.courseNum));
+        boolean isFree = UiUtils.isFree(data.getCoursePrice());
+        View tv_price_symbol = holder.getView(R.id.tv_price_symbol);
+        tv_price_symbol.setVisibility(isFree ? View.GONE : View.VISIBLE);
     }
 
     @NonNull

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

@@ -83,7 +83,7 @@ public class MineVideoCourseAdapter extends BaseQuickAdapter<VideoCourseListBean
         TextView tv_buy_num = helper.getView(R.id.tv_buy_num);
         tv_buy_num.setText(UiUtils.getBuyNumTip2(item.lessonPrice, item.countStudent));
         if (TextUtils.equals(auditStatus, MineVideoCourseActivity.TYPE_DOING)) {
-            tv_buy_num.setVisibility(View.GONE);
+            tv_buy_num.setVisibility(View.INVISIBLE);
         } else {
             tv_buy_num.setVisibility(View.VISIBLE);
         }

teacher/src/main/java/com/cooleshow/teacher/ui/course/GroupCourseGroupDetailActivity.java

@@ -227,6 +227,9 @@ public class GroupCourseGroupDetailActivity extends BaseMVPActivity<AcGroupCours
 
         //价格
         viewBinding.tvPrice.setText(UiUtils.getLiveCoursePriceTextForStu(bean.getCoursePrice()));
+        boolean isFree = UiUtils.isFree(bean.getCoursePrice());
+        viewBinding.tvPriceSymbol.setVisibility(isFree ? View.GONE : View.VISIBLE);
+
 
         viewBinding.tvPriceUnit.setText(String.format("/%d课时", bean.getCourseNum()));
 

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

@@ -258,12 +258,22 @@
                             app:layout_constraintBaseline_toBaselineOf="@+id/tv_course_completed_title"
                             app:layout_constraintLeft_toRightOf="@+id/tv_course_total_title" />
 
+                        <TextView
+                            android:id="@+id/tv_price_symbol"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="¥"
+                            android:textColor="@color/color_f44541"
+                            android:textSize="@dimen/sp_14"
+                            android:textStyle="bold"
+                            app:layout_constraintBaseline_toBaselineOf="@+id/tv_price"
+                            app:layout_constraintRight_toLeftOf="@+id/tv_price" />
 
                         <TextView
                             android:id="@+id/tv_price"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="￥120"
+                            tools:text="120"
                             android:textColor="@color/color_f44541"
                             android:textSize="@dimen/sp_20"
                             android:textStyle="bold"

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

@@ -121,12 +121,23 @@
         app:layout_constraintTop_toBottomOf="@+id/tv_des"
         tools:text="6人已购买" />
 
+    <TextView
+        android:id="@+id/tv_price_symbol"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="¥"
+        android:textColor="@color/color_f44541"
+        android:textSize="@dimen/sp_14"
+        android:textStyle="bold"
+        app:layout_constraintBaseline_toBaselineOf="@+id/tv_price"
+        app:layout_constraintRight_toLeftOf="@+id/tv_price" />
+
 
     <TextView
         android:id="@+id/tv_price"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="￥120"
+        tools:text="120"
         android:textColor="@color/color_f44541"
         android:textSize="@dimen/sp_20"
         android:textStyle="bold"

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

@@ -121,12 +121,22 @@
         app:layout_constraintTop_toBottomOf="@+id/tv_des"
         tools:text="6人已购买" />
 
+    <TextView
+        android:id="@+id/tv_price_symbol"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="¥"
+        android:textColor="@color/color_f44541"
+        android:textSize="@dimen/sp_14"
+        android:textStyle="bold"
+        app:layout_constraintBaseline_toBaselineOf="@+id/tv_price"
+        app:layout_constraintRight_toLeftOf="@+id/tv_price" />
 
     <TextView
         android:id="@+id/tv_price"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="￥120"
+        tools:text="120"
         android:textColor="@color/color_f44541"
         android:textSize="@dimen/sp_20"
         android:textStyle="bold"

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

@@ -133,13 +133,24 @@
         app:layout_constraintTop_toBottomOf="@+id/tv_des"
         tools:text="6人已购买" />
 
+    <TextView
+        android:visibility="gone"
+        android:id="@+id/tv_price_symbol"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="¥"
+        android:textColor="@color/color_f44541"
+        android:textSize="@dimen/sp_14"
+        android:textStyle="bold"
+        app:layout_constraintBaseline_toBaselineOf="@+id/tv_price"
+        app:layout_constraintRight_toLeftOf="@+id/tv_price" />
 
     <TextView
         android:visibility="gone"
         android:id="@+id/tv_price"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="￥120"
+        tools:text="120"
         android:textColor="@color/color_f44541"
         android:textSize="@dimen/sp_20"
         android:textStyle="bold"

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

@@ -121,12 +121,22 @@
         app:layout_constraintTop_toBottomOf="@+id/tv_des"
         tools:text="6人已购买" />
 
+    <TextView
+        android:id="@+id/tv_price_symbol"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="¥"
+        android:textColor="@color/color_f44541"
+        android:textSize="@dimen/sp_14"
+        android:textStyle="bold"
+        app:layout_constraintBaseline_toBaselineOf="@+id/tv_price"
+        app:layout_constraintRight_toLeftOf="@+id/tv_price" />
 
     <TextView
         android:id="@+id/tv_price"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="￥120"
+        tools:text="120"
         android:textColor="@color/color_f44541"
         android:textSize="@dimen/sp_20"
         android:textStyle="bold"

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

@@ -11,16 +11,16 @@
     android:paddingBottom="14dp">
 
     <TextView
-        android:drawableStart="@drawable/icon_live_course_time_tag"
         android:id="@+id/tv_time"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="12dp"
+        android:drawableStart="@drawable/icon_live_course_time_tag"
+        android:drawablePadding="6dp"
         android:includeFontPadding="false"
         android:textColor="@color/color_333333"
         android:textSize="@dimen/sp_14"
         android:textStyle="bold"
-        android:drawablePadding="6dp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="开课时间：2024-11-16 09:30" />
@@ -28,11 +28,11 @@
     <com.cooleshow.base.widgets.QMUIRadiusImageView
         android:id="@+id/iv_bg"
         android:layout_width="0dp"
-        app:layout_constraintDimensionRatio="h,16:9"
-        app:layout_constraintRight_toRightOf="parent"
         android:layout_height="0dp"
         android:layout_marginTop="12dp"
+        app:layout_constraintDimensionRatio="h,16:9"
         app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tv_time"
         app:qmui_corner_radius="6dp" />
 
@@ -40,8 +40,8 @@
         android:id="@+id/tv_course_name"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/dp_19"
-        android:layout_marginTop="8dp"
         android:layout_marginStart="@dimen/dp_8"
+        android:layout_marginTop="8dp"
         android:background="@drawable/shape_66000000_3dp"
         android:gravity="center"
         android:includeFontPadding="false"
@@ -49,8 +49,8 @@
         android:paddingEnd="@dimen/dp_6"
         android:textColor="@color/white"
         android:textSize="@dimen/sp_12"
-        app:layout_constraintTop_toTopOf="@+id/iv_bg"
         app:layout_constraintLeft_toLeftOf="@+id/iv_bg"
+        app:layout_constraintTop_toTopOf="@+id/iv_bg"
         tools:text="单簧管" />
 
     <TextView
@@ -75,13 +75,13 @@
         android:id="@+id/tv_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
         android:ellipsize="end"
         android:includeFontPadding="false"
         android:maxLines="1"
         android:textColor="@color/color_1a1a1a"
         android:textSize="@dimen/sp_16"
         android:textStyle="bold"
-        android:layout_marginTop="8dp"
         app:layout_constraintLeft_toLeftOf="@+id/iv_bg"
         app:layout_constraintRight_toRightOf="@+id/iv_bg"
         app:layout_constraintTop_toBottomOf="@+id/iv_bg"
@@ -92,12 +92,12 @@
         android:id="@+id/tv_des"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
         android:ellipsize="end"
         android:includeFontPadding="false"
         android:maxLines="1"
         android:textColor="@color/color_777777"
         android:textSize="@dimen/sp_14"
-        android:layout_marginTop="4dp"
         app:layout_constraintLeft_toLeftOf="@+id/iv_bg"
         app:layout_constraintRight_toRightOf="@+id/iv_bg"
         app:layout_constraintTop_toBottomOf="@+id/tv_title"
@@ -109,43 +109,53 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="11dp"
         android:background="@drawable/shape_12ff802c_2dp"
-        android:textColor="@color/color_ff6827"
-        android:textSize="@dimen/sp_12"
-        android:visibility="visible"
+        android:includeFontPadding="false"
         android:paddingStart="4dp"
-        android:paddingEnd="4dp"
         android:paddingTop="3dp"
+        android:paddingEnd="4dp"
         android:paddingBottom="3dp"
-        android:includeFontPadding="false"
+        android:textColor="@color/color_ff6827"
+        android:textSize="@dimen/sp_12"
+        android:visibility="visible"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tv_des"
         tools:text="6人已购买" />
 
+    <TextView
+        android:id="@+id/tv_price_symbol"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="¥"
+        android:textColor="@color/color_f44541"
+        android:textSize="@dimen/sp_14"
+        android:textStyle="bold"
+        app:layout_constraintBaseline_toBaselineOf="@+id/tv_price"
+        app:layout_constraintRight_toLeftOf="@+id/tv_price" />
 
     <TextView
         android:id="@+id/tv_price"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="￥120"
+        android:includeFontPadding="false"
         android:textColor="@color/color_f44541"
         android:textSize="@dimen/sp_20"
         android:textStyle="bold"
-        android:includeFontPadding="false"
-        app:layout_constraintTop_toTopOf="@+id/tv_buy_num"
         app:layout_constraintBottom_toBottomOf="@+id/tv_buy_num"
-        app:layout_constraintRight_toLeftOf="@+id/tv_price_unit" />
+        app:layout_constraintRight_toLeftOf="@+id/tv_price_unit"
+        app:layout_constraintTop_toTopOf="@+id/tv_buy_num"
+        tools:text="120" />
 
     <TextView
-        android:includeFontPadding="false"
         android:id="@+id/tv_price_unit"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:includeFontPadding="false"
         android:paddingStart="2dp"
         android:text="/4课时"
         android:textColor="@color/color_999999"
         android:textSize="@dimen/sp_12"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintBaseline_toBaselineOf="@+id/tv_price" />
+        app:layout_constraintBaseline_toBaselineOf="@+id/tv_price"
+        app:layout_constraintRight_toRightOf="parent" />
 
     <ImageView
         android:layout_width="wrap_content"
@@ -158,5 +168,4 @@
         app:layout_constraintTop_toTopOf="@+id/tv_title" />
 
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>