Browse Source

修改部分样式问题

Pq 6 months ago
parent
commit
880e793ae2

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

@@ -36,9 +36,10 @@ public class LiveCourseListAdapter extends BaseQuickAdapter<LiveCourseListBean.R
         if (data == null) {
             return;
         }
-        //时间
-        holder.setText(R.id.tv_time, UiUtils.getCourseTimeString(data.startTime, data.endTime));
 
+        String timeStr = TextUtils.isEmpty(data.startTime) ? "" : TimeUtils.date2String(TimeUtils.string2Date(data.startTime), "yyyy-MM-dd HH:mm");
+        //时间
+        holder.setText(R.id.tv_time, "开课时间:" + timeStr);
         //title
         holder.setText(R.id.tv_title, data.name);
         //subjectName
@@ -82,8 +83,8 @@ public class LiveCourseListAdapter extends BaseQuickAdapter<LiveCourseListBean.R
         holder.setText(R.id.tv_course_total_value, data.getCourseNum());
 
         //老师头像昵称
-        ImageView iv_avatar=holder.getView(R.id.iv_avatar);
-        GlideUtils.INSTANCE.loadImage(getContext(),data.getAvatar(),iv_avatar,R.drawable.icon_teacher_default_head);
+        ImageView iv_avatar = holder.getView(R.id.iv_avatar);
+        GlideUtils.INSTANCE.loadImage(getContext(), data.getAvatar(), iv_avatar, R.drawable.icon_teacher_default_head);
         TextView tv_teacher_name = holder.getView(R.id.tv_teacher_name);
         tv_teacher_name.setText(data.realName);
     }

+ 1 - 1
student/src/main/java/com/cooleshow/student/ui/course/VIPOrInterestCourseGroupDetailActivity.java

@@ -186,7 +186,7 @@ public class VIPOrInterestCourseGroupDetailActivity extends BaseMVPActivity<AcVi
 
     private void reBuildFilter(Date date, String status, String attendanceStatus) {
         currentSelectDate = date != null ? date : TimeUtils.getNowDate();
-        String targetDateTimeStr = TimeUtils.date2String(currentSelectDate, TimeUtils.getSafeDateFormat("yyyy-MM"));
+        String targetDateTimeStr = TimeUtils.date2String(currentSelectDate, TimeUtils.getSafeDateFormat("yyyy年MM月"));
         classMonth = targetDateTimeStr;
         courseStatus = !TextUtils.isEmpty(status) ? status : CourseStatusType.ALL.getId();
         currentAttendanceStatus = !TextUtils.isEmpty(attendanceStatus) ? attendanceStatus : CourseAttendanceStatusType.ALL.getId();

+ 0 - 1
student/src/main/res/layout/ac_vip_or_interest_course_group_detail_layout.xml

@@ -99,7 +99,6 @@
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="10dp"
-                            android:layout_marginEnd="5dp"
                             android:ellipsize="end"
                             android:includeFontPadding="false"
                             android:maxLines="1"

+ 0 - 2
student/src/main/res/layout/fg_new_home_v2_layout.xml

@@ -352,8 +352,6 @@
                                 android:id="@+id/tv_live_time"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/dp_1"
-                                android:layout_marginBottom="@dimen/dp_5"
                                 android:paddingStart="5dp"
                                 android:textColor="@color/color_2dc7aa"
                                 android:textSize="@dimen/sp_13"

+ 1 - 1
student/src/main/res/layout/fragment_home_hot_news_layout.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:paddingTop="12dp"
+    android:paddingTop="20dp"
     android:layout_height="match_parent">
 
     <androidx.recyclerview.widget.RecyclerView

+ 2 - 1
student/src/main/res/layout/item_piano_course_group_course_layout.xml

@@ -77,7 +77,8 @@
     <ImageView
         android:id="@+id/iv_attendance_status"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:adjustViewBounds="true"
+        android:layout_height="17.1dp"
         android:layout_marginStart="5dp"
         android:layout_marginEnd="5dp"
         android:src="@drawable/icon_course_attendance_truancy"

+ 3 - 1
student/src/main/res/layout/item_vip_course_group_layout.xml

@@ -75,6 +75,7 @@
         tools:text="VIP定制课-张豆豆VIP定制课-张豆豆" />
 
     <ImageView
+        tools:visibility="visible"
         android:visibility="gone"
         android:layout_marginStart="5dp"
         android:id="@+id/iv_attendance_status"
@@ -84,8 +85,9 @@
         app:layout_constraintTop_toTopOf="@+id/tv_title"
         android:src="@drawable/icon_course_attendance_truancy"
         android:layout_width="wrap_content"
+        android:adjustViewBounds="true"
         android:layout_marginEnd="5dp"
-        android:layout_height="wrap_content"/>
+        android:layout_height="17.1dp"/>
 
     <TextView
         android:id="@+id/tv_name"

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/course/VIPOrInterestCourseGroupDetailActivity.java

@@ -198,7 +198,7 @@ public class VIPOrInterestCourseGroupDetailActivity extends BaseMVPActivity<AcVi
 
     private void reBuildFilter(Date date, String status, String attendanceStatus) {
         currentSelectDate = date != null ? date : TimeUtils.getNowDate();
-        String targetDateTimeStr = TimeUtils.date2String(currentSelectDate, TimeUtils.getSafeDateFormat("yyyy-MM"));
+        String targetDateTimeStr = TimeUtils.date2String(currentSelectDate, TimeUtils.getSafeDateFormat("yyyy年MM月"));
         classMonth = targetDateTimeStr;
         courseStatus = !TextUtils.isEmpty(status) ? status : CourseStatusType.ALL.getId();
         currentAttendanceStatus = !TextUtils.isEmpty(attendanceStatus) ? attendanceStatus : CourseAttendanceStatusType.ALL.getId();

+ 0 - 1
teacher/src/main/res/layout/ac_vip_or_interest_course_group_detail_layout.xml

@@ -99,7 +99,6 @@
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="10dp"
-                            android:layout_marginEnd="5dp"
                             android:ellipsize="end"
                             android:includeFontPadding="false"
                             android:maxLines="1"

+ 0 - 2
teacher/src/main/res/layout/fg_new_home_v2_layout.xml

@@ -257,8 +257,6 @@
                         android:id="@+id/tv_live_time"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_1"
-                        android:layout_marginBottom="@dimen/dp_5"
                         android:paddingStart="5dp"
                         android:textColor="@color/color_2dc7aa"
                         android:textSize="@dimen/sp_13"

+ 2 - 1
teacher/src/main/res/layout/item_piano_course_group_course_layout.xml

@@ -77,7 +77,8 @@
     <ImageView
         android:id="@+id/iv_attendance_status"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:adjustViewBounds="true"
+        android:layout_height="17.1dp"
         android:layout_marginStart="5dp"
         android:layout_marginEnd="5dp"
         android:src="@drawable/icon_course_attendance_truancy"

+ 2 - 1
teacher/src/main/res/layout/item_vip_course_group_layout.xml

@@ -85,7 +85,8 @@
         android:src="@drawable/icon_course_attendance_truancy"
         android:layout_width="wrap_content"
         android:layout_marginEnd="5dp"
-        android:layout_height="wrap_content"/>
+        android:adjustViewBounds="true"
+        android:layout_height="17.1dp"/>
 
     <TextView
         android:id="@+id/tv_name"