老师个人主页 修改bug

BaseLibrary/src/main/java/com/cooleshow/base/utils/ToastUtils.java

@@ -381,7 +381,9 @@ public final class ToastUtils {
      * @param text The text.
      */
     public static void showShort(@Nullable final CharSequence text) {
-        show(text, Toast.LENGTH_SHORT, DEFAULT_MAKER);
+        //已经写了很多toast，为了方便统一调整为屏幕中间，所以这么拦截
+        make().setGravity(Gravity.CENTER,0,0).show(text);
+//        show(text, Toast.LENGTH_SHORT, DEFAULT_MAKER);
     }
 
     /**

live_teaching/src/main/java/com/daya/live_teaching/ui/LiveActivity.java

@@ -21,15 +21,13 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProviders;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.cooleshow.base.common.AppManager;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseActivity;
+import com.cooleshow.usercenter.ui.activity.BaseActivity;
 import com.cooleshow.base.utils.KeyboardUtils;
 import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.SizeUtils;

live_teaching/src/main/java/com/daya/live_teaching/ui/fragmnet/AccompanimentListFragment.java

@@ -16,12 +16,9 @@ import android.widget.LinearLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import com.cooleshow.base.ui.fragment.BaseFragment;
+import com.cooleshow.usercenter.ui.activity.BaseFragment;
 import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.ToastUtil;
-import com.cooleshow.base.widgets.dialog.BaseDialogFragment;
-import com.cooleshow.base.widgets.ColorTextView;
-import com.cooleshow.base.widgets.dialog.DialogFragmentViewHolder;
 import com.daya.live_teaching.R;
 import com.daya.live_teaching.common.ResultCallback;
 import com.daya.live_teaching.databinding.FragmentAccompanimentListBinding;

live_teaching/src/main/java/com/daya/live_teaching/ui/fragmnet/BigVideoWindowFragment.java

@@ -1,15 +1,13 @@
 package com.daya.live_teaching.ui.fragmnet;
 
 
-import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
-import com.cooleshow.base.ui.fragment.BaseFragment;
-import com.daya.live_teaching.R;
+import com.cooleshow.usercenter.ui.activity.BaseFragment;
 import com.daya.live_teaching.databinding.FragmentBigVideoWindowBinding;
 import com.daya.live_teaching.model.ClassMember;
 import com.daya.live_teaching.model.ScreenDisplay;

live_teaching/src/main/java/com/daya/live_teaching/ui/fragmnet/GonggeModeFragment.java

@@ -1,14 +1,12 @@
 package com.daya.live_teaching.ui.fragmnet;
 
-import android.content.Intent;
 import android.graphics.Color;
-import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
-import com.cooleshow.base.ui.fragment.BaseFragment;
+import com.cooleshow.usercenter.ui.activity.BaseFragment;
 import com.cooleshow.base.utils.SizeUtils;
 import com.daya.live_teaching.R;
 import com.daya.live_teaching.databinding.FragmentGonggeModeBinding;

live_teaching/src/main/java/com/daya/live_teaching/ui/fragmnet/MemberListFragment.java

@@ -1,12 +1,9 @@
 package com.daya.live_teaching.ui.fragmnet;
 
 
-import android.content.Intent;
-import android.os.Bundle;
 import android.view.View;
 
-import com.cooleshow.base.ui.fragment.BaseFragment;
-import com.daya.live_teaching.R;
+import com.cooleshow.usercenter.ui.activity.BaseFragment;
 import com.daya.live_teaching.databinding.FragmentClassMemberListBinding;
 import com.daya.live_teaching.ui.adapter.FixPagerAdapter;
 import com.google.android.material.tabs.TabLayout;

live_teaching/src/main/java/com/daya/live_teaching/ui/fragmnet/NotOnlineMembersFragment.java

@@ -1,12 +1,9 @@
 package com.daya.live_teaching.ui.fragmnet;
 
-import android.content.Intent;
-import android.os.Bundle;
 import android.view.View;
 import android.widget.TextView;
 
-import com.cooleshow.base.ui.fragment.BaseFragment;
-import com.daya.live_teaching.R;
+import com.cooleshow.usercenter.ui.activity.BaseFragment;
 import com.daya.live_teaching.databinding.FragmentNotOnlineMembersBinding;
 import com.daya.live_teaching.model.ClassMember;
 import com.daya.live_teaching.ui.adapter.NotOnlineMembersListAdapter;

live_teaching/src/main/java/com/daya/live_teaching/ui/fragmnet/OnlineMembersFragment.java

@@ -1,11 +1,9 @@
 package com.daya.live_teaching.ui.fragmnet;
 
-import android.content.Intent;
-import android.os.Bundle;
 import android.view.View;
 import android.widget.TextView;
 
-import com.cooleshow.base.ui.fragment.BaseFragment;
+import com.cooleshow.usercenter.ui.activity.BaseFragment;
 import com.daya.live_teaching.R;
 import com.daya.live_teaching.databinding.FragmentNotOnlineMembersBinding;
 import com.daya.live_teaching.model.ClassMember;

live_teaching/src/main/java/com/daya/live_teaching/ui/fragmnet/PlayMetronomeFragment.java

@@ -1,11 +1,9 @@
 package com.daya.live_teaching.ui.fragmnet;
 
 import android.content.Context;
-import android.content.Intent;
 import android.media.AudioAttributes;
 import android.media.AudioManager;
 import android.media.SoundPool;
-import android.os.Bundle;
 import android.os.Handler;
 import android.text.TextUtils;
 import android.view.View;
@@ -15,7 +13,7 @@ import android.widget.TextView;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProviders;
 
-import com.cooleshow.base.ui.fragment.BaseFragment;
+import com.cooleshow.usercenter.ui.activity.BaseFragment;
 import com.cooleshow.base.utils.FileUtils;
 import com.cooleshow.base.utils.LogUtils;
 import com.daya.live_teaching.R;

live_teaching/src/main/java/com/daya/live_teaching/ui/fragmnet/ShareScreenFragment.java

@@ -1,9 +1,7 @@
 package com.daya.live_teaching.ui.fragmnet;
 
 
-import android.content.Intent;
 import android.content.res.Configuration;
-import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
@@ -17,7 +15,7 @@ import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProviders;
 
-import com.cooleshow.base.ui.fragment.BaseFragment;
+import com.cooleshow.usercenter.ui.activity.BaseFragment;
 import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.SizeUtils;
 import com.cooleshow.base.utils.ToastUtil;

live_teaching/src/main/java/com/daya/live_teaching/ui/fragmnet/TeachingToolsFragment.java

@@ -9,7 +9,7 @@ import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProviders;
 
-import com.cooleshow.base.ui.fragment.BaseFragment;
+import com.cooleshow.usercenter.ui.activity.BaseFragment;
 import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.SizeUtils;
 import com.cooleshow.base.utils.ToastUtil;

live_teaching/src/main/java/com/daya/live_teaching/ui/fragmnet/TopOperateControlFragment.java

@@ -8,9 +8,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.media.AudioManager;
-import android.os.Bundle;
 import android.os.Handler;
-import android.text.TextUtils;
 import android.view.View;
 import android.view.animation.AlphaAnimation;
 import android.widget.Button;
@@ -23,7 +21,7 @@ import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProviders;
 
-import com.cooleshow.base.ui.fragment.BaseFragment;
+import com.cooleshow.usercenter.ui.activity.BaseFragment;
 import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.SizeUtils;
 import com.cooleshow.base.utils.ToastUtil;

live_teaching/src/main/java/com/daya/live_teaching/ui/fragmnet/VideoListFragment.java

@@ -1,14 +1,12 @@
 package com.daya.live_teaching.ui.fragmnet;
 
 
-import android.content.Intent;
-import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
-import com.cooleshow.base.ui.fragment.BaseFragment;
+import com.cooleshow.usercenter.ui.activity.BaseFragment;
 import com.daya.live_teaching.R;
 import com.daya.live_teaching.databinding.FragmentVideoListBinding;
 import com.daya.live_teaching.model.ClassMember;

live_teaching/src/main/java/com/daya/live_teaching/ui/fragmnet/WhiteBoardFragment.java

@@ -9,7 +9,6 @@ import android.graphics.BitmapFactory;
 import android.graphics.Matrix;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
-import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.view.View;
@@ -22,19 +21,15 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProviders;
 
-import com.alibaba.android.arouter.core.LogisticsCenter;
-import com.alibaba.android.arouter.facade.Postcard;
-import com.alibaba.android.arouter.launcher.ARouter;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.transition.Transition;
 import com.cooleshow.base.constanst.Constants;
-import com.cooleshow.base.ui.fragment.BaseFragment;
+import com.cooleshow.usercenter.ui.activity.BaseFragment;
 import com.cooleshow.base.utils.FileUtils;
 import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.PermissionUtils;

rong_im/common_im_ui/build.gradle

@@ -39,5 +39,5 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     implementation project(':BaseLibrary')
     implementation project(':rong_im:kit')
-
+    implementation project(':usercenter')
 }

rong_im/common_im_ui/src/main/java/com/common/im/ui/MessageFragment.java

@@ -11,8 +11,8 @@ import com.common.im.presenter.MessagePresenter;
 import com.common.im.ui.contact.ContactPersonListFragment;
 import com.common.im_ui.R;
 import com.common.im_ui.databinding.FragmentMessageLayoutBinding;
-import com.cooleshow.base.ui.fragment.BaseMVPFragment;
 import com.cooleshow.base.utils.Utils;
+import com.cooleshow.usercenter.ui.activity.BaseMVPFragment;
 import com.google.android.material.tabs.TabLayout;
 import com.google.android.material.tabs.TabLayoutMediator;
 
@@ -20,7 +20,7 @@ import java.util.ArrayList;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
-import androidx.viewpager2.adapter.FragmentStateAdapter;
+
 import io.rong.imkit.conversationlist.ConversationListFragment;
 
 /**

rong_im/common_im_ui/src/main/java/com/common/im/ui/contact/ContactPersonListFragment.java

@@ -1,17 +1,8 @@
 package com.common.im.ui.contact;
 
 
-import android.content.Context;
 import android.graphics.Color;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.KeyEvent;
 import android.view.View;
-import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.TextView;
 
 
 import com.common.im.adapter.ContactListAdapter;
@@ -20,22 +11,15 @@ import com.common.im.contract.ContactListFragmentContract;
 import com.common.im.presenter.ContactListPresenter;
 import com.common.im_ui.R;
 import com.common.im_ui.databinding.FragmentContactListLayoutBinding;
-import com.cooleshow.base.ui.fragment.BaseMVPFragment;
 import com.cooleshow.base.utils.SizeUtils;
 import com.cooleshow.base.widgets.EmptyViewLayout;
+import com.cooleshow.usercenter.ui.activity.BaseMVPFragment;
 import com.mcxtzhang.indexlib.suspension.SuspensionDecoration;
 
-import java.text.CollationKey;
-import java.text.Collator;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 
-import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import io.rong.imkit.RongIM;
-import io.rong.imlib.model.Conversation;
 
 /**
  * 联系人列表

student/src/main/java/com/cooleshow/student/constants/CourseTableContract.java

@@ -14,6 +14,7 @@ public interface CourseTableContract {
     interface CourseTableView extends BaseView {
         void onGetCourseDateByMonthSuccess(List<String> datas);
         void onGetCourseSchedulesWithDateSuccess(CourseTableDataBean courseTableDataBean);
+        void onGetCourseDateByMonthError();
     }
 
     interface Presenter {

student/src/main/java/com/cooleshow/student/presenter/main/CourseTablePresenter.java

@@ -42,6 +42,14 @@ public class CourseTablePresenter extends BasePresenter<CourseTableContract.Cour
                     getView().onGetCourseDateByMonthSuccess(data);
                 }
             }
+
+            @Override
+            public void onError(Throwable e) {
+                super.onError(e);
+                if (getView() != null) {
+                    getView().onGetCourseDateByMonthError();
+                }
+            }
         });
     }
 

student/src/main/java/com/cooleshow/student/presenter/main/HomePresenter.java

@@ -1,23 +1,17 @@
 package com.cooleshow.student.presenter.main;
 
 import com.cooleshow.base.constanst.Constants;
-import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
-import com.cooleshow.base.utils.ToastUtils;
-import com.cooleshow.base.utils.helper.ErrorParse;
 import com.cooleshow.student.api.APIService;
 import com.cooleshow.student.bean.AppHomeBean;
 import com.cooleshow.student.bean.CountOfUnreadBean;
 import com.cooleshow.student.bean.HomeLiveAndVideoBean;
 import com.cooleshow.student.bean.HomeStyleBean;
 import com.cooleshow.student.bean.HotAlbumBean;
-import com.cooleshow.student.bean.PayTestBean;
 import com.cooleshow.student.bean.StudentUserInfo;
-import com.cooleshow.student.bean.TeachableInstrumentBean;
 import com.cooleshow.student.contract.HomeContract;
-import com.cooleshow.student.contract.MineContract;
 
 import org.json.JSONException;
 import org.json.JSONObject;

student/src/main/java/com/cooleshow/student/presenter/mine/AddressListPresenter.java

@@ -4,7 +4,7 @@ import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.ToastUtils;
-import com.cooleshow.base.utils.helper.ErrorParse;
+import com.cooleshow.usercenter.utils.ErrorParse;
 import com.cooleshow.student.api.APIService;
 import com.cooleshow.student.bean.AddressBean;
 import com.cooleshow.student.contract.AddressListContract;

student/src/main/java/com/cooleshow/student/presenter/mine/CheckModifyPhoneNumPresenter.java

@@ -4,7 +4,7 @@ import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.ToastUtils;
-import com.cooleshow.base.utils.helper.ErrorParse;
+import com.cooleshow.usercenter.utils.ErrorParse;
 import com.cooleshow.student.api.APIService;
 import com.cooleshow.student.contract.CheckModifyPhoneNumContract;
 

student/src/main/java/com/cooleshow/student/presenter/mine/EditAddressPresenter.java

@@ -5,7 +5,7 @@ import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.base.utils.ToastUtils;
-import com.cooleshow.base.utils.helper.ErrorParse;
+import com.cooleshow.usercenter.utils.ErrorParse;
 import com.cooleshow.student.api.APIService;
 import com.cooleshow.student.contract.EditAddressContract;
 

student/src/main/java/com/cooleshow/student/presenter/mine/FeedBackPresenter.java

@@ -5,7 +5,7 @@ import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.base.utils.ToastUtils;
-import com.cooleshow.base.utils.helper.ErrorParse;
+import com.cooleshow.usercenter.utils.ErrorParse;
 import com.cooleshow.student.api.APIService;
 import com.cooleshow.student.contract.FeedBackContract;
 

student/src/main/java/com/cooleshow/student/presenter/mine/ModifyPasswordPresenter.java

@@ -5,7 +5,7 @@ import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.base.utils.ToastUtils;
-import com.cooleshow.base.utils.helper.ErrorParse;
+import com.cooleshow.usercenter.utils.ErrorParse;
 import com.cooleshow.student.api.APIService;
 import com.cooleshow.student.contract.ModifyPasswordContract;
 import com.cooleshow.usercenter.bean.SetDetailBean;

student/src/main/java/com/cooleshow/student/presenter/mine/ModifyPhoneNumPresenter.java

@@ -4,7 +4,7 @@ import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.ToastUtils;
-import com.cooleshow.base.utils.helper.ErrorParse;
+import com.cooleshow.usercenter.utils.ErrorParse;
 import com.cooleshow.student.api.APIService;
 import com.cooleshow.student.contract.ModifyPhoneNumContract;
 

student/src/main/java/com/cooleshow/student/presenter/mine/PersonalCertificationPresenter.java

@@ -5,7 +5,7 @@ import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.base.utils.ToastUtils;
-import com.cooleshow.base.utils.helper.ErrorParse;
+import com.cooleshow.usercenter.utils.ErrorParse;
 import com.cooleshow.student.api.APIService;
 import com.cooleshow.student.contract.PersonalCertificationContract;
 

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

@@ -3,12 +3,11 @@ package com.cooleshow.student.ui.course;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.view.View;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.widgets.RatingBar;
 import com.cooleshow.student.R;

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

@@ -25,7 +25,7 @@ import com.chad.library.adapter.base.listener.OnLoadMoreListener;
 import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.fragment.BaseMVPFragment;
+import com.cooleshow.usercenter.ui.activity.BaseMVPFragment;
 import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.PopupUtil;
 import com.cooleshow.base.utils.TimeUtils;

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

@@ -8,7 +8,7 @@ import androidx.viewpager.widget.ViewPager;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.student.adapter.MineCoursePagerAdapter;
 import com.cooleshow.student.databinding.ActivityMineCourseBinding;
 import com.cooleshow.student.presenter.course.MineCoursePresenter;

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

@@ -1,11 +1,9 @@
 package com.cooleshow.student.ui.course;
 
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 import android.widget.PopupWindow;
 import android.widget.TextView;
 
@@ -25,7 +23,7 @@ import com.chad.library.adapter.base.listener.OnItemClickListener;
 import com.chad.library.adapter.base.listener.OnLoadMoreListener;
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.fragment.BaseMVPFragment;
+import com.cooleshow.usercenter.ui.activity.BaseMVPFragment;
 import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.PopupUtil;
 import com.cooleshow.base.utils.TimeUtils;
@@ -127,7 +125,6 @@ public class MinePracticeCourseFragment extends BaseMVPFragment<FragmentPractice
         currentFilterDate = targetDateTimeStr;
         currentCourseFilterStatus = !TextUtils.isEmpty(status) ? status : CourseConstants.COURSE_FILTER_ALL;
         currentPage = 1;
-        Log.e("askdjhkasdfs", "reBuildFilter: ");
         mViewBinding.tvTime.setText(currentFilterDate);
         queryCourse(true);
     }

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

@@ -15,7 +15,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.ToastUtils;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ActivityUtils;
 import com.cooleshow.base.utils.FileUtils;
 import com.cooleshow.base.utils.GlideUtils;
@@ -57,6 +58,7 @@ public class PracticeCourseDetailActivity extends BaseMVPActivity<ActivityPracti
                 switch (courseStatus) {
                     case CourseConstants.COURSE_STATUS_NOT_START:
                         //课程未开始
+                        ToastUtils.showShort("课程还未开始，请在上课前5分钟进入");
                         break;
                     case CourseConstants.COURSE_STATUS_ING:
                         //课程进行中
@@ -92,6 +94,7 @@ public class PracticeCourseDetailActivity extends BaseMVPActivity<ActivityPracti
 
     @Override
     protected void initView() {
+        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "课程详情");
         mCourseId = getIntent().getStringExtra(COURSE_ID);
         mCourseGroupId = getIntent().getStringExtra(COURSE_GROUP_ID);
         viewBinding.tvDo.setOnClickListener(this);

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

@@ -6,9 +6,7 @@ import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
 
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.SizeUtils;
 
@@ -21,7 +19,6 @@ import com.cooleshow.student.databinding.ActivitySparringCourseDetailLayoutBindi
 import com.cooleshow.student.presenter.course.SparringCourseDetailPresenter;
 import com.cooleshow.student.widgets.CourseSetCommentDialog;
 import com.cooleshow.student.widgets.HomeworkVideoThumbnailView;
-import com.cooleshow.usercenter.helper.UserHelper;
 
 /**
  * Author by pq, Date on 2022/4/27.

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

@@ -15,7 +15,7 @@ import com.chad.library.adapter.base.listener.OnLoadMoreListener;
 import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.fragment.BaseMVPFragment;
+import com.cooleshow.usercenter.ui.activity.BaseMVPFragment;
 import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.SizeUtils;
 import com.cooleshow.base.widgets.EmptyViewLayout;

student/src/main/java/com/cooleshow/student/ui/live/LiveRoomActivity.java

@@ -27,11 +27,10 @@ import android.widget.Toast;
 
 import com.airbnb.lottie.LottieAnimationView;
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.alibaba.android.arouter.launcher.ARouter;
 import com.bumptech.glide.Glide;
 import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.AppUtils;
 import com.cooleshow.base.utils.SizeUtils;
 import com.cooleshow.base.utils.SoftKeyboardUtil;

student/src/main/java/com/cooleshow/student/ui/main/CourseTableFragment.kt

@@ -1,5 +1,6 @@
 package com.cooleshow.student.ui.main
 
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
@@ -12,7 +13,7 @@ import com.bigkoo.pickerview.listener.CustomListener
 import com.bigkoo.pickerview.listener.OnTimeSelectListener
 import com.bigkoo.pickerview.view.TimePickerView
 import com.chad.library.adapter.base.listener.OnItemClickListener
-import com.cooleshow.base.ui.fragment.BaseMVPFragment
+import com.cooleshow.usercenter.ui.activity.BaseMVPFragment
 import com.cooleshow.base.utils.SizeUtils
 import com.cooleshow.base.utils.TimeUtils
 import com.cooleshow.base.widgets.EmptyViewLayout
@@ -27,6 +28,7 @@ import com.cooleshow.student.widgets.CalendarShrinkDecoration
 import com.cooleshow.student.widgets.helper.CourseHelper
 
 import com.haibin.calendarview.CalendarView
+import com.scwang.smart.refresh.layout.listener.OnRefreshListener
 import kotlinx.android.synthetic.main.fragment_course_table_layout.*
 import java.util.*
 
@@ -90,8 +92,11 @@ class CourseTableFragment :
                             )
                         ) {
                             if (mViewBinding.calendarLayout.isExpand) {
+                                Log.e("sdfsdgsdsdasdaf", "shrink" )
+
                                 mViewBinding.calendarLayout.shrink()
                             } else {
+                                Log.e("sdfsdgsdsdasdaf", "expand" )
                                 mViewBinding.calendarLayout.expand()
                             }
                             return true
@@ -103,6 +108,10 @@ class CourseTableFragment :
         })
         adapter.setOnItemClickListener(OnItemClickListener() { adapter, view, position ->
         })
+
+        mViewBinding.refreshLayout.setOnRefreshListener(OnRefreshListener {
+            queryCurrentDataCourse()
+        })
     }
 
     override fun initData() {
@@ -178,11 +187,13 @@ class CourseTableFragment :
         if (!isMonthView) {
             recyclerView.removeItemDecoration(calendarExpandDecoration)
             if (recyclerView.itemDecorationCount == 0 || recyclerView.getItemDecorationAt(0) !is CalendarShrinkDecoration) {
+                Log.e("sdfsdgsdsdasdaf", "calendarShrinkDecoration: " )
                 recyclerView.addItemDecoration(calendarShrinkDecoration, 0)
             }
         } else {
             recyclerView.removeItemDecoration(calendarShrinkDecoration)
             if (recyclerView.itemDecorationCount == 0 || recyclerView.getItemDecorationAt(0) !is CalendarExpandDecoration) {
+                Log.e("sdfsdgsdsdasdaf", "calendarExpandDecoration: " )
                 recyclerView.addItemDecoration(calendarExpandDecoration, 0)
             }
         }
@@ -199,14 +210,19 @@ class CourseTableFragment :
         if (isDetached) {
             return;
         }
+        mViewBinding.refreshLayout.finishRefresh()
         if (datas?.size != 0) {
             //更新日历表,显示有课字样
             var maps = CourseHelper.filterDate(datas);
             if (maps != null && maps.isNotEmpty()) {
+                Log.e("asdfasdfasdf", "onGetCourseDateByMonthSuccess: " )
                 mViewBinding.calendarView.addSchemeDate(maps)
             }
         }
     }
+    override fun onGetCourseDateByMonthError() {
+        mViewBinding.refreshLayout.finishRefresh()
+    }
 
     /**
      * 查询当天的课程
@@ -227,6 +243,8 @@ class CourseTableFragment :
         }
     }
 
+
+
     private fun showEmptyView() {
         if (!::emptyView.isInitialized) {
             emptyView = EmptyViewLayout(context)

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

@@ -22,7 +22,7 @@ import com.chad.library.adapter.base.listener.OnItemClickListener;
 import com.cooleshow.base.common.BaseApplication;
 import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.fragment.BaseMVPFragment;
+import com.cooleshow.usercenter.ui.activity.BaseMVPFragment;
 import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.helper.QMUIDisplayHelper;
 import com.cooleshow.student.R;

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

@@ -2,7 +2,6 @@ package com.cooleshow.student.ui.main;
 
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 
 import androidx.annotation.NonNull;
@@ -14,13 +13,11 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.listener.OnItemClickListener;
 import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.fragment.BaseMVPFragment;
-import com.cooleshow.student.R;
+import com.cooleshow.usercenter.ui.activity.BaseMVPFragment;
 import com.cooleshow.student.adapter.HomeMenuItemAdapter;
 import com.cooleshow.student.bean.AppHomeBean;
 import com.cooleshow.student.databinding.FragmentHomeMenuBinding;
 import com.cooleshow.student.presenter.main.HomeMenuPresenter;
-import com.daya.live_teaching.ui.adapter.AddPhotoListAdapter;
 
 import java.io.Serializable;
 import java.util.ArrayList;

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

@@ -1,6 +1,5 @@
 package com.cooleshow.student.ui.main;
 
-import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.MenuItem;
@@ -12,12 +11,11 @@ import androidx.fragment.app.Fragment;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.common.im.ui.MessageFragment;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.student.R;
 import com.cooleshow.student.adapter.HomePageAdapter;
-import com.cooleshow.student.bean.TeachableInstrumentBean;
 import com.cooleshow.student.contract.MainContract;
 import com.cooleshow.student.databinding.ActivityMainBinding;
 import com.cooleshow.student.presenter.main.MainPresenter;
@@ -28,7 +26,6 @@ import com.daya.live_teaching.im.IMManager;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 
 import java.util.ArrayList;
-import java.util.List;
 
 import io.rong.imlib.RongIMClient;
 

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

@@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.fragment.BaseMVPFragment;
+import com.cooleshow.usercenter.ui.activity.BaseMVPFragment;
 import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.PermissionUtils;
 import com.cooleshow.base.widgets.DialogUtil;
@@ -21,7 +21,6 @@ import com.cooleshow.student.bean.StudentUserInfo;
 import com.cooleshow.student.contract.MineContract;
 import com.cooleshow.student.databinding.FragmentMineLayoutBinding;
 import com.cooleshow.student.presenter.main.MinePresenter;
-import com.cooleshow.student.ui.course.SparringCourseDetailActivity;
 import com.tbruyelle.rxpermissions3.RxPermissions;
 
 import java.util.ArrayList;

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

@@ -11,7 +11,7 @@ import android.widget.FrameLayout;
 
 import com.cooleshow.base.BuildConfig;
 import com.cooleshow.base.common.WebConstants;
-import com.cooleshow.base.ui.fragment.BaseMVPFragment;
+import com.cooleshow.usercenter.ui.activity.BaseMVPFragment;
 import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.widgets.LollipopFixedWebView;
 import com.cooleshow.base.widgets.WebClient;

student/src/main/java/com/cooleshow/student/ui/message/MessageBoxActivity.java

@@ -1,7 +1,6 @@
 package com.cooleshow.student.ui.message;
 
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
@@ -17,7 +16,7 @@ import com.chad.library.adapter.base.listener.OnItemClickListener;
 import com.chad.library.adapter.base.listener.OnLoadMoreListener;
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 
 import com.cooleshow.student.R;
 import com.cooleshow.student.adapter.MessageBoxAdapter;

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

@@ -4,7 +4,7 @@ import android.view.View;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.AppUtils;
 import com.cooleshow.student.contract.AboutContract;
 import com.cooleshow.student.databinding.ActivityAboutBinding;

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

@@ -10,7 +10,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.student.R;
 import com.cooleshow.student.adapter.AddressListAdapter;
 import com.cooleshow.student.bean.AddressBean;

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

@@ -10,7 +10,7 @@ import androidx.annotation.Nullable;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.student.R;
 import com.cooleshow.student.contract.CheckModifyPhoneNumContract;

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

@@ -8,7 +8,7 @@ import androidx.annotation.Nullable;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.student.bean.StudentUserInfo;
 import com.cooleshow.student.contract.CheckTeachableContract;
 import com.cooleshow.student.databinding.ActivityCheckTeachableBinding;

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

@@ -1,16 +1,12 @@
 package com.cooleshow.student.ui.mine;
 
 import android.annotation.SuppressLint;
-import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.MotionEvent;
 import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
@@ -24,7 +20,7 @@ import com.bigkoo.pickerview.listener.OnOptionsSelectListener;
 import com.bigkoo.pickerview.view.OptionsPickerView;
 import com.cooleshow.base.bean.JsonBean;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.GetJsonDataUtil;
 import com.cooleshow.base.utils.ToastUtils;
 

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

@@ -23,7 +23,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cooleshow.base.bean.EquipmentTestingBean;
 import com.cooleshow.base.recorder.AudioRecorder;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.FileUtils;
 import com.cooleshow.base.utils.NetworkUtil;
 import com.cooleshow.base.widgets.DialogUtil;

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

@@ -8,7 +8,7 @@ import androidx.annotation.Nullable;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.student.R;
 import com.cooleshow.student.contract.FeedBackContract;

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

@@ -7,21 +7,16 @@ import android.view.View;
 
 import androidx.annotation.Nullable;
 
-import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.student.R;
-import com.cooleshow.student.bean.StudentUserInfo;
 import com.cooleshow.student.contract.ModifyNickNameContract;
 import com.cooleshow.student.databinding.ActivityModifyNicknameBinding;
 import com.cooleshow.student.presenter.mine.ModifyNickNamePresenter;
 import com.cooleshow.usercenter.bean.SetDetailBean;
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import com.ksyun.ks3.model.acl.CannedAccessControlList;
 
 import org.json.JSONException;
 import org.json.JSONObject;

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

@@ -13,7 +13,7 @@ import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.student.R;
 import com.cooleshow.student.contract.ModifyPasswordContract;

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

@@ -14,7 +14,7 @@ import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.student.R;
 import com.cooleshow.student.contract.ModifyPhoneNumContract;

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

@@ -11,7 +11,7 @@ import androidx.annotation.Nullable;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.NetworkUtil;
 import com.cooleshow.base.widgets.BaseDialog;
 import com.cooleshow.base.widgets.DialogUtil;

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

@@ -14,7 +14,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alipay.sdk.app.EnvUtils;
 import com.alipay.sdk.app.PayTask;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.student.R;
 import com.cooleshow.student.bean.PayTestBean;

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

@@ -8,7 +8,7 @@ import androidx.annotation.Nullable;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.student.R;
 import com.cooleshow.student.contract.PersonalCertificationContract;

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

@@ -20,7 +20,8 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder;
 import com.bigkoo.pickerview.listener.CustomListener;
 import com.bigkoo.pickerview.view.TimePickerView;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.helper.UserHelper;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ActivityUtils;
 import com.cooleshow.base.utils.FileUtils;
 import com.cooleshow.base.utils.GlideUtils;
@@ -34,10 +35,7 @@ import com.cooleshow.student.bean.TeachableInstrumentBean;
 import com.cooleshow.student.contract.PersonalSettingContract;
 import com.cooleshow.student.databinding.ActivityPersonalSettingBinding;
 import com.cooleshow.student.presenter.mine.PersonalSettingPresenter;
-import com.cooleshow.student.ui.main.MainActivity;
 import com.cooleshow.usercenter.bean.SetDetailBean;
-import com.cooleshow.usercenter.helper.UserHelper;
-import com.google.gson.Gson;
 import com.tbruyelle.rxpermissions3.RxPermissions;
 
 import org.json.JSONException;
@@ -97,7 +95,7 @@ public class PersonalSettingActivity extends BaseMVPActivity<ActivityPersonalSet
                 break;
             case R.id.cl_modify_psd:
                 ARouter.getInstance().build(RouterPath.MineCenter.MINE_MODIFY_PASSWORD)
-                        .withString("phoneNum", mySetDetailBean.phone)
+                        .withString("phoneNum",  UserHelper.getUserPhone())
                         .navigation();
                 break;
             case R.id.cl_certification:

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

@@ -10,7 +10,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.SPUtils;
 import com.cooleshow.student.R;
 import com.cooleshow.student.contract.SettingContract;

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

@@ -12,7 +12,7 @@ import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.student.R;
 import com.cooleshow.student.adapter.TeachableInstrumentAdapter;

student/src/main/java/com/cooleshow/student/ui/splash/GuideActivity.java

@@ -17,7 +17,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.common.ConstantKey;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.SPUtils;
 import com.cooleshow.base.widgets.MyViewPage;
 import com.cooleshow.student.R;

student/src/main/java/com/cooleshow/student/ui/splash/SplashActivity.kt

@@ -7,7 +7,7 @@ import com.alibaba.android.arouter.launcher.ARouter
 import com.cooleshow.base.common.ConstantKey
 import com.cooleshow.base.common.WebConstants
 import com.cooleshow.base.router.RouterPath
-import com.cooleshow.base.ui.activity.BaseActivity
+import com.cooleshow.usercenter.ui.activity.BaseActivity
 import com.cooleshow.base.utils.SPUtils
 import com.cooleshow.student.databinding.ActivitySplashLayoutBinding
 import com.cooleshow.usercenter.helper.UserHelper

student/src/main/java/com/cooleshow/student/ui/web/AgentWebActivity.java

@@ -9,10 +9,8 @@ import android.webkit.WebView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cooleshow.base.common.WebConstants;
-import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.widgets.AgentWebClient;
 import com.cooleshow.student.databinding.ActivityAgentWebBinding;
 import com.cooleshow.student.presenter.web.AgentWebPresenter;

student/src/main/java/com/cooleshow/student/ui/web/WebActivity.java

@@ -25,7 +25,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cooleshow.base.BuildConfig;
 import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseActivity;
+import com.cooleshow.usercenter.ui.activity.BaseActivity;
 import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.PermissionUtils;
 import com.cooleshow.base.utils.UriUtils;
@@ -408,9 +408,12 @@ public class WebActivity extends BaseActivity<ActivityHtmlBinding> implements Js
         if (requestCode == PictureConfig.CHOOSE_REQUEST && mUploadCallbackAboveL != null) {
             // 图片、视频、音频选择结果回调
             List<LocalMedia> selectList = PictureSelector.obtainMultipleResult(data);
-            String avatar = selectList.get(0).getCompressPath();
+            String avatar="";
+            if (null!=selectList&&selectList.size()>0){
+                avatar = selectList.get(0).getCompressPath();
+            }
 
-            if (avatar != null) {
+            if (!TextUtils.isEmpty(avatar)) {
                 mUploadCallbackAboveL.onReceiveValue(new Uri[]{PictureFileUtils.parUri(getApplicationContext(), new File(avatar))});
             } else {
                 mUploadCallbackAboveL.onReceiveValue(new Uri[]{});

student/src/main/java/com/cooleshow/student/ui/work/HomeWorkActivity.java

@@ -10,7 +10,7 @@ import androidx.viewpager.widget.ViewPager;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cooleshow.base.router.RouterPath;
 
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.student.adapter.HomeWorkPagerAdapter;
 import com.cooleshow.student.contract.HomeWorkActContract;
 import com.cooleshow.student.databinding.ActivityHomeworkBinding;

student/src/main/java/com/cooleshow/student/ui/work/HomeWorkFragment.java

@@ -17,7 +17,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.listener.OnItemClickListener;
 import com.chad.library.adapter.base.listener.OnLoadMoreListener;
 import com.cooleshow.base.constanst.Constants;
-import com.cooleshow.base.ui.fragment.BaseMVPFragment;
+import com.cooleshow.usercenter.ui.activity.BaseMVPFragment;
 import com.cooleshow.base.utils.TimeUtils;
 
 import com.cooleshow.student.R;

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

@@ -8,7 +8,7 @@
 
     <include
         android:id="@+id/toolbar_include"
-        layout="@layout/common_toolbar_layout_white" />
+        layout="@layout/common_toolbar_layout" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"

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

@@ -49,16 +49,24 @@
         android:layout_height="1dp"
         android:background="@color/divide_color2"
         app:layout_constraintTop_toBottomOf="@+id/view_tool_bar_bg" />
+    <com.scwang.smart.refresh.layout.SmartRefreshLayout
+        android:id="@+id/refreshLayout"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/view_tool_bar_bg">
 
+    <com.scwang.smart.refresh.header.ClassicsHeader
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
     <com.haibin.calendarview.CalendarLayout
         android:id="@+id/calendarLayout"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_height="match_parent"
         android:orientation="vertical"
         app:calendar_content_view_id="@+id/recyclerView"
         app:default_status="shrink"
-        app:layout_constraintTop_toBottomOf="@+id/view_tool_bar_bg">
+       >
 
         <com.cooleshow.base.widgets.MyCalenderView
             android:id="@+id/calendarView"
@@ -67,8 +75,6 @@
             android:paddingStart="@dimen/dp_8"
             android:paddingEnd="@dimen/dp_8"
             app:calendar_height="@dimen/dp_56"
-            app:week_line_background="@color/color_f2f2f2"
-            app:year_view_background="@color/white"
             app:current_day_text_color="@color/colorPrimary"
             app:current_month_text_color="@color/black_444"
             app:day_text_size="@dimen/dp_15"
@@ -86,10 +92,12 @@
             app:selected_theme_color="@color/colorPrimary"
             app:week_background="@color/white"
             app:week_bar_height="@dimen/dp_45"
+            app:week_line_background="@color/color_f2f2f2"
             app:week_start_with="sun"
             app:week_text_color="@color/gray_777"
             app:week_text_size="@dimen/dp_16"
-            app:week_view="com.cooleshow.student.widgets.SimpleWeekView" />
+            app:week_view="com.cooleshow.student.widgets.SimpleWeekView"
+            app:year_view_background="@color/white" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
@@ -98,5 +106,6 @@
             android:overScrollMode="never"
             android:scrollbars="none" />
     </com.haibin.calendarview.CalendarLayout>
+    </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -13,6 +13,7 @@ import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.MineLiveCourseListBean;
 import com.cooleshow.teacher.bean.MineVideoCourseListBean;
+import com.cooleshow.teacher.bean.VideoCourseListBean;
 
 import java.util.List;
 
@@ -22,28 +23,25 @@ import java.util.List;
  * @author Ryan
  * 类说明：
  */
-public class MineVideoCourseAdapter extends BaseQuickAdapter<MineVideoCourseListBean.RowsBean, BaseViewHolder> implements LoadMoreModule {
+public class MineVideoCourseAdapter extends BaseQuickAdapter<VideoCourseListBean.RowsBean, BaseViewHolder> implements LoadMoreModule {
 
-    public MineVideoCourseAdapter(List<MineVideoCourseListBean.RowsBean> data) {
+    public MineVideoCourseAdapter(List<VideoCourseListBean.RowsBean> data) {
         super(R.layout.layout_mine_video_course_item, data);
     }
 
 
     @Override
-    protected void convert(BaseViewHolder helper, MineVideoCourseListBean.RowsBean item) {
+    protected void convert(BaseViewHolder helper, VideoCourseListBean.RowsBean item) {
         ImageView im_pic = helper.getView(R.id.im_pic);
-        GlideUtils.INSTANCE.loadImage(getContext(), item.coverUrl, im_pic);
+        GlideUtils.INSTANCE.loadImage(getContext(), item.lessonCoverUrl, im_pic);
         TextView tv_title=helper.getView(R.id.tv_title);
-        tv_title.setText(item.videoTitle);
+        tv_title.setText(item.lessonName);
         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_price=helper.getView(R.id.tv_price);
 //        tv_price.setText("￥"+item.coursePrice+"/"+item.courseNum+"课时");
-        if (item.chargeFlag==0){
-            tv_price.setText("免费");
-        }else {
-            tv_price.setText("收费");
-        }
+        String price = "￥" + item.lessonPrice + "/" + item.lessonCount + "课时";
+        tv_price.setText( price);
     }
 
     @NonNull

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

@@ -13,11 +13,15 @@ public interface CourseTableContract {
 
     interface CourseTableView extends BaseView {
         void onGetCourseDateByMonthSuccess(List<String> datas);
+
         void onGetCourseSchedulesWithDateSuccess(CourseTableDataBean courseTableDataBean);
+
+        void onGetCourseDateByMonthError();
     }
 
     interface Presenter {
         void getCourseScheduleDateByMonth(String month);
+
         void getCourseSchedulesWithDate(Date date);
     }
 }

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

@@ -1,6 +1,7 @@
 package com.cooleshow.teacher.contract;
 
 import com.cooleshow.base.presenter.view.BaseView;
+import com.cooleshow.teacher.bean.LiveCourseListBean;
 import com.cooleshow.teacher.bean.TeacherSelfStyleInfoBean;
 
 /**
@@ -9,6 +10,8 @@ import com.cooleshow.teacher.bean.TeacherSelfStyleInfoBean;
 public interface LiveCoursePageContract {
 
     interface LiveCoursePageView extends BaseView {
+        void onGetLiveCourseSuccess(int page, LiveCourseListBean liveCourseListBean);
+        void onGetCourseError(int page);
     }
 
     interface Presenter {

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

@@ -2,6 +2,7 @@ package com.cooleshow.teacher.contract;
 
 import com.cooleshow.base.presenter.view.BaseView;
 import com.cooleshow.teacher.bean.MineLiveCourseListBean;
+import com.cooleshow.teacher.bean.TeacherUserInfo;
 
 /**
  * 创建日期：2022/5/19 15:16
@@ -11,9 +12,13 @@ import com.cooleshow.teacher.bean.MineLiveCourseListBean;
  */
 public interface MineLiveCourseContract {
     interface MineLiveCourseView extends BaseView {
-        void queryPageCourseGroupSuccess(int page , MineLiveCourseListBean data);
+        void queryPageCourseGroupSuccess(int page, MineLiveCourseListBean data);
+
         void queryPageCourseGroupError(int page);
+
+        void getTeacherInfoSuccess(TeacherUserInfo data);
     }
+
     interface Presenter {
     }
 }

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

@@ -2,6 +2,7 @@ package com.cooleshow.teacher.contract;
 
 import com.cooleshow.base.presenter.view.BaseView;
 import com.cooleshow.teacher.bean.MineVideoCourseListBean;
+import com.cooleshow.teacher.bean.VideoCourseListBean;
 
 /**
  * 创建日期：2022/5/20 13:52
@@ -11,7 +12,7 @@ import com.cooleshow.teacher.bean.MineVideoCourseListBean;
  */
 public interface MineVideoCourseContract {
     interface MineVideoCourseView extends BaseView {
-        void queryVideoCourseGroupSuccess(int page, MineVideoCourseListBean data);
+        void queryVideoCourseGroupSuccess(int page, VideoCourseListBean data);
         void queryVideoCourseGroupError(int page);
     }
     interface Presenter {

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

@@ -0,0 +1,21 @@
+package com.cooleshow.teacher.contract;
+
+import com.cooleshow.base.presenter.view.BaseView;
+import com.cooleshow.teacher.bean.CourseCommentListBean;
+import com.cooleshow.teacher.bean.SparringCourseListBean;
+
+/**
+ * 创建日期：2022/6/6 17:41
+ *
+ * @author Ryan
+ * 类说明：
+ */
+public interface SparringCoursePageContract {
+    interface SparringCoursePageView extends BaseView {
+        void onGetSparringCourseSuccess(int page, SparringCourseListBean sparringCourseBean);
+        void onGetCourseError(int page);
+    }
+    interface Presenter {
+
+    }
+}

teacher/src/main/java/com/cooleshow/teacher/presenter/course/MineLiveCoursePresenter.java

@@ -7,6 +7,7 @@ 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.TeacherUserInfo;
 import com.cooleshow.teacher.contract.MineLiveCourseContract;
 
 import org.json.JSONException;
@@ -54,4 +55,15 @@ public class MineLiveCoursePresenter extends BasePresenter<MineLiveCourseContrac
             }
         });
     }
+
+    public void getTeacherUserInfo() {
+        addSubscribe(create(APIService.class).getTeacherUserInfo(), new BaseObserver<TeacherUserInfo>(getView()) {
+            @Override
+            protected void onSuccess(TeacherUserInfo data) {
+                if (getView() != null) {
+                    getView().getTeacherInfoSuccess(data);
+                }
+            }
+        });
+    }
 }

teacher/src/main/java/com/cooleshow/teacher/presenter/course/MineVideoCoursePresenter.java

@@ -7,6 +7,7 @@ import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.bean.MineLiveCourseListBean;
 import com.cooleshow.teacher.bean.MineVideoCourseListBean;
+import com.cooleshow.teacher.bean.VideoCourseListBean;
 import com.cooleshow.teacher.contract.MineLiveCourseContract;
 import com.cooleshow.teacher.contract.MineVideoCourseContract;
 
@@ -32,21 +33,15 @@ public class MineVideoCoursePresenter extends BasePresenter<MineVideoCourseContr
         } catch (JSONException e) {
             e.printStackTrace();
         }
-        addSubscribe(create(APIService.class).queryVideoCourseGroup(RequestBodyUtil.convertToRequestBodyJson(jsonObject.toString())), new BaseObserver<MineVideoCourseListBean>(getView()) {
+        addSubscribe(create(APIService.class).getVideoCourses(RequestBodyUtil.convertToRequestBodyJson(jsonObject.toString())), new BaseObserver<VideoCourseListBean>(getView()) {
             @Override
-            protected void onSuccess(MineVideoCourseListBean data) {
+            protected void onSuccess(VideoCourseListBean data) {
                 if (getView() != null) {
                     getView().queryVideoCourseGroupSuccess(page, data);
                 }
             }
 
             @Override
-            public void onComplete() {
-                super.onComplete();
-                getView().hideLoading();
-            }
-
-            @Override
             public void onError(Throwable e) {
                 super.onError(e);
                 if (getView() != null) {
@@ -55,4 +50,8 @@ public class MineVideoCoursePresenter extends BasePresenter<MineVideoCourseContr
             }
         });
     }
+
+
+
+
 }

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

@@ -1,40 +1,49 @@
 package com.cooleshow.teacher.presenter.homePage;
 
+import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.presenter.BasePresenter;
 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.TeacherSelfStyleInfoBean;
 import com.cooleshow.teacher.contract.LiveCoursePageContract;
 import com.cooleshow.teacher.contract.MineStyleContract;
 import com.cooleshow.usercenter.bean.UserInfo;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 /**
  * Author by pq, Date on 2022/4/20.
  */
 public class LiveCoursePagePresenter extends BasePresenter<LiveCoursePageContract.LiveCoursePageView> implements LiveCoursePageContract.Presenter {
 
-    /**
-     * 查询UserInfo
-     *
-     * @param
-     */
-    public void getUserInfo() {
-        addSubscribe(create(APIService.class).getUserInfo(), new BaseObserver<UserInfo>(getView()) {
+    public void queryLiveCourse(  String month,int page) {
+        if (getView() != null) {
+            getView().showLoading();
+        }
+        JSONObject jsonObject = new JSONObject();
+        try {
+            jsonObject.putOpt("classDate", month);
+            jsonObject.putOpt("page", page);
+            jsonObject.putOpt("rows", Constants.DEFAULT_DATA_SIZE);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        addSubscribe(create(APIService.class).getLiveCourses(RequestBodyUtil.convertToRequestBodyJson(jsonObject.toString())), new BaseObserver<LiveCourseListBean>(getView()) {
             @Override
-            protected void onSuccess(UserInfo data) {
-//                if (getView() != null) {
-//                    getView().getUserInfoSuccess(data);
-//                }
+            protected void onSuccess(LiveCourseListBean data) {
+                if (getView() != null) {
+                    getView().onGetLiveCourseSuccess(page, data);
+                }
             }
-        });
-    }
 
-    public void getTeacherSelfStyle() {
-        addSubscribe(create(APIService.class).getTeacherSelfStyle(), new BaseObserver<TeacherSelfStyleInfoBean>(getView()) {
             @Override
-            protected void onSuccess(TeacherSelfStyleInfoBean data) {
+            public void onError(Throwable e) {
+                super.onError(e);
                 if (getView() != null) {
-//                    getView().getSelfStyleSuccess(data);
+                    getView().onGetCourseError(page);
                 }
             }
         });

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

@@ -0,0 +1,50 @@
+package com.cooleshow.teacher.presenter.homePage;
+
+import com.cooleshow.base.constanst.Constants;
+import com.cooleshow.base.presenter.BasePresenter;
+import com.cooleshow.base.rx.BaseObserver;
+import com.cooleshow.base.utils.RequestBodyUtil;
+import com.cooleshow.teacher.api.APIService;
+import com.cooleshow.teacher.bean.SparringCourseListBean;
+import com.cooleshow.teacher.contract.SparringCoursePageContract;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * 创建日期：2022/6/6 17:41
+ *
+ * @author Ryan
+ * 类说明：
+ */
+public class SparringCoursePagePresenter extends BasePresenter<SparringCoursePageContract.SparringCoursePageView> implements SparringCoursePageContract.Presenter {
+
+    public void querySparringCourse(int page) {
+        if (getView() != null) {
+            getView().showLoading();
+        }
+        JSONObject jsonObject = new JSONObject();
+        try {
+            jsonObject.putOpt("page", page);
+            jsonObject.putOpt("rows", Constants.DEFAULT_DATA_SIZE);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        addSubscribe(create(APIService.class).getSparringCourses(RequestBodyUtil.convertToRequestBodyJson(jsonObject.toString())), new BaseObserver<SparringCourseListBean>(getView()) {
+            @Override
+            protected void onSuccess(SparringCourseListBean data) {
+                if (getView() != null) {
+                    getView().onGetSparringCourseSuccess(page, data);
+                }
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                super.onError(e);
+                if (getView() != null) {
+                    getView().onGetCourseError(page);
+                }
+            }
+        });
+    }
+}

teacher/src/main/java/com/cooleshow/teacher/presenter/income/MineIncomePresenter.java

@@ -6,11 +6,9 @@ import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.base.utils.ToastUtils;
-import com.cooleshow.base.utils.helper.ErrorParse;
+import com.cooleshow.usercenter.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.bean.AccountDetailBean;
-import com.cooleshow.teacher.bean.HomeworkListBean;
-import com.cooleshow.teacher.bean.MusicSheetShareBean;
 import com.cooleshow.teacher.bean.UserAccountBean;
 import com.cooleshow.teacher.contract.MineIncomeContract;
 

teacher/src/main/java/com/cooleshow/teacher/presenter/income/WithdrawalPresenter.java

@@ -5,7 +5,7 @@ import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.base.utils.ToastUtils;
-import com.cooleshow.base.utils.helper.ErrorParse;
+import com.cooleshow.usercenter.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.bean.WithdrawalInfoBean;
 import com.cooleshow.teacher.contract.WithdrawalContract;

teacher/src/main/java/com/cooleshow/teacher/presenter/main/CourseTablePresenter.java

@@ -43,6 +43,15 @@ public class CourseTablePresenter extends BasePresenter<CourseTableContract.Cour
                     getView().onGetCourseDateByMonthSuccess(data);
                 }
             }
+
+            @Override
+            public void onError(Throwable e) {
+                super.onError(e);
+                if (getView() != null) {
+                    getView().onGetCourseDateByMonthError();
+                }
+
+            }
         });
     }
 

teacher/src/main/java/com/cooleshow/teacher/presenter/mine/AddressListPresenter.java

@@ -4,7 +4,7 @@ import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.ToastUtils;
-import com.cooleshow.base.utils.helper.ErrorParse;
+import com.cooleshow.usercenter.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.bean.AddressBean;
 import com.cooleshow.teacher.contract.AddressListContract;

teacher/src/main/java/com/cooleshow/teacher/presenter/mine/BindBankCardPresenter.java

@@ -5,7 +5,7 @@ import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.base.utils.ToastUtils;
-import com.cooleshow.base.utils.helper.ErrorParse;
+import com.cooleshow.usercenter.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.bean.ResponseBindCardBean;
 import com.cooleshow.teacher.bean.ResponseUserBankCardBean;

teacher/src/main/java/com/cooleshow/teacher/presenter/mine/CheckModifyPhoneNumPresenter.java

@@ -4,7 +4,7 @@ import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.ToastUtils;
-import com.cooleshow.base.utils.helper.ErrorParse;
+import com.cooleshow.usercenter.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.contract.CheckModifyPhoneNumContract;
 

teacher/src/main/java/com/cooleshow/teacher/presenter/mine/EditAddressPresenter.java

@@ -5,7 +5,7 @@ import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.base.utils.ToastUtils;
-import com.cooleshow.base.utils.helper.ErrorParse;
+import com.cooleshow.usercenter.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.contract.EditAddressContract;
 

teacher/src/main/java/com/cooleshow/teacher/presenter/mine/FeedBackPresenter.java

@@ -5,7 +5,7 @@ import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.base.utils.ToastUtils;
-import com.cooleshow.base.utils.helper.ErrorParse;
+import com.cooleshow.usercenter.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.contract.FeedBackContract;
 

teacher/src/main/java/com/cooleshow/teacher/presenter/mine/InputBankVCodePresenter.java

@@ -5,7 +5,7 @@ import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.base.utils.ToastUtils;
-import com.cooleshow.base.utils.helper.ErrorParse;
+import com.cooleshow.usercenter.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.bean.ResponseBindCardBean;
 import com.cooleshow.teacher.contract.InputBankVCodeContract;

teacher/src/main/java/com/cooleshow/teacher/presenter/mine/ModifyPasswordPresenter.java

@@ -5,7 +5,7 @@ import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.base.utils.ToastUtils;
-import com.cooleshow.base.utils.helper.ErrorParse;
+import com.cooleshow.usercenter.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.contract.ModifyPasswordContract;
 import com.cooleshow.usercenter.bean.SetDetailBean;

teacher/src/main/java/com/cooleshow/teacher/presenter/mine/ModifyPhoneNumPresenter.java

@@ -4,7 +4,7 @@ import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.ToastUtils;
-import com.cooleshow.base.utils.helper.ErrorParse;
+import com.cooleshow.usercenter.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.contract.ModifyPhoneNumContract;
 

teacher/src/main/java/com/cooleshow/teacher/presenter/mine/MyBankCardPresenter.java

@@ -1,16 +1,13 @@
 package com.cooleshow.teacher.presenter.mine;
 
-import android.text.TextUtils;
-
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.base.utils.ToastUtils;
-import com.cooleshow.base.utils.helper.ErrorParse;
+import com.cooleshow.usercenter.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
-import com.cooleshow.teacher.bean.ReceivedCommentListBean;
 import com.cooleshow.teacher.bean.ResponseBankCardBean;
 import com.cooleshow.teacher.bean.ResponseBindCardBean;
 import com.cooleshow.teacher.contract.MyBankCardContract;

teacher/src/main/java/com/cooleshow/teacher/presenter/mine/PersonalCertificationPresenter.java

@@ -5,7 +5,7 @@ import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.base.utils.ToastUtils;
-import com.cooleshow.base.utils.helper.ErrorParse;
+import com.cooleshow.usercenter.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.contract.PersonalCertificationContract;
 

teacher/src/main/java/com/cooleshow/teacher/presenter/score/MineScoreActPresenter.java

@@ -4,14 +4,11 @@ import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.ToastUtils;
-import com.cooleshow.base.utils.helper.ErrorParse;
+import com.cooleshow.usercenter.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
-import com.cooleshow.teacher.bean.AddressBean;
 import com.cooleshow.teacher.bean.MusicSheetShareBean;
 import com.cooleshow.teacher.contract.MineScoreActContract;
 
-import java.util.List;
-
 /**
  * 创建日期：2022/5/23 10:24
  *

teacher/src/main/java/com/cooleshow/teacher/ui/comment/CourseCommentActivity.java

@@ -5,18 +5,11 @@ import android.os.Bundle;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseActivity;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseActivity;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.teacher.R;
-import com.cooleshow.teacher.adapter.CourseCommentNotReplyAdapter;
 import com.cooleshow.teacher.adapter.MineCoursePageAdapter;
-import com.cooleshow.teacher.contract.CourseCommentContract;
 import com.cooleshow.teacher.databinding.ActivityCourseCommentLayoutBinding;
-import com.cooleshow.teacher.presenter.comment.CourseCommentPresenter;
-import com.cooleshow.teacher.ui.course.LiveCourseFragment;
-import com.cooleshow.teacher.ui.course.SparringCourseFragment;
-import com.cooleshow.teacher.ui.course.VideoCourseFragment;
 
 import java.util.ArrayList;
 

teacher/src/main/java/com/cooleshow/teacher/ui/comment/CourseCommentDetailActivity.java

@@ -6,12 +6,11 @@ import android.view.View;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.teacher.R;
-import com.cooleshow.teacher.bean.CourseCommentListBean;
 import com.cooleshow.teacher.bean.SparringCourseCommentBean;
 import com.cooleshow.teacher.constants.CourseConstants;
 import com.cooleshow.teacher.contract.CourseCommentDetailContract;

teacher/src/main/java/com/cooleshow/teacher/ui/comment/CourseCommentHasReplyFragment.java

@@ -14,7 +14,7 @@ import com.chad.library.adapter.base.listener.OnItemClickListener;
 import com.chad.library.adapter.base.listener.OnLoadMoreListener;
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.fragment.BaseMVPFragment;
+import com.cooleshow.usercenter.ui.activity.BaseMVPFragment;
 import com.cooleshow.base.utils.TimeUtils;
 import com.cooleshow.base.widgets.EmptyViewLayout;
 import com.cooleshow.teacher.R;

teacher/src/main/java/com/cooleshow/teacher/ui/comment/CourseCommentNoReplyFragment.java

@@ -14,7 +14,7 @@ import com.chad.library.adapter.base.listener.OnItemClickListener;
 import com.chad.library.adapter.base.listener.OnLoadMoreListener;
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.fragment.BaseMVPFragment;
+import com.cooleshow.usercenter.ui.activity.BaseMVPFragment;
 import com.cooleshow.base.utils.TimeUtils;
 import com.cooleshow.base.widgets.EmptyViewLayout;
 import com.cooleshow.teacher.R;

teacher/src/main/java/com/cooleshow/teacher/ui/comment/ReceivedCommentActivity.java

@@ -13,7 +13,7 @@ import com.bigkoo.pickerview.view.TimePickerView;
 import com.chad.library.adapter.base.listener.OnLoadMoreListener;
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.TimeUtils;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.widgets.EmptyViewLayout;

teacher/src/main/java/com/cooleshow/teacher/ui/course/CreateLiveCourseArrangementActivity.java

@@ -4,7 +4,7 @@ import android.view.View;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.teacher.contract.CreateLiveCourseArrangementContract;
 import com.cooleshow.teacher.databinding.ActivityCreateLiveCourseArrangmentBinding;
 import com.cooleshow.teacher.presenter.course.CreateLiveCourseArrangementPresenter;

teacher/src/main/java/com/cooleshow/teacher/ui/course/CreateLiveCourseInfoActivity.java

@@ -1,15 +1,11 @@
 package com.cooleshow.teacher.ui.course;
 
-import android.content.Context;
-import android.view.MotionEvent;
 import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.contract.CreateLiveCourseInfoContract;
 import com.cooleshow.teacher.databinding.ActivityCreateLiveCourseInfoBinding;

teacher/src/main/java/com/cooleshow/teacher/ui/course/LiveCourseFragment.java

@@ -15,7 +15,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.listener.OnItemClickListener;
 import com.chad.library.adapter.base.listener.OnLoadMoreListener;
 import com.cooleshow.base.constanst.Constants;
-import com.cooleshow.base.ui.fragment.BaseMVPFragment;
+import com.cooleshow.usercenter.ui.activity.BaseMVPFragment;
 import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.PopupUtil;
 import com.cooleshow.base.utils.TimeUtils;

teacher/src/main/java/com/cooleshow/teacher/ui/course/MineCourseActivity.java

@@ -4,9 +4,8 @@ import android.graphics.Typeface;
 import android.os.Bundle;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.MineCoursePageAdapter;
@@ -18,7 +17,6 @@ import java.util.ArrayList;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.viewbinding.ViewBinding;
 import androidx.viewpager2.widget.ViewPager2;
 
 /**

teacher/src/main/java/com/cooleshow/teacher/ui/course/MineLiveCourseActivity.java

@@ -11,7 +11,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.usercenter.ui.activity.BaseMVPActivity;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.MineLiveCoursePagerAdapter;
 import com.cooleshow.teacher.databinding.ActivityMineLiveCourseBinding;