商品订单

BaseLibrary/src/main/java/com/cooleshow/base/common/WebConstants.java

@@ -97,6 +97,9 @@ public abstract class WebConstants {
     //云库琴房
     public static final String PIANO_ROOM = getBaseUrlH5() + "#/pianoRoom";
 
+    //商品订单
+    public static final String MALL_GOODS_ORDER= getBaseUrlH5() + "/#/goodsOrder";
+
 
 
 }

student/src/main/java/com/cooleshow/student/ui/main/MineFragment.java

@@ -79,6 +79,10 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
                 break;
             case R.id.ll_goods_order:
                 //商品订单
+                ARouter.getInstance()
+                        .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                        .withString(WebConstants.WEB_URL, WebConstants.MALL_GOODS_ORDER)
+                        .navigation();
                 break;
             case R.id.tv_transaction_record:
                 //交易记录

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

@@ -0,0 +1,70 @@
+package com.cooleshow.teacher.adapter;
+
+import android.text.TextUtils;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+
+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.utils.GlideUtils;
+import com.cooleshow.teacher.R;
+import com.cooleshow.teacher.bean.MineLiveCourseListBean;
+import com.cooleshow.teacher.constants.CourseConstants;
+
+/**
+ * 创建日期：2022/6/17 15:45
+ *
+ * @author Ryan
+ * 类说明：
+ */
+public class MineLiveCourseListAdapter extends BaseQuickAdapter<MineLiveCourseListBean.RowsBean, com.chad.library.adapter.base.viewholder.BaseViewHolder> implements LoadMoreModule {
+
+    public MineLiveCourseListAdapter(int layoutResId) {
+        super(layoutResId);
+    }
+
+    @Override
+    protected void convert(@NonNull BaseViewHolder holder, MineLiveCourseListBean.RowsBean data) {
+        //时间
+        holder.setText(R.id.tv_time, data.salesEndDate);
+        //title
+        holder.setText(R.id.tv_title, data.courseGroupName);
+        //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+""));
+        //头像
+        ImageView iv_avatar = holder.getView(R.id.iv_bg);
+        GlideUtils.INSTANCE.loadImage(getContext(), data.backgroundPic, iv_avatar, R.drawable.icon_teacher_default_head);
+
+        TextView tvCourseStatusBt = holder.getView(R.id.tv_course_status);
+
+        if (TextUtils.equals(CourseConstants.COURSE_STATUS_NOT_START, data.status)) {
+            //未开始
+            holder.setText(R.id.tv_course_status, "未开始");
+            tvCourseStatusBt.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_ff802c));
+        }
+
+        if (TextUtils.equals(CourseConstants.COURSE_STATUS_ING, data.status)) {
+            //进行中
+            holder.setText(R.id.tv_course_status, "进行中");
+            tvCourseStatusBt.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_2dc7aa));
+        }
+
+        if (TextUtils.equals(CourseConstants.COURSE_STATUS_COMPLETE, data.status)) {
+            //已结束
+            holder.setText(R.id.tv_course_status, "已结束");
+            tvCourseStatusBt.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_999999));
+        }
+    }
+
+    @NonNull
+    @Override
+    public BaseLoadMoreModule addLoadMoreModule(@NonNull BaseQuickAdapter<?, ?> baseQuickAdapter) {
+        return new BaseLoadMoreModule(baseQuickAdapter);
+    }
+}

teacher/src/main/java/com/cooleshow/teacher/contract/LiveCoursePageContract.java

@@ -2,6 +2,7 @@ package com.cooleshow.teacher.contract;
 
 import com.cooleshow.base.presenter.view.BaseView;
 import com.cooleshow.teacher.bean.LiveCourseListBean;
+import com.cooleshow.teacher.bean.MineLiveCourseListBean;
 import com.cooleshow.teacher.bean.TeacherSelfStyleInfoBean;
 import com.cooleshow.teacher.bean.TeacherUserInfo;
 
@@ -11,7 +12,7 @@ import com.cooleshow.teacher.bean.TeacherUserInfo;
 public interface LiveCoursePageContract {
 
     interface LiveCoursePageView extends BaseView {
-        void onGetLiveCourseSuccess(int page, LiveCourseListBean liveCourseListBean);
+        void onGetLiveCourseSuccess(int page, MineLiveCourseListBean liveCourseListBean);
         void onGetCourseError(int page);
         void getTeacherInfoSuccess(TeacherUserInfo data);
     }

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

@@ -6,6 +6,7 @@ import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.bean.LiveCourseListBean;
+import com.cooleshow.teacher.bean.MineLiveCourseListBean;
 import com.cooleshow.teacher.bean.TeacherSelfStyleInfoBean;
 import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.contract.LiveCoursePageContract;
@@ -32,9 +33,9 @@ public class LiveCoursePagePresenter extends BasePresenter<LiveCoursePageContrac
         } catch (JSONException e) {
             e.printStackTrace();
         }
-        addSubscribe(create(APIService.class).getLiveCourses(RequestBodyUtil.convertToRequestBodyJson(jsonObject.toString())), new BaseObserver<LiveCourseListBean>(getView()) {
+        addSubscribe(create(APIService.class).queryPageCourseGroup(RequestBodyUtil.convertToRequestBodyJson(jsonObject.toString())), new BaseObserver<MineLiveCourseListBean>(getView()) {
             @Override
-            protected void onSuccess(LiveCourseListBean data) {
+            protected void onSuccess(MineLiveCourseListBean data) {
                 if (getView() != null) {
                     getView().onGetLiveCourseSuccess(page, data);
                 }

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

@@ -15,8 +15,10 @@ import com.cooleshow.base.utils.TimeUtils;
 import com.cooleshow.base.widgets.EmptyViewLayout;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.LiveCourseListAdapter;
+import com.cooleshow.teacher.adapter.MineLiveCourseListAdapter;
 import com.cooleshow.teacher.bean.LiveCourseListBean;
 import com.cooleshow.base.ui.fragment.BaseMVPFragment;
+import com.cooleshow.teacher.bean.MineLiveCourseListBean;
 import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.constants.TeacherInfoConstants;
 import com.cooleshow.teacher.contract.LiveCoursePageContract;
@@ -32,7 +34,7 @@ import java.util.Date;
  */
 public class LiveCoursePageFragment extends BaseMVPFragment<FragmentLiveCoursePageLayoutBinding, LiveCoursePagePresenter> implements LiveCoursePageContract.LiveCoursePageView, View.OnClickListener {
     private int currentPage;
-    private LiveCourseListAdapter mAdapter;
+    private MineLiveCourseListAdapter mAdapter;
     private EmptyViewLayout mEmptyView;
     private boolean hasNext = true;
     private String currentFilterDate;
@@ -56,7 +58,7 @@ public class LiveCoursePageFragment extends BaseMVPFragment<FragmentLiveCoursePa
             }
         });
 
-        mAdapter = new LiveCourseListAdapter(R.layout.item_live_course_list_layout);
+        mAdapter = new MineLiveCourseListAdapter(R.layout.item_live_course_list_layout);
 //        mAdapter.getLoadMoreModule().setEnableLoadMoreIfNotFullPage(false);
         mAdapter.getLoadMoreModule().setOnLoadMoreListener(new OnLoadMoreListener() {
             @Override
@@ -123,7 +125,7 @@ public class LiveCoursePageFragment extends BaseMVPFragment<FragmentLiveCoursePa
     }
 
     @Override
-    public void onGetLiveCourseSuccess(int page, LiveCourseListBean liveCourseListBean) {
+    public void onGetLiveCourseSuccess(int page, MineLiveCourseListBean liveCourseListBean) {
         if (isDetached()) {
             return;
         }

teacher/src/main/java/com/cooleshow/teacher/ui/main/MineFragment.java

@@ -56,12 +56,15 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
         mViewBinding.tvEquipmentTesting.setOnClickListener(this);
         mViewBinding.llCourseNumCompleted.setOnClickListener(this);
         mViewBinding.llCourseNumNotStart.setOnClickListener(this);
+        mViewBinding.ivGoodsOrder.setOnClickListener(this);
+        mViewBinding.tvGoodsOrder.setOnClickListener(this);
     }
 
     @Override
     protected void initData() {
 
     }
+
     //是否有直播权限 0 否 1 是
     private int liveFlag;
 
@@ -71,15 +74,15 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
         }
         liveFlag = teacherUserInfo.liveFlag;
         //头像
-        GlideUtils.INSTANCE.loadImage(requireContext(), teacherUserInfo.heardUrl, mViewBinding.ivAvatar,R.drawable.icon_teacher_default_head);
+        GlideUtils.INSTANCE.loadImage(requireContext(), teacherUserInfo.heardUrl, mViewBinding.ivAvatar, R.drawable.icon_teacher_default_head);
         //昵称
         mViewBinding.tvNickname.setText(UserHelper.getTeacherName(teacherUserInfo.username, teacherUserInfo.userId));
         //星级
-        if (teacherUserInfo.starGrade>0){
+        if (teacherUserInfo.starGrade > 0) {
             mViewBinding.ratingBar.setVisibility(View.VISIBLE);
             mViewBinding.ratingBar.setRating(teacherUserInfo.starGrade);
             mViewBinding.tvNoScore.setVisibility(View.GONE);
-        }else{
+        } else {
             mViewBinding.ratingBar.setVisibility(View.GONE);
             mViewBinding.tvNoScore.setVisibility(View.VISIBLE);
         }
@@ -120,10 +123,10 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
         } else if (TextUtils.equals(teacherUserInfo.musicianAuthStatus, TeacherInfoConstants.MUSICIAN_STATUS_DOING)) {
             mViewBinding.ivTeacherMusicPersonTag.setVisibility(View.GONE);
             mViewBinding.tvMusicStatusTip.setText("审核中");
-        }else if (TextUtils.equals(teacherUserInfo.musicianAuthStatus, TeacherInfoConstants.MUSICIAN_STATUS_UNPAALY)) {
+        } else if (TextUtils.equals(teacherUserInfo.musicianAuthStatus, TeacherInfoConstants.MUSICIAN_STATUS_UNPAALY)) {
             mViewBinding.ivTeacherMusicPersonTag.setVisibility(View.GONE);
             mViewBinding.tvMusicStatusTip.setText("未认证");
-        }else if (TextUtils.equals(teacherUserInfo.musicianAuthStatus, TeacherInfoConstants.MUSICIAN_STATUS_UNPASS)) {
+        } else if (TextUtils.equals(teacherUserInfo.musicianAuthStatus, TeacherInfoConstants.MUSICIAN_STATUS_UNPASS)) {
             mViewBinding.ivTeacherMusicPersonTag.setVisibility(View.GONE);
             mViewBinding.tvMusicStatusTip.setText("申请未通过");
         }
@@ -233,12 +236,12 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
                 break;
             case R.id.iv_open_live:
             case R.id.tv_open_live:
-                if (liveFlag==0){
+                if (liveFlag == 0) {
                     ARouter.getInstance()
                             .build(RouterPath.WebCenter.ACTIVITY_HTML)
                             .withString(WebConstants.WEB_URL, WebConstants.TEACHER_OPEN_LIVE)
                             .navigation();
-                }else {
+                } else {
                     ARouter.getInstance().build(RouterPath.LiveCenter.TEACHER_MINE_CREATE_COURSE)
                             .navigation();
                 }
@@ -268,12 +271,20 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
                 ARouter.getInstance().build(RouterPath.CourseCenter.TEACHER_MINE_COURSE)
                         .navigation();
                 break;
+            //商品订单
+            case R.id.tv_goods_order:
+            case R.id.iv_goods_order:
+                ARouter.getInstance()
+                        .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                        .withString(WebConstants.WEB_URL, WebConstants.MALL_GOODS_ORDER)
+                        .navigation();
+                break;
 
 
         }
     }
 
-    private void checkPermission(){
+    private void checkPermission() {
         new RxPermissions(this)
                 .request(Manifest.permission.RECORD_AUDIO,
                         Manifest.permission.WRITE_EXTERNAL_STORAGE)

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

@@ -369,6 +369,7 @@
             app:layout_constraintTop_toTopOf="@+id/iv_mine_page" />
 
         <TextView
+            android:id="@+id/tv_goods_order"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:includeFontPadding="false"