Explorar o código

修改部分文案

Pq %!s(int64=3) %!d(string=hai) anos
pai
achega
9aaf575002

+ 12 - 0
BaseLibrary/src/main/java/com/cooleshow/base/utils/UiUtils.java

@@ -229,6 +229,18 @@ public class UiUtils {
         return price + "/" + lessonCount + "课时";
     }
 
+    public static String getBuyNumTip(String lessonPrice, String buyCount) {
+        try {
+            double v = Double.parseDouble(lessonPrice);
+            if (v == 0) {
+                return buyCount + "人已领取";
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return buyCount + "人已购买";
+    }
+
     public static String getLiveCoursePriceText(String lessonPrice, int lessonCount) {
         String price = "¥" + lessonPrice;
         try {

+ 2 - 2
student/src/main/java/com/cooleshow/student/adapter/LiveCourseListAdapter.java

@@ -34,14 +34,14 @@ public class LiveCourseListAdapter extends BaseQuickAdapter<LiveCourseListBean.R
             return;
         }
         //时间
-        holder.setText(R.id.tv_time, UiUtils.getCourseTimeString(data.startTime,data.endTime));
+        holder.setText(R.id.tv_time, UiUtils.getCourseTimeString(data.startTime, data.endTime));
 
         //title
         holder.setText(R.id.tv_title, data.name);
         //subjectName
         holder.setText(R.id.tv_course_name, data.subjectName);
         //购买人数
-        holder.setText(R.id.tv_buy_num, getContext().getString(R.string.pay_count_str, data.payCount));
+        holder.setText(R.id.tv_buy_num, data.payCount + "人");
         //头像
         ImageView iv_avatar = holder.getView(R.id.iv_bg);
         GlideUtils.INSTANCE.loadImage(getContext(), data.cover, iv_avatar, com.cooleshow.base.R.drawable.bg_video_placeholder);

+ 1 - 1
student/src/main/java/com/cooleshow/student/adapter/VideoCourseListAdapter.java

@@ -38,7 +38,7 @@ public class VideoCourseListAdapter extends BaseQuickAdapter<SelectMyGroupBean.R
         //声部
         holder.setText(R.id.course_name,data.lessonSubjectName);
         //购买人数
-        holder.setText(R.id.tv_buy_num, getContext().getString(R.string.pay_count_str, data.countStudent+""));
+        holder.setText(R.id.tv_buy_num, UiUtils.getBuyNumTip(data.lessonPrice,data.countStudent));
         //¥120/4课时
         String price= UiUtils.getVideoCoursePriceText(data.lessonPrice, data.lessonCount);
         holder.setText(R.id.tv_price, price);

+ 1 - 1
student/src/main/java/com/cooleshow/student/bean/SelectMyGroupBean.java

@@ -20,7 +20,7 @@ public class SelectMyGroupBean {
 
     public static class RowsBean {
         public String avatar;
-        public int countStudent;
+        public String countStudent;
         public long id;
         public int lessonCount;
         public String lessonCoverUrl;

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/adapter/LiveCourseListAdapter.java

@@ -35,7 +35,7 @@ public class LiveCourseListAdapter extends BaseQuickAdapter<LiveCourseListBean.R
         //subjectName
         holder.setText(R.id.tv_course_name, data.subjectName);
         //购买人数
-        holder.setText(R.id.tv_buy_num, getContext().getString(R.string.pay_count_str, data.studentCount));
+        holder.setText(R.id.tv_buy_num, data.studentCount+"人");
         //封面
         ImageView iv_cover = holder.getView(R.id.iv_bg);
         GlideUtils.INSTANCE.loadImage(getContext(), data.backgroundPic, iv_cover, com.cooleshow.base.R.drawable.bg_video_placeholder);

+ 11 - 11
teacher/src/main/java/com/cooleshow/teacher/adapter/MineLiveCourseAdapter.java

@@ -33,24 +33,24 @@ public class MineLiveCourseAdapter extends BaseQuickAdapter<MineLiveCourseListBe
 
     @Override
     protected void convert(BaseViewHolder helper, MineLiveCourseListBean.RowsBean item) {
-        if(item == null){
+        if (item == null) {
             return;
         }
         ImageView im_pic = helper.getView(R.id.im_pic);
         GlideUtils.INSTANCE.loadImage(getContext(), item.backgroundPic, im_pic);
-        TextView tv_subject_name=helper.getView(R.id.tv_subject_name);
+        TextView tv_subject_name = helper.getView(R.id.tv_subject_name);
         tv_subject_name.setText(item.courseGroupName);
-        ImageView im_header=helper.getView(R.id.im_header);
-        GlideUtils.INSTANCE.loadImage(getContext(), item.avatar, im_header,R.drawable.icon_teacher_default_head);
-        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, R.drawable.icon_teacher_default_head);
+        TextView tv_teacher_name = helper.getView(R.id.tv_teacher_name);
         tv_teacher_name.setText(item.teacherName);
-        TextView tv_student_count=helper.getView(R.id.tv_student_count);
-        tv_student_count.setText(item.studentCount+"人已购买");
-        TextView tv_date=helper.getView(R.id.tv_date);
-        tv_date.setText(TextUtils.isEmpty(item.courseStartTime)?"":TimeUtils.date2String(TimeUtils.string2Date(item.courseStartTime),"yyyy-MM-dd HH:mm"));
-        TextView tv_price=helper.getView(R.id.tv_price);
+        TextView tv_student_count = helper.getView(R.id.tv_student_count);
+        tv_student_count.setText(UiUtils.getBuyNumTip(item.coursePrice, item.studentCount));
+        TextView tv_date = helper.getView(R.id.tv_date);
+        tv_date.setText(TextUtils.isEmpty(item.courseStartTime) ? "" : TimeUtils.date2String(TimeUtils.string2Date(item.courseStartTime), "yyyy-MM-dd HH:mm"));
+        TextView tv_price = helper.getView(R.id.tv_price);
         tv_price.setText(UiUtils.getLiveCoursePriceText(item.coursePrice, item.courseNum));
-        helper.setText(R.id.subject_name,item.subjectName);
+        helper.setText(R.id.subject_name, item.subjectName);
     }
 
     @NonNull

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/adapter/MineLiveCourseListAdapter.java

@@ -41,7 +41,7 @@ public class MineLiveCourseListAdapter extends BaseQuickAdapter<MineLiveCourseLi
         //subjectName
         holder.setText(R.id.tv_course_name, data.subjectName);
         //购买人数
-        holder.setText(R.id.tv_buy_num, getContext().getString(R.string.pay_count_str, data.studentCount + ""));
+        holder.setText(R.id.tv_buy_num, UiUtils.getBuyNumTip(data.coursePrice,data.studentCount));
         //头像
         ImageView iv_avatar = holder.getView(R.id.iv_bg);
         GlideUtils.INSTANCE.loadImage(getContext(), data.backgroundPic, iv_avatar, R.drawable.icon_teacher_default_head);

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

@@ -51,7 +51,7 @@ public class MineVideoCourseAdapter extends BaseQuickAdapter<VideoCourseListBean
         tv_price.setText(UiUtils.getVideoCoursePriceText(item.lessonPrice, item.lessonCount));
         TextView tv_buy_num = helper.getView(R.id.tv_buy_num);
         if (TextUtils.equals(item.auditStatus, "PASS")) {
-            tv_buy_num.setText(item.countStudent + "人已购买");
+            tv_buy_num.setText(UiUtils.getBuyNumTip(item.lessonPrice, item.countStudent));
             tv_buy_num.setVisibility(View.VISIBLE);
             helper.setVisible(R.id.view_line2, true);
         } else {

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/adapter/VideoCourseListAdapter.java

@@ -36,7 +36,7 @@ public class VideoCourseListAdapter extends BaseQuickAdapter<VideoCourseListBean
         //老师名称
         holder.setText(R.id.tv_author_name, UserHelper.getTeacherName(data.username, data.teacherId));
         //购买人数
-        holder.setText(R.id.tv_buy_num, getContext().getString(R.string.pay_count_str, data.countStudent));
+        holder.setText(R.id.tv_buy_num, UiUtils.getBuyNumTip(data.lessonPrice, data.countStudent));
         //声部
         holder.setText(R.id.course_name, data.lessonSubjectName);
         //¥120/4课时

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/bean/MineLiveCourseListBean.java

@@ -57,7 +57,7 @@ public class MineLiveCourseListBean {
         public String salesStartDate;
         public int singleCourseMinutes;
         public String status;
-        public int studentCount;
+        public String studentCount;
         public String subjectName;
         public int teacherId;
         public String teacherName;