修改部分bug

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

@@ -28,10 +28,12 @@ public class ErrorParse {
     public void parseError(Throwable throwable) {
         if (throwable instanceof ApiException) {
             ApiException apiException = (ApiException) throwable;
-            ToastUtils.showShort("onError:" + apiException.getErrmsg());
             if (apiException.getErrcode() == TOKEN_INVALID_ERROR_CODE) {
+                ToastUtils.showShort("登录状态异常,请重新登录");
                 logOut();
                 return;
+            }else{
+                ToastUtils.showShort("onError:" + apiException.getErrmsg());
             }
         } else {
             throwable.printStackTrace();

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

@@ -39,6 +39,6 @@ public class HomeLiveCourseAdapter extends BaseQuickAdapter<HomeLiveAndVideoBean
         TextView tv_course_num = helper.getView(R.id.tv_course_num);
         tv_course_num.setText(item.courseNum + "课时");
         TextView tv_buy_num = helper.getView(R.id.tv_buy_num);
-        tv_buy_num.setText(item.buyCount + "人已购买");
+//        tv_buy_num.setText(item.buyCount + "人已购买");
     }
 }

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

@@ -34,7 +34,7 @@ public class HomeLiveAndVideoBean {
         public int buyCount;
         public long courseGroupId;
         public String courseGroupName;
-        public double courseGroupPrice;
+        public String courseGroupPrice;
         public int courseNum;
         public String courseStartTime;
         public String realName;
@@ -66,7 +66,7 @@ public class HomeLiveAndVideoBean {
         public String createTime;
         public int lessonCount;
         public String lessonCoverUrl;
-        public double lessonPrice;
+        public String lessonPrice;
         public String realName;
         public int subjectId;
         public String subjectName;

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

@@ -59,5 +59,6 @@ public class SparringCourseHomeworkBean {
     public String teacherName;
     public String teacherReplied;
     public String title;
+    public int homeworkExpire;//作业过期 1：已过期 0：未过期
 
 }

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

@@ -171,7 +171,7 @@ public class EditAddressActivity extends BaseMVPActivity<ActivityEditAddressBind
             }
             viewBinding.etDetailAddress.setText(addressBean.detailAddress);
             id = addressBean.id;
-
+            isDefaultAddress = addressBean.defaultStatus == 1;//是否是默认地址
             if (addressBean.defaultStatus==1){
                 viewBinding.imSetDefault.setImageResource(R.drawable.icon_switch_open);
             }else{

student/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config xmlns:tools="http://schemas.android.com/tools">
+    <base-config cleartextTrafficPermitted="true"/>
+    <debug-overrides>
+        <trust-anchors>
+            <!-- Trust user added CAs while debuggable only -->
+            <certificates src="user" />
+        </trust-anchors>
+    </debug-overrides>
+    <!--<domain-config-->
+        <!--cleartextTrafficPermitted="true"-->
+        <!--tools:ignore="NetworkSecurityConfig"/>-->
+    <!--<domain-->
+        <!--includeSubdomains="true"-->
+        <!--tools:ignore="NetworkSecurityConfig">47.99.212.176</domain>-->
+</network-security-config>

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

@@ -1,7 +1,9 @@
 package com.cooleshow.teacher.adapter;
 
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 
@@ -20,6 +22,10 @@ import java.util.List;
  * 类说明：
  */
 public class MineStyleVideoAdapter extends BaseMultiItemQuickAdapter<TeacherSelfStyleInfoBean.StyleVideoBean, BaseViewHolder> {
+    public static final String VIDEO_AUDIT_STATUS_DOING = "DOING";//审核中
+    public static final String VIDEO_AUDIT_STATUS_PASS = "PASS";//审核通过
+    public static final String VIDEO_AUDIT_STATUS_UNPASS = "UNPASS";//审核失败
+
     public MineStyleVideoAdapter(List<TeacherSelfStyleInfoBean.StyleVideoBean> data) {
         super(data);
         addItemType(0, R.layout.item_teacher_style_video_layout);
@@ -39,6 +45,17 @@ public class MineStyleVideoAdapter extends BaseMultiItemQuickAdapter<TeacherSelf
                         itemAddClickAction.delete(styleVideoBean.videoUrl);
                     }
                 });
+                //视频审核状态
+                TextView tv_audit_status = holder.getView(R.id.tv_audit_status);
+                if (TextUtils.equals(VIDEO_AUDIT_STATUS_DOING, styleVideoBean.authStatus)) {
+                    tv_audit_status.setVisibility(View.VISIBLE);
+                    tv_audit_status.setText("审核中");
+                } else if (TextUtils.equals(VIDEO_AUDIT_STATUS_UNPASS, styleVideoBean.authStatus)) {
+                    tv_audit_status.setVisibility(View.VISIBLE);
+                    tv_audit_status.setText("审核失败");
+                } else {
+                    tv_audit_status.setVisibility(View.GONE);
+                }
                 break;
             case 1:
                 ImageView iv_video_add = holder.getView(R.id.iv_video_add);

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

@@ -1,6 +1,9 @@
 package com.cooleshow.teacher.adapter;
 
+import android.text.TextUtils;
+import android.view.View;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
@@ -16,6 +19,10 @@ import androidx.annotation.NonNull;
  * Author by pq, Date on 2022/5/10.
  */
 public class MineStyleVideoListAdapter extends BaseQuickAdapter<TeacherSelfStyleInfoBean.StyleVideoBean, BaseViewHolder> {
+    public static final String VIDEO_AUDIT_STATUS_DOING = "DOING";//审核中
+    public static final String VIDEO_AUDIT_STATUS_PASS = "PASS";//审核通过
+    public static final String VIDEO_AUDIT_STATUS_UNPASS = "UNPASS";//审核失败
+
     public MineStyleVideoListAdapter(int layoutResId) {
         super(layoutResId);
     }
@@ -25,5 +32,17 @@ public class MineStyleVideoListAdapter extends BaseQuickAdapter<TeacherSelfStyle
         //加载视频缩略图
         ImageView iv_video_bg =holder.getView(R.id.iv_video_bg);
         GlideUtils.INSTANCE.loadVideoThumbnail(getContext(),styleVideoBean.videoUrl,iv_video_bg);
+
+        //视频审核状态
+        TextView tv_audit_status = holder.getView(R.id.tv_audit_status);
+        if (TextUtils.equals(VIDEO_AUDIT_STATUS_DOING, styleVideoBean.authStatus)) {
+            tv_audit_status.setVisibility(View.VISIBLE);
+            tv_audit_status.setText("审核中");
+        } else if (TextUtils.equals(VIDEO_AUDIT_STATUS_UNPASS, styleVideoBean.authStatus)) {
+            tv_audit_status.setVisibility(View.VISIBLE);
+            tv_audit_status.setText("审核失败");
+        } else {
+            tv_audit_status.setVisibility(View.GONE);
+        }
     }
 }

teacher/src/main/java/com/cooleshow/teacher/bean/SparringCourseHomeworkBean.java

@@ -60,4 +60,5 @@ public class SparringCourseHomeworkBean {
     public String courseStatus;
     public int decorateHomework;
     public String studentAttachments;
+    public int homeworkExpire;//作业过期 1：已过期 0：未过期
 }

teacher/src/main/java/com/cooleshow/teacher/bean/TeacherSelfStyleInfoBean.java

@@ -95,6 +95,7 @@ public class TeacherSelfStyleInfoBean implements Serializable {
          */
 
         public String auditVersion;
+        public String authStatus;//审核状态 DOING:审核中 PASS:通过 UNPASS:不通过
         public int browse;
         public String createTime;
         public String describe;

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

@@ -90,7 +90,7 @@ public class EditAddressActivity extends BaseMVPActivity<ActivityEditAddressBind
                     ToastUtils.showShort("请输入收件人电话号码");
                     break;
                 }
-                if (phoneNumber.length()!=11) {
+                if (phoneNumber.length() != 11) {
                     ToastUtils.showShort("请输入正确电话号码");
                     break;
                 }
@@ -135,7 +135,7 @@ public class EditAddressActivity extends BaseMVPActivity<ActivityEditAddressBind
                 if (isAdd) {
                     presenter.createNewAddress(jsonObject.toString());
                 } else {
-                    presenter.updateAddress(id,jsonObject.toString());
+                    presenter.updateAddress(id, jsonObject.toString());
                 }
 
                 break;
@@ -162,20 +162,21 @@ public class EditAddressActivity extends BaseMVPActivity<ActivityEditAddressBind
             viewBinding.etName.setText(addressBean.name);
             viewBinding.etPhone.setText(addressBean.phoneNumber);
             if (!TextUtils.isEmpty(addressBean.province)) {
-                province=addressBean.province;
-                city= addressBean.city;
-                region=addressBean.region;
+                province = addressBean.province;
+                city = addressBean.city;
+                region = addressBean.region;
                 viewBinding.tvDistrictDetail.setText(addressBean.province + addressBean.city + addressBean.region);
                 viewBinding.tvDistrictDetail.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_1a1a1a));
             }
             viewBinding.etDetailAddress.setText(addressBean.detailAddress);
             id = addressBean.id;
 
-           if (addressBean.defaultStatus==1){
-               viewBinding.imSetDefault.setImageResource(R.drawable.icon_switch_open);
-           }else{
-               viewBinding.imSetDefault.setImageResource(R.drawable.icon_switch_off);
-           }
+            isDefaultAddress = addressBean.defaultStatus == 1;//是否是默认地址
+            if (addressBean.defaultStatus == 1) {
+                viewBinding.imSetDefault.setImageResource(R.drawable.icon_switch_open);
+            } else {
+                viewBinding.imSetDefault.setImageResource(R.drawable.icon_switch_off);
+            }
         }
     }
 

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

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

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

@@ -14,4 +14,22 @@
         android:src="@drawable/icon_play_video"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
+
+    <TextView
+        android:visibility="gone"
+        android:id="@+id/tv_audit_status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="5dp"
+        android:layout_marginTop="5dp"
+        android:background="@drawable/shape_mine_style_video_status_bg"
+        android:gravity="center"
+        android:includeFontPadding="false"
+        android:paddingStart="3dp"
+        android:paddingTop="1dp"
+        android:paddingEnd="3dp"
+        android:paddingBottom="1dp"
+        android:text="审核中"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_12" />
 </FrameLayout>

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

@@ -23,6 +23,24 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:src="@drawable/icon_play_video" />
+
+        <TextView
+            android:visibility="gone"
+            android:id="@+id/tv_audit_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="5dp"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/shape_mine_style_video_status_bg"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:paddingStart="3dp"
+            android:paddingTop="1dp"
+            android:paddingEnd="3dp"
+            android:paddingBottom="1dp"
+            android:text="审核中"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_12" />
     </FrameLayout>
 
     <ImageView

usercenter/src/main/AndroidManifest.xml

@@ -10,6 +10,9 @@
 
         <activity
             android:name=".ui.activity.LoginActivity"
+            android:launchMode="singleTask"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:screenOrientation="portrait"
             android:exported="false" />
 
         <activity