修改bug

BaseLibrary/src/main/java/com/cooleshow/base/utils/helper/CourseStatusHelper.java

@@ -0,0 +1,49 @@
+package com.cooleshow.base.utils.helper;
+
+import com.cooleshow.base.utils.DateUtil;
+import com.cooleshow.base.utils.ToastUtil;
+import com.cooleshow.base.utils.ToastUtils;
+
+import java.util.Date;
+
+/**
+ * Author by pq, Date on 2022/7/3.
+ */
+public class CourseStatusHelper {
+    public static int SPARRING_COURSE_STATUS_NOT_ENTER = -1;
+    public static int SPARRING_COURSE_STATUS_NOT_ENTER_TOO_EARLIER = 1;//早于规定时间
+    public static int SPARRING_COURSE_STATUS_NOT_ENTER_TOO_LATER = 2;//晚于规定时间
+    public static int SPARRING_COURSE_STATUS_CAN_ENTER = 3;//可以进入
+
+    /**
+     * 是否可以进入陪练课
+     *
+     * @return
+     */
+    public static int isCanStartSparringCourse(String startTimeLimit, String endTimeLimit, String startTimeStr, String endTimeStr) {
+        try {
+            long currentTime = DateUtil.now().getTime();
+            Date date = DateUtil.getDate(startTimeStr);
+            Date endDate = DateUtil.getDate(endTimeStr);
+            if (date != null) {
+                long l = Long.parseLong(startTimeLimit);
+                long limitEnterTime = l * 60 * 1000;
+                long startTime = date.getTime();
+                if (startTime - currentTime > limitEnterTime) {
+                    return SPARRING_COURSE_STATUS_NOT_ENTER_TOO_EARLIER;
+                }
+
+                long end = Long.parseLong(endTimeLimit);
+                long limitEndTime = end * 60 * 1000;
+                long endTime = endDate.getTime();
+                if (endTime - currentTime < limitEndTime) {
+                    return SPARRING_COURSE_STATUS_NOT_ENTER_TOO_LATER;
+                }
+                return SPARRING_COURSE_STATUS_CAN_ENTER;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return SPARRING_COURSE_STATUS_NOT_ENTER;
+    }
+}

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

@@ -1,7 +1,11 @@
 package com.cooleshow.student.ui.mine;
 
+import android.media.Image;
 import android.os.Bundle;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -11,6 +15,7 @@ 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.widgets.EmptyViewLayout;
 import com.cooleshow.student.R;
 import com.cooleshow.student.adapter.AddressListAdapter;
 import com.cooleshow.student.bean.AddressBean;
@@ -39,11 +44,12 @@ public class AddressListActivity extends BaseMVPActivity<ActivityAddressListBind
         switch (view.getId()) {
             case R.id.tv_add:
                 ARouter.getInstance().build(RouterPath.MineCenter.MINE_EDIT_ADDRESS)
-                        .withBoolean("isAdd",true)
+                        .withBoolean("isAdd", true)
                         .navigation();
                 break;
         }
     }
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -60,9 +66,16 @@ public class AddressListActivity extends BaseMVPActivity<ActivityAddressListBind
         LinearLayoutManager manager = new LinearLayoutManager(this);
         rvAddress.setLayoutManager(manager);
         addressListAdapter = new AddressListAdapter(dataList);
+        setEmptyView();
         rvAddress.setAdapter(addressListAdapter);
     }
 
+    private void setEmptyView() {
+        EmptyViewLayout emptyView = new EmptyViewLayout(this);
+        emptyView.setContent(com.cooleshow.base.R.drawable.icon_empty_content,"暂无数据");
+        addressListAdapter.setEmptyView(emptyView);
+    }
+
     @Override
     protected void onResume() {
         super.onResume();

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

@@ -16,8 +16,8 @@
         android:layout_below="@+id/toolbar_include"
         android:layout_width="match_parent"
         android:layout_marginTop="15dp"
-        android:layout_marginBottom="80dp"
-        android:layout_height="wrap_content"/>
+        android:layout_above="@+id/tv_add"
+        android:layout_height="match_parent"/>
 
     <TextView
         android:id="@+id/tv_add"

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

@@ -12,6 +12,7 @@ import com.cooleshow.base.utils.SizeUtils;
 import com.cooleshow.base.utils.TimeUtils;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.UiUtils;
+import com.cooleshow.base.utils.helper.CourseStatusHelper;
 import com.cooleshow.base.widgets.VideoThumbnailView;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.SparringCourseCommentBean;
@@ -294,7 +295,8 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
 
         if (v.getId() == R.id.tv_enter_room) {
             //进入教室
-            if (mInfoBean != null && TextUtils.equals(CourseConstants.COURSE_STATUS_ING, mInfoBean.courseStatus)) {
+            if (mInfoBean != null) {
+//                CourseStatusHelper.isCanStartSparringCourse(mInfoBean)
                 CourseEnterHelper.start(this, mInfoBean.courseScheduleId, mInfoBean.subjectName);
             }
             return;

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

@@ -11,6 +11,7 @@ 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.widgets.EmptyViewLayout;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.AddressListAdapter;
 import com.cooleshow.teacher.bean.AddressBean;
@@ -60,9 +61,16 @@ public class AddressListActivity extends BaseMVPActivity<ActivityAddressListBind
         LinearLayoutManager manager = new LinearLayoutManager(this);
         rvAddress.setLayoutManager(manager);
         addressListAdapter = new AddressListAdapter(dataList);
+        setEmptyView();
         rvAddress.setAdapter(addressListAdapter);
     }
 
+    private void setEmptyView() {
+        EmptyViewLayout emptyView = new EmptyViewLayout(this);
+        emptyView.setContent(com.cooleshow.base.R.drawable.icon_empty_content,"暂无数据");
+        addressListAdapter.setEmptyView(emptyView);
+    }
+
     @Override
     protected void onResume() {
         super.onResume();

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

@@ -16,7 +16,7 @@
         android:layout_below="@+id/toolbar_include"
         android:layout_width="match_parent"
         android:layout_marginTop="15dp"
-        android:layout_marginBottom="80dp"
+        android:layout_above="@+id/tv_add"
         android:layout_height="wrap_content"/>
 
     <TextView