修改老师端个人主页样式

BaseLibrary/src/main/res/values/colors.xml

@@ -137,6 +137,7 @@
     <color name="color_ff1919">#FF1919</color>
     <color name="color_ffe7e7">#FFE7E7</color>
     <color name="color_def2ff">#DEF2FF</color>
+    <color name="color_ecfffc">#ecfffc</color>
 
     <color name="color_25292e">#25292E</color>
     <color name="color_F8F8F8">#F8F8F8</color>

teacher/src/main/java/com/cooleshow/teacher/adapter/MineLiveCourseListAdapter.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;
 
@@ -41,16 +42,15 @@ public class MineLiveCourseListAdapter extends BaseQuickAdapter<MineLiveCourseLi
         //subjectName
         holder.setText(R.id.tv_course_name, data.subjectName);
         //购买人数
-        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);
-        GlideUtils.INSTANCE.loadImage(getContext(), data.avatar, holder.getView(R.id.teacher_head), R.drawable.icon_teacher_default_head);
-        holder.setText(R.id.teacher_name, data.teacherName);
-        TextView tvCourseStatusBt = holder.getView(R.id.tv_course_status);
-        tvCourseStatusBt.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_2dc7aa));
-
-        tvCourseStatusBt.setText(UiUtils.getLiveCoursePriceText(data.coursePrice, data.courseNum));
+        holder.setText(R.id.tv_buy_num, UiUtils.getBuyNumTip(data.coursePrice, data.studentCount));
+        //课程封面
+        ImageView iv_bg = holder.getView(R.id.iv_bg);
+        GlideUtils.INSTANCE.loadImage(getContext(), data.backgroundPic, iv_bg, com.cooleshow.base.R.drawable.bg_video_placeholder);
+        //价格
+        TextView tv_price = holder.getView(R.id.tv_price);
+        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));
     }
 
     @NonNull

teacher/src/main/java/com/cooleshow/teacher/presenter/homePage/LiveCoursePagePresenter.java

@@ -14,15 +14,14 @@ import com.cooleshow.teacher.contract.LiveCoursePageContract;
  */
 public class LiveCoursePagePresenter extends BasePresenter<LiveCoursePageContract.LiveCoursePageView> implements LiveCoursePageContract.Presenter {
 
-    public void queryLiveCourse(  String month,int page) {
+    public void queryLiveCourse(int page) {
         if (getView() != null) {
             getView().showLoading();
         }
         LiveCourseEntry entry = new LiveCourseEntry();
-        entry.classDate =month;
-        entry.rows =Constants.DEFAULT_DATA_SIZE;
-        entry.page =page;
-        entry.groupStatus ="apply";
+        entry.rows = Constants.DEFAULT_DATA_SIZE;
+        entry.page = page;
+        entry.groupStatus = "apply";
         addSubscribe(create(APIService.class).queryPageCourseGroup(entry), new BaseObserver<MineLiveCourseListBean>(getView()) {
             @Override
             protected void onSuccess(MineLiveCourseListBean data) {

teacher/src/main/java/com/cooleshow/teacher/ui/homepage/LiveCoursePageFragment.java

@@ -40,11 +40,11 @@ public class LiveCoursePageFragment extends BaseMVPFragment<FragmentLiveCoursePa
     private MineLiveCourseListAdapter mAdapter;
     private EmptyViewLayout mEmptyView;
     private boolean hasNext = true;
-    private String currentFilterDate;
+//    private String currentFilterDate;
 
     @Override
     protected void initView(View rootView) {
-        mViewBinding.llCreateLive.setOnClickListener(this);
+        mViewBinding.tvCreateLiveCourse.setOnClickListener(this);
         mViewBinding.tvOpen.setOnClickListener(this);
     }
 
@@ -52,13 +52,13 @@ public class LiveCoursePageFragment extends BaseMVPFragment<FragmentLiveCoursePa
     protected void initData() {
         Date currentSelectDate = TimeUtils.getNowDate();
         String targetDateTimeStr = TimeUtils.date2String(currentSelectDate, TimeUtils.getSafeDateFormat("yyyy-MM"));
-        currentFilterDate = targetDateTimeStr;
+//        currentFilterDate = targetDateTimeStr;
         mViewBinding.refreshLayout.setOnRefreshListener(refreshLayout -> {
             currentPage = 1;
             queryCourse();
         });
 
-        mAdapter = new MineLiveCourseListAdapter(R.layout.item_live_course_list_layout);
+        mAdapter = new MineLiveCourseListAdapter(R.layout.item_home_page_live_course_list_layout);
         mAdapter.getLoadMoreModule().setOnLoadMoreListener(() -> {
             //上拉加载
             if (hasNext) {
@@ -71,7 +71,7 @@ public class LiveCoursePageFragment extends BaseMVPFragment<FragmentLiveCoursePa
         mViewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
         mViewBinding.recyclerView.setAdapter(mAdapter);
         mAdapter.setOnItemClickListener((adapter, view, position) -> {
-            MineLiveCourseListBean.RowsBean item =  mAdapter.getData().get(position);
+            MineLiveCourseListBean.RowsBean item = mAdapter.getData().get(position);
             ARouter.getInstance()
                     .build(RouterPath.WebCenter.ACTIVITY_HTML)
                     .withString(WebConstants.WEB_URL, WebConstants.TEACHER_LIVE_DETAIL + "?groupId=" + item.courseGroupId)
@@ -93,7 +93,7 @@ public class LiveCoursePageFragment extends BaseMVPFragment<FragmentLiveCoursePa
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.ll_create_live:
+            case R.id.tv_create_live_course:
                 ARouter.getInstance()
                         .build(RouterPath.WebCenter.ACTIVITY_HTML)
                         .withString(WebConstants.WEB_URL, WebConstants.TEACHER_LIVE_CREATE)
@@ -124,7 +124,7 @@ public class LiveCoursePageFragment extends BaseMVPFragment<FragmentLiveCoursePa
 
     private void queryCourse() {
         //根据默认筛选条件查询
-        presenter.queryLiveCourse(currentFilterDate, currentPage);
+        presenter.queryLiveCourse(currentPage);
     }
 
     @Override

teacher/src/main/java/com/cooleshow/teacher/ui/homepage/SparringCoursePageFragment.java

@@ -87,6 +87,7 @@ public class SparringCoursePageFragment extends BaseMVPFragment<FragmentSparring
         });
         mViewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
         mViewBinding.recyclerView.setAdapter(mAdapter);
+        mViewBinding.tvSetting.setOnClickListener(this);
 
     }
 
@@ -109,12 +110,6 @@ public class SparringCoursePageFragment extends BaseMVPFragment<FragmentSparring
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.ll_practice_set:
-                ARouter.getInstance()
-                        .build(RouterPath.WebCenter.ACTIVITY_HTML)
-                        .withString(WebConstants.WEB_URL, WebConstants.TEACHER_PRACTICE_SETTING)
-                        .navigation();
-                break;
             case R.id.tv_open:
                 if (mViewBinding.tvOpen.getText().toString().equals("去认证")) {
                     ARouter.getInstance().build(RouterPath.WebCenter.ACTIVITY_HTML)
@@ -132,6 +127,13 @@ public class SparringCoursePageFragment extends BaseMVPFragment<FragmentSparring
                 //时间筛选
                 showTimeSelectPicker();
                 break;
+            case R.id.tv_setting:
+                //陪练课设置
+                ARouter.getInstance()
+                        .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                        .withString(WebConstants.WEB_URL, WebConstants.TEACHER_PRACTICE_SETTING)
+                        .navigation();
+                break;
         }
     }
 

teacher/src/main/res/drawable/shape_ecfffc_6dp.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="6dp"/>
+    <solid android:color="@color/color_ecfffc"/>
+</shape>

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

@@ -10,36 +10,46 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/ll_create_live"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_40"
+            android:layout_height="@dimen/dp_56"
             android:layout_marginLeft="14dp"
             android:layout_marginTop="14dp"
             android:layout_marginRight="14dp"
-            android:background="@drawable/bg_border_e5_radius"
+            android:background="@drawable/bg_white_10dp"
             android:gravity="center"
             android:orientation="horizontal">
 
-            <ImageView
-                android:layout_width="@dimen/dp_26"
-                android:layout_height="@dimen/dp_26"
-                android:background="@drawable/icon_open_live" />
-
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="14dp"
                 android:layout_marginLeft="2dp"
-                android:text="创建直播课"
+                android:text="我的直播课"
                 android:textColor="@color/black_333"
-                android:textSize="@dimen/sp_15" />
+                android:textSize="@dimen/sp_18"
+                android:textStyle="bold"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-            <ImageView
-                android:layout_width="6dp"
-                android:layout_height="11dp"
-                android:layout_marginLeft="8dp"
-                android:background="@drawable/icon_go_right" />
-        </LinearLayout>
+            <TextView
+                android:id="@+id/tv_create_live_course"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="14dp"
+                android:drawableRight="@drawable/icon_arrow_right_small_green"
+                android:drawablePadding="5dp"
+                android:gravity="center"
+                android:text="创建课程"
+                android:textStyle="bold"
+                android:textSize="@dimen/sp_16"
+                android:textColor="@color/color_2dc7aa"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <com.scwang.smart.refresh.layout.SmartRefreshLayout
             android:id="@+id/refreshLayout"
@@ -47,7 +57,6 @@
             android:layout_height="match_parent">
 
 
-
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recyclerView"
                 android:layout_width="match_parent"

teacher/src/main/res/layout/fragment_sparring_course_page_layout.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="match_parent"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:id="@+id/ll_content"
@@ -12,56 +12,65 @@
         android:orientation="vertical">
 
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/ll_practice_set"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_40"
+            android:layout_height="@dimen/dp_56"
             android:layout_marginLeft="14dp"
             android:layout_marginTop="14dp"
             android:layout_marginRight="14dp"
-            android:background="@drawable/bg_border_e5_radius"
+            android:background="@drawable/bg_white_10dp"
             android:gravity="center"
             android:orientation="horizontal">
 
-            <ImageView
-                android:layout_width="@dimen/dp_26"
-                android:layout_height="@dimen/dp_26"
-                android:background="@drawable/icon_sparing_course_set" />
-
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="2dp"
-                android:text="陪练课设置"
+                android:layout_marginLeft="14dp"
+                android:text="我的陪练课"
                 android:textColor="@color/black_333"
-                android:textSize="@dimen/sp_15" />
+                android:textSize="@dimen/sp_18"
+                android:textStyle="bold"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-            <ImageView
-                android:layout_width="6dp"
-                android:layout_height="11dp"
-                android:layout_marginLeft="8dp"
-                android:background="@drawable/icon_go_right" />
-        </LinearLayout>
+            <TextView
+                android:id="@+id/tv_time"
+                android:layout_width="wrap_content"
+                android:layout_height="30dp"
+                android:background="@drawable/shape_ecfffc_6dp"
+                android:drawableRight="@drawable/icon_arrow_right_small_green"
+                android:drawablePadding="6dp"
+                android:gravity="center"
+                android:includeFontPadding="false"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp"
+                android:textColor="@color/color_2dc7aa"
+                android:textSize="@dimen/sp_12"
+                android:visibility="visible"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="2021年9月" />
 
-        <TextView
-            android:id="@+id/tv_time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_20"
-            android:drawableRight="@drawable/icon_arrow_down"
-            android:drawablePadding="6dp"
-            android:gravity="center"
-            android:includeFontPadding="false"
-            android:paddingTop="18dp"
-            android:paddingBottom="12dp"
-            android:textColor="@color/color_666666"
-            android:textSize="@dimen/sp_13"
-            android:visibility="gone"
-            app:layout_constraintHorizontal_chainStyle="spread_inside"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toLeftOf="@+id/tv_course_status"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="2021年9月" />
+            <TextView
+                android:id="@+id/tv_setting"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="14dp"
+                android:drawableRight="@drawable/icon_arrow_right_small_green"
+                android:drawablePadding="5dp"
+                android:gravity="center"
+                android:text="课程设置"
+                android:textStyle="bold"
+                android:textColor="@color/color_2dc7aa"
+                android:textSize="@dimen/sp_16"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <com.scwang.smart.refresh.layout.SmartRefreshLayout
             android:id="@+id/refreshLayout"
@@ -69,7 +78,6 @@
             android:layout_height="match_parent">
 
 
-
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recyclerView"
                 android:layout_width="match_parent"
@@ -85,9 +93,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
-        tools:visibility="visible"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible">
 
 
         <ImageView

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

@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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"
+    android:layout_marginStart="14dp"
+    android:layout_marginTop="12dp"
+    android:layout_marginEnd="14dp"
+    android:background="@drawable/bg_white_10dp"
+    android:paddingStart="14dp"
+    android:paddingBottom="9dp">
+
+    <TextView
+        android:id="@+id/tv_status_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="9dp"
+        android:text="课程状态"
+        android:textColor="@color/color_333333"
+        android:textStyle="bold"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tv_course_status_tip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="7dp"
+        android:background="@drawable/shape_ffe7e7_15dp_left"
+        android:gravity="center"
+        android:paddingStart="12dp"
+        android:paddingTop="3dp"
+        android:paddingEnd="12dp"
+        android:paddingBottom="3dp"
+        android:text="销售中"
+        android:textColor="@color/color_ff1919"
+        android:textSize="@dimen/sp_10"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.cooleshow.base.widgets.QMUIRadiusImageView
+        android:id="@+id/iv_bg"
+        android:layout_width="105dp"
+        android:layout_height="71dp"
+        android:layout_marginTop="11dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_status_title"
+        app:qmui_corner_radius="5dp" />
+
+    <TextView
+        android:id="@+id/tv_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
+        android:ellipsize="end"
+        android:includeFontPadding="false"
+        android:maxLines="2"
+        android:textColor="@color/color_1a1a1a"
+        android:textSize="@dimen/sp_16"
+        android:textStyle="bold"
+        app:layout_constraintLeft_toRightOf="@+id/iv_bg"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/iv_bg"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="张豆张豆豆豆" />
+
+    <TextView
+        android:id="@+id/tv_price"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="11dp"
+        android:paddingStart="14dp"
+        android:text="￥120"
+        android:textColor="@color/color_ff0000"
+        android:textSize="@dimen/sp_15"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_bg"
+        app:layout_constraintLeft_toRightOf="@+id/iv_bg" />
+
+    <TextView
+        android:id="@+id/tv_price_unit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="11dp"
+        android:paddingStart="7dp"
+        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" />
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="5dp"
+        android:src="@drawable/icon_chat_small"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_title"
+        app:layout_constraintLeft_toRightOf="@+id/tv_title"
+        app:layout_constraintTop_toTopOf="@+id/tv_title" />
+
+    <TextView
+        android:id="@+id/tv_course_name"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dp_13"
+        android:layout_marginStart="@dimen/dp_3"
+        android:layout_marginBottom="@dimen/dp_4"
+        android:background="@drawable/gray_1_radius_bg"
+        android:gravity="center"
+        android:includeFontPadding="false"
+        android:paddingStart="@dimen/dp_3"
+        android:paddingEnd="@dimen/dp_3"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_9"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_bg"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_bg"
+        tools:text="单簧管" />
+
+
+    <TextView
+        android:id="@+id/tv_buy_num"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="9dp"
+        android:layout_marginEnd="14dp"
+        android:textColor="@color/color_ff802c"
+        android:textSize="@dimen/sp_11"
+        android:visibility="visible"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/view_line"
+        tools:text="6人已购买" />
+
+    <View
+        android:id="@+id/view_line"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginEnd="14dp"
+        android:background="@color/color_f2f2f2"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/iv_bg" />
+
+
+    <TextView
+        android:id="@+id/tv_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="9dp"
+        android:includeFontPadding="false"
+        android:textColor="@color/color_666666"
+        android:textSize="@dimen/sp_13"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/view_line"
+        tools:text="2021/09/17 14:00~14:25" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -7,7 +7,7 @@
     <com.cooleshow.base.widgets.QMUIRadiusImageView
         android:id="@+id/iv_video_bg"
         android:layout_width="match_parent"
-        android:layout_height="106dp"
+        android:layout_height="156dp"
         app:qmui_corner_radius="10dp" />
     <ImageView
         android:layout_gravity="center"