修改bug

student/src/main/java/com/cooleshow/student/adapter/VideoCourseListAdapter.java

@@ -10,19 +10,20 @@ 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.student.R;
+import com.cooleshow.student.bean.SelectMyGroupBean;
 import com.cooleshow.student.bean.VideoCourseListBean;
 
 /**
  * Author by pq, Date on 2022/4/26.
  */
-public class VideoCourseListAdapter extends BaseQuickAdapter<VideoCourseListBean.RowsBean, BaseViewHolder> implements LoadMoreModule {
+public class VideoCourseListAdapter extends BaseQuickAdapter<SelectMyGroupBean.RowsBean, BaseViewHolder> implements LoadMoreModule {
 
     public VideoCourseListAdapter(int layoutResId) {
         super(layoutResId);
     }
 
     @Override
-    protected void convert(@NonNull BaseViewHolder holder, VideoCourseListBean.RowsBean data) {
+    protected void convert(@NonNull BaseViewHolder holder, SelectMyGroupBean.RowsBean data) {
         ImageView iv_bg = holder.getView(R.id.iv_bg);
         //封面
         GlideUtils.INSTANCE.loadImage(getContext(), data.lessonCoverUrl, iv_bg);
@@ -34,7 +35,7 @@ public class VideoCourseListAdapter extends BaseQuickAdapter<VideoCourseListBean
         //老师名称
         holder.setText(R.id.tv_author_name, data.username);
         //购买人数
-        holder.setText(R.id.tv_buy_num, getContext().getString(R.string.pay_count_str, data.countStudent));
+        holder.setText(R.id.tv_buy_num, getContext().getString(R.string.pay_count_str, data.countStudent+""));
         //￥120/4课时
         String price = "￥" + data.lessonPrice + "/" + data.lessonCount + "课时";
         holder.setText(R.id.tv_price, price);

student/src/main/java/com/cooleshow/student/api/APIService.java

@@ -21,6 +21,7 @@ import com.cooleshow.student.bean.LiveRoomInfoBean;
 import com.cooleshow.student.bean.PayTestBean;
 import com.cooleshow.student.bean.PracticeCourseListBean;
 import com.cooleshow.student.bean.QuerySubjectBean;
+import com.cooleshow.student.bean.SelectMyGroupBean;
 import com.cooleshow.student.bean.SparringCourseCommentBean;
 import com.cooleshow.student.bean.SparringCourseHomeworkBean;
 import com.cooleshow.student.bean.StudentUserInfo;
@@ -236,6 +237,16 @@ public interface APIService {
     Observable<BaseResponse<VideoCourseListBean>> getVideoCourses(@Body RequestBody body);
 
     /**
+     * 学生端-我的-我的课程-购买的视频课组
+     * @param body
+     * @return
+     */
+    @POST(STUDENT_GROUP + "videoLesson/selectMyGroup")
+    Observable<BaseResponse<SelectMyGroupBean>> selectMyGroup(@Body RequestBody body);
+
+
+
+    /**
      * 获取声部搜索下拉框
      *
      * @return

student/src/main/java/com/cooleshow/student/bean/SelectMyGroupBean.java

@@ -0,0 +1,38 @@
+package com.cooleshow.student.bean;
+
+import java.util.List;
+
+/**
+ * 创建日期：2022/6/17 11:15
+ *
+ * @author Ryan
+ * 类说明：
+ */
+public class SelectMyGroupBean {
+    public int limit;
+    public int nextPage;
+    public int offset;
+    public int pageNo;
+    public int prePage;
+    public int total;
+    public int totalPage;
+    public List<RowsBean> rows;
+
+    public static class RowsBean {
+        public String avatar;
+        public int countStudent;
+        public long id;
+        public int lessonCount;
+        public String lessonCoverUrl;
+        public String lessonDesc;
+        public String lessonName;
+        public double lessonPrice;
+        public String lessonSubject;
+        public String lessonSubjectName;
+        public String realName;
+        public int teacherId;
+        public String username;
+
+    }
+
+}

student/src/main/java/com/cooleshow/student/contract/VideoCourseContract.java

@@ -1,6 +1,7 @@
 package com.cooleshow.student.contract;
 
 import com.cooleshow.base.presenter.view.BaseView;
+import com.cooleshow.student.bean.SelectMyGroupBean;
 import com.cooleshow.student.bean.VideoCourseListBean;
 
 /**
@@ -9,7 +10,7 @@ import com.cooleshow.student.bean.VideoCourseListBean;
 public interface VideoCourseContract {
 
     interface VideoCourseView extends BaseView {
-        void onGetVideoCourseSuccess(int page, VideoCourseListBean liveCourseListBean);
+        void onGetVideoCourseSuccess(int page, SelectMyGroupBean liveCourseListBean);
 
         void onGetCourseError(int page);
     }

student/src/main/java/com/cooleshow/student/presenter/course/VideoCoursePresenter.java

@@ -5,6 +5,7 @@ import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.student.api.APIService;
+import com.cooleshow.student.bean.SelectMyGroupBean;
 import com.cooleshow.student.bean.VideoCourseListBean;
 import com.cooleshow.student.contract.VideoCourseContract;
 
@@ -27,15 +28,16 @@ public class VideoCoursePresenter extends BasePresenter<VideoCourseContract.Vide
             if (subjectId != 0) {
                 jsonObject.putOpt("subjectId", subjectId);
             }
-            jsonObject.putOpt("studentId", studentId);
+            jsonObject.putOpt("platform", "android");
+            jsonObject.putOpt("version", "1");
             jsonObject.putOpt("page", page);
             jsonObject.putOpt("rows", Constants.DEFAULT_DATA_SIZE);
         } catch (JSONException e) {
             e.printStackTrace();
         }
-        addSubscribe(create(APIService.class).getVideoCourses(RequestBodyUtil.convertToRequestBodyJson(jsonObject.toString())), new BaseObserver<VideoCourseListBean>(getView()) {
+        addSubscribe(create(APIService.class).selectMyGroup(RequestBodyUtil.convertToRequestBodyJson(jsonObject.toString())), new BaseObserver<SelectMyGroupBean>(getView()) {
             @Override
-            protected void onSuccess(VideoCourseListBean data) {
+            protected void onSuccess(SelectMyGroupBean data) {
                 if (getView() != null) {
                     getView().onGetVideoCourseSuccess(page, data);
                 }

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

@@ -22,7 +22,7 @@ import com.cooleshow.base.widgets.EmptyViewLayout;
 import com.cooleshow.student.R;
 import com.cooleshow.student.adapter.CourseStatusFilterAdapter;
 import com.cooleshow.student.adapter.VideoCourseListAdapter;
-import com.cooleshow.student.bean.VideoCourseListBean;
+import com.cooleshow.student.bean.SelectMyGroupBean;
 import com.cooleshow.student.contract.VideoCourseContract;
 import com.cooleshow.student.databinding.FragmentVideoCourseLayoutBinding;
 import com.cooleshow.student.presenter.course.VideoCoursePresenter;
@@ -121,7 +121,7 @@ public class VideoCourseFragment extends BaseMVPFragment<FragmentVideoCourseLayo
         mAdapter.setOnItemClickListener(new OnItemClickListener() {
             @Override
             public void onItemClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
-                VideoCourseListBean.RowsBean item = (VideoCourseListBean.RowsBean) adapter.getItem(position);
+                SelectMyGroupBean.RowsBean item = (SelectMyGroupBean.RowsBean) adapter.getItem(position);
                 ARouter.getInstance()
                         .build(RouterPath.WebCenter.ACTIVITY_HTML)
                         .withString(WebConstants.WEB_URL, WebConstants.TEACHER_VIDEO_DETAIL + "?groupId=" + item.id)
@@ -160,7 +160,7 @@ public class VideoCourseFragment extends BaseMVPFragment<FragmentVideoCourseLayo
 
 
     @Override
-    public void onGetVideoCourseSuccess(int page, VideoCourseListBean liveCourseListBean) {
+    public void onGetVideoCourseSuccess(int page, SelectMyGroupBean liveCourseListBean) {
         if (isDetached()) {
             return;
         }

student/src/main/java/com/cooleshow/student/ui/mine/TeachableInstrumentActivity.java

@@ -55,11 +55,11 @@ public class TeachableInstrumentActivity extends BaseMVPActivity<ActivityTeachab
                         }
                     }
                 }
-                if (selectTeachableInstrument.size()==0){
+                if (selectTeachableInstrument.size() == 0) {
                     ToastUtils.showShort("请选择乐器");
                     break;
                 }
-                presenter.setSubject(selectTeachableInstrument.get(0).id+"");
+                presenter.setSubject(selectTeachableInstrument.get(0).id + "");
 
                 break;
         }
@@ -67,15 +67,18 @@ public class TeachableInstrumentActivity extends BaseMVPActivity<ActivityTeachab
 
 
     private List<TeachableInstrumentBean> dataList = new ArrayList<>();
+    private boolean hintBar = false;
 
     @Override
     protected void initView() {
         ARouter.getInstance().inject(this);
-        boolean hintBar = getIntent().getBooleanExtra("hintBar", false);
-        if (hintBar){
+        hintBar = getIntent().getBooleanExtra("hintBar", false);
+        if (hintBar) {
             viewBinding.llTop.setVisibility(View.GONE);
-        }else{
-            initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "可教授乐器");
+            viewBinding.viewBar.setVisibility(View.VISIBLE);
+        } else {
+            viewBinding.viewBar.setVisibility(View.GONE);
+            initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "乐器选择");
         }
 
         instrumentList = viewBinding.rvInstrument;
@@ -87,6 +90,13 @@ public class TeachableInstrumentActivity extends BaseMVPActivity<ActivityTeachab
         initCarryData();
     }
 
+    @Override
+    public void onBackPressed() {
+        if (!hintBar) {
+            super.onBackPressed();
+        }
+    }
+
     private TeachableInstrumentBean carryList = null;
 
     private void initCarryData() {
@@ -122,25 +132,27 @@ public class TeachableInstrumentActivity extends BaseMVPActivity<ActivityTeachab
     public void subjectSelectSuccess(List<TeachableInstrumentBean> data) {
         if (null != data && data.size() > 0) {
             dataList.clear();
-            if (null != carryList) {
-                for (TeachableInstrumentBean datum : data) {
-                    if (null != datum.subjects && datum.subjects.size() > 0) {
-                        for (TeachableInstrumentBean subject : datum.subjects) {
+
+            for (TeachableInstrumentBean datum : data) {
+                if (null != datum.subjects && datum.subjects.size() > 0) {
+                    for (TeachableInstrumentBean subject : datum.subjects) {
+                        if (null != carryList) {
                             if (carryList.id == subject.id) {
                                 subject.isSelect = true;
                             }
                         }
-                        dataList.add(datum);
                     }
-
+                    dataList.add(datum);
                 }
+
             }
+        }
 
 
-            if (null != teachableInstrumentAdapter) {
-                teachableInstrumentAdapter.notifyDataSetChanged();
-            }
+        if (null != teachableInstrumentAdapter) {
+            teachableInstrumentAdapter.notifyDataSetChanged();
         }
+
     }
 
     @Override

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

@@ -1,51 +1,57 @@
 <?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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/color_f6f8f9"
-    android:orientation="vertical">
+    android:background="@color/color_f6f8f9">
 
     <LinearLayout
-        android:id="@+id/ll_top"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-        <include
-            android:id="@+id/toolbar_include"
-            layout="@layout/common_toolbar_layout" />
 
-    </LinearLayout>
+        <LinearLayout
+            android:id="@+id/ll_top"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
+            <include
+                android:id="@+id/toolbar_include"
+                layout="@layout/common_toolbar_layout" />
 
-    <TextView
-        android:id="@+id/tv_tips"
-        android:layout_width="match_parent"
-        android:layout_height="36dp"
-        android:layout_marginLeft="14dp"
-        android:layout_marginTop="15dp"
-        android:layout_below="@+id/ll_top"
-        android:layout_marginRight="14dp"
-        android:background="@drawable/bg_white_10dp"
-        android:gravity="center_vertical"
-        android:text="最多可选择1个乐器"
-        android:textColor="@color/color_ff9e5a"
-        android:textSize="@dimen/sp_14"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        </LinearLayout>
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rv_instrument"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/tv_tips"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginBottom="119dp"
-        android:nestedScrollingEnabled="false"
-        android:overScrollMode="never" />
+        <View
+            android:id="@+id/view_bar"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_20"
+            />
 
+        <TextView
+            android:id="@+id/tv_tips"
+            android:layout_width="match_parent"
+            android:layout_height="36dp"
+            android:layout_marginLeft="14dp"
+            android:layout_marginTop="15dp"
+            android:layout_marginRight="14dp"
+            android:background="@drawable/bg_white_10dp"
+            android:gravity="center_vertical"
+            android:text="最多可选择1个乐器"
+            android:textColor="@color/color_ff9e5a"
+            android:textSize="@dimen/sp_14" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_instrument"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginRight="10dp"
+            android:layout_marginBottom="119dp"
+            android:nestedScrollingEnabled="false"
+            android:overScrollMode="never" />
+
+    </LinearLayout>
 
     <TextView
         android:id="@+id/tv_confirm"

teacher/src/main/java/com/cooleshow/teacher/ui/score/MineScoreActivity.java

@@ -97,7 +97,7 @@ public class MineScoreActivity extends BaseMVPActivity<ActivityMineScoreBinding,
     }
 
     private List<String> titles = new ArrayList<String>(Arrays.asList("已上架", "审核中", "审核失败"));
-    private List<String> auditStatusList = new ArrayList<String>(Arrays.asList("DOING", "PASS", "UNPASS"));
+    private List<String> auditStatusList = new ArrayList<String>(Arrays.asList("PASS", "DOING", "UNPASS"));
     private List<Fragment> fragments = new ArrayList<>();
 
     private void initTabLayoutAndViewPager() {

teacher/src/main/java/com/cooleshow/teacher/widgets/DialogUtils.java

@@ -70,6 +70,7 @@ public class DialogUtils {
         TextView tv_share = view.findViewById(R.id.tv_share);
         ConstraintLayout cl_content=view.findViewById(R.id.cl_content);
         RecyclerView rv_list = view.findViewById(R.id.rv_list);
+        RelativeLayout rl_all=view.findViewById(R.id.rl_all);
         if (data.musicSheetCount == 0) {
             rv_list.setVisibility(View.GONE);
         } else {
@@ -128,6 +129,12 @@ public class DialogUtils {
                 }
             }
         });
+        rl_all.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mAlertDialog.dismiss();
+            }
+        });
     }
 
 

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

@@ -7,6 +7,7 @@
     android:layout_centerInParent="true"
     android:layout_marginLeft="20dp"
     android:layout_marginRight="20dp"
+    android:id="@+id/rl_all"
     android:background="@color/transparent">
 
     <androidx.constraintlayout.widget.ConstraintLayout

usercenter/src/main/java/com/cooleshow/usercenter/ui/activity/LoginActivity.kt

@@ -58,6 +58,11 @@ class LoginActivity : BaseMVPActivity<ActivityLoginBinding, LoginPresenter>(),
                 ToastUtils.showShort("手机号不可为空")
                 return@setOnClickListener;
             }
+
+            if (et_phone_num?.text?.length != 11) {
+                ToastUtils.showShort("请输入正确手机号")
+                return@setOnClickListener;
+            }
             if (TextUtils.isEmpty(et_password?.text)) {
                 ToastUtils.showShort("密码不可为空")
                 return@setOnClickListener;

usercenter/src/main/java/com/cooleshow/usercenter/ui/activity/VerifyCodeLoginActivity.java

@@ -86,6 +86,10 @@ public class VerifyCodeLoginActivity extends BaseMVPActivity<ActivityVerifyCodeL
             }
             //获取验证码
             String phone = viewBinding.etPhoneNum.getText().toString();
+            if (phone.length()!=11){
+                ToastUtils.showShort("请输入正确手机号");
+                return;
+            }
             if (PhoneCheckHelper.checkPhoneValidity(phone)) {
                 ARouter.getInstance().build(RouterPath.UserCenter.PATH_VERIFY_INPUT)
                         .withString(VerifyCodeInputActivity.TARGET_PHONE, phone)