bug 修改

student/src/main/java/com/cooleshow/student/adapter/CourseTableListAdapter.kt

@@ -1,5 +1,6 @@
 package com.cooleshow.student.adapter
 
+import android.annotation.SuppressLint
 import android.text.TextUtils
 import android.view.View
 import android.widget.ImageView
@@ -31,6 +32,7 @@ class CourseTableListAdapter(layoutResId: Int) :
         addChildClickViewIds(R.id.iv_go_chat)
     }
 
+    @SuppressLint("ResourceAsColor")
     override fun convert(
         baseViewHolder: BaseViewHolder,
         data: CourseTableDataBean.StudentListBean?
@@ -77,6 +79,7 @@ class CourseTableListAdapter(layoutResId: Int) :
                 //未开始
                 tvCourseStatusBt.setVisible(false)
                 baseViewHolder.setText(R.id.tv_course_status, "未开始")
+                baseViewHolder.setTextColor(R.id.tv_course_status, com.cooleshow.base.R.color.color_ff802c)
             }
             ING -> {
                 //进行中

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

@@ -11,6 +11,7 @@ import com.chad.library.adapter.base.module.BaseLoadMoreModule;
 import com.chad.library.adapter.base.module.LoadMoreModule;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
 import com.cooleshow.base.utils.GlideUtils;
+import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.student.R;
 import com.cooleshow.student.bean.PracticeCourseListBean;
 import com.cooleshow.student.constants.CourseConstants;
@@ -29,8 +30,11 @@ public class PracticeCourseListAdapter extends BaseQuickAdapter<PracticeCourseLi
 
     @Override
     protected void convert(@NonNull BaseViewHolder holder, PracticeCourseListBean.RowsBean data) {
+        if(data==null){
+            return;
+        }
         //时间
-        holder.setText(R.id.tv_time, data.startTime);
+        holder.setText(R.id.tv_time, UiUtils.getCourseTimeString(data.startTime,data.endTime));
         //title
         holder.setText(R.id.tv_title, data.userName);
         //subjectName

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

@@ -156,8 +156,9 @@ public interface APIService {
      *             type:类型（PASSWD:修改密码，LOGIN:登录，REGISTER:注册,BANK:绑定银行卡PHONE:修改手机号））
      * @return
      */
+    @FormUrlEncoded
     @POST(STUDENT_GROUP + "code/sendSmsCode")
-    Observable<BaseResponse<Object>> sendSmsCode(@Body RequestBody body);
+    Observable<BaseResponse<Object>> sendSmsCode(@FieldMap Map<String, String> params);
 
     /**
      * 实名认证

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

@@ -43,9 +43,9 @@ public class ModifyPasswordPresenter extends BasePresenter<ModifyPasswordContrac
         });
 
     }
-    public void sendSmsCode(String jsonStr){
+    public void sendSmsCode(Map<String,String> map){
         getView().showLoading();
-        addSubscribe(create(APIService.class).sendSmsCode(RequestBodyUtil.convertToRequestBodyJson(jsonStr)), new BaseObserver<SetDetailBean>(getView()) {
+        addSubscribe(create(APIService.class).sendSmsCode(map), new BaseObserver<SetDetailBean>(getView()) {
             @Override
             protected void onSuccess(SetDetailBean data) {
                 if (getView() != null) {

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

@@ -85,11 +85,11 @@ public class ModifyPhoneNumPresenter extends BasePresenter<ModifyPhoneNumContrac
         });
     }
 
-    public void sendSmsCode(String jsonStr) {
+    public void sendSmsCode(Map<String,String> map) {
         if (getView() != null) {
             getView().showLoading();
         }
-        addSubscribe(create(APIService.class).sendSmsCode(RequestBodyUtil.convertToRequestBodyJson(jsonStr)), new BaseObserver<SetDetailBean>(getView()) {
+        addSubscribe(create(APIService.class).sendSmsCode(map), new BaseObserver<SetDetailBean>(getView()) {
             @Override
             protected void onSuccess(SetDetailBean data) {
                 if (getView() != null) {

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

@@ -87,6 +87,9 @@ public class PracticeCourseDetailActivity extends BaseMVPActivity<ActivityPracti
                 }
                 break;
             case R.id.tv_evaluate:
+                if(mInfoBean==null){
+                    return;
+                }
                 if (!TextUtils.equals(mInfoBean.courseStatus, CourseConstants.COURSE_STATUS_COMPLETE)) {
                     ToastUtil.getInstance().show(this, "课程结束之后才可以评价哦～");
                     return;

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

@@ -144,14 +144,10 @@ public class ModifyPasswordActivity extends BaseMVPActivity<ActivityModifyPasswo
         if (mImgVerifyCodeDialog != null) {
             mImgVerifyCodeDialog.dismiss();
         }
-        JSONObject jsonObject = new JSONObject();
-        try {
-            jsonObject.putOpt("mobile", phone);
-            jsonObject.putOpt("type", "PASSWD");
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        presenter.sendSmsCode(jsonObject.toString());
+        Map<String,String> map = new HashMap<>();
+        map.put("mobile", phone);
+        map.put("type", "PASSWD");
+        presenter.sendSmsCode(map);
     }
 
 

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

@@ -28,6 +28,8 @@ import com.cooleshow.usercenter.bean.SetDetailBean;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -141,14 +143,10 @@ public class ModifyPhoneNumActivity extends BaseMVPActivity<ActivityModifyPhonen
     }
 
     private void sendSmsCode(String phone) {
-        JSONObject jsonObject = new JSONObject();
-        try {
-            jsonObject.putOpt("mobile", phone);
-            jsonObject.putOpt("type", "PHONE");
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        presenter.sendSmsCode(jsonObject.toString());
+        Map<String,String> jsonObject = new HashMap<>();
+        jsonObject.put("mobile", phone);
+        jsonObject.put("type", "PHONE");
+        presenter.sendSmsCode(jsonObject);
     }
 
     public void getCodeSuccess() {

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

@@ -139,6 +139,7 @@
         android:gravity="center"
         android:textColor="@color/color_2dc7aa"
         android:textSize="@dimen/sp_14"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         tools:text="调课" />

teacher/src/main/java/com/cooleshow/teacher/adapter/CourseTableListAdapter.kt

@@ -1,5 +1,6 @@
 package com.cooleshow.teacher.adapter
 
+import android.annotation.SuppressLint
 import android.text.TextUtils
 import android.view.View
 import android.widget.ImageView
@@ -32,6 +33,7 @@ class CourseTableListAdapter(layoutResId: Int) :
         addChildClickViewIds(R.id.iv_go_chat)
     }
 
+    @SuppressLint("ResourceAsColor")
     override fun convert(
         baseViewHolder: BaseViewHolder,
         data: CourseTableDataBean.StudentListBean?
@@ -82,6 +84,7 @@ class CourseTableListAdapter(layoutResId: Int) :
                     tvCourseStatusBt.setVisible(false)
                 }
                 baseViewHolder.setText(R.id.tv_course_status, "未开始")
+                baseViewHolder.setTextColor(R.id.tv_course_status, com.cooleshow.base.R.color.color_ff802c)
                 tvCourseStatusBt.text = "调课"
                 tvCourseStatusBt.setBackgroundResource(R.drawable.shape_course_status_normal);
                 tvCourseStatusBt.setTextColor(context.resources.getColor(com.cooleshow.base.R.color.color_2dc7aa))

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

@@ -19,6 +19,7 @@ import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.HomeworkListBean;
 import com.cooleshow.teacher.bean.MusicSheetListBean;
+import com.cooleshow.teacher.constants.CourseConstants;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -40,10 +41,18 @@ public class HomeworkAdapter extends BaseQuickAdapter<HomeworkListBean.RowsBean,
 
     @Override
     protected void convert(BaseViewHolder helper, HomeworkListBean.RowsBean item) {
+        if(item == null){
+            return;
+        }
         TextView tv_state = helper.getView(R.id.tv_state);
         ImageView im_header = helper.getView(R.id.im_header);
         TextView tv_name = helper.getView(R.id.tv_name);
         RecyclerView rv_mark = helper.getView(R.id.rv_mark);
+        if(TextUtils.equals(item.type, CourseConstants.PIANO_ROOM_COURSE)){
+            im_header.setImageResource(R.drawable.icon_piano_room_course);
+        }else {
+            GlideUtils.INSTANCE.loadImage(getContext(), item.studentAvatar, im_header, R.drawable.icon_teacher_default_head);
+        }
         String tvname = item.classNum > 0 ? "第" + item.classNum + "课" : "";
         tv_name.setText(item.courseGroupName + tvname);
         if (TextUtils.equals(mDecorate, "YES")) {

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

@@ -367,7 +367,7 @@ public interface APIService {
      * @param oldPhone
      * @return
      */
-    @GET(AUTH_GROUP + "user/updatePhone")
+    @POST(AUTH_GROUP + "user/updatePhone")
     Observable<BaseResponse<Object>> updatePhone(@Query("authCode") String authCode, @Query("newPhone") String newPhone, @Query("oldPhone") String oldPhone);
 
     /**
@@ -386,8 +386,9 @@ public interface APIService {
      *             type:类型（PASSWD:修改密码，LOGIN:登录或注册,BANK:绑定银行卡,PHONE:修改手机号）
      * @return
      */
+    @FormUrlEncoded
     @POST(TEACHER_GROUP + "code/sendSmsCode")
-    Observable<BaseResponse<Object>> sendSmsCode(@Body RequestBody body);
+    Observable<BaseResponse<Object>> sendSmsCode(@FieldMap Map<String,String> map);
 
     /**
      * 校验图片验证码

teacher/src/main/java/com/cooleshow/teacher/bean/request/TeacherPracticeCourseEntry.java

@@ -12,6 +12,6 @@ public class TeacherPracticeCourseEntry {
     public int page;
     public int rows;
     public String status;
-    public int subjectId;
+    public String subjectId;
 
 }

teacher/src/main/java/com/cooleshow/teacher/constants/CourseConstants.java

@@ -22,7 +22,7 @@ public class CourseConstants {
     public static final int COURSE_HOMEWORK_STU_SUBMIT = 1;//学员已提交课后作业
     public static final int COURSE_HOMEWORK_STU_NO_SUBMIT = 0;//学员未提交课后作业
 
-    public static final String LIVE_COURSE = "LIVE";//直播课
+    public static final String LIVE_COURSE = "LIVE";//直播课PRACTICE
     public static final String OTHER_COURSE = "PRACTICE";//陪练课
     public static final String PIANO_ROOM_COURSE = "PIANO_ROOM_CLASS";//琴房课
 

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

@@ -29,7 +29,7 @@ public class SparringCoursePresenter extends BasePresenter<SparringCourseContrac
         entry.page=page;
         entry.rows= Constants.DEFAULT_DATA_SIZE;
         if (subjectId != 0) {
-            entry.subjectId = subjectId;
+            entry.subjectId = String.valueOf(subjectId);
         }
         addSubscribe(create(APIService.class).getSparringCourses(entry), new BaseObserver<SparringCourseListBean>(getView()) {
             @Override

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

@@ -15,6 +15,8 @@ import com.cooleshow.usercenter.bean.SetDetailBean;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.Map;
+
 /**
  * 创建日期：2022/5/19 14:12
  *
@@ -22,9 +24,9 @@ import org.json.JSONObject;
  * 类说明：
  */
 public class InputBankVCodePresenter extends BasePresenter<InputBankVCodeContract.InputBankVCodeView> implements InputBankVCodeContract.Presenter {
-    public void sendSmsCode(String jsonStr){
+    public void sendSmsCode(Map<String,String> map){
         getView().showLoading();
-        addSubscribe(create(APIService.class).sendSmsCode(RequestBodyUtil.convertToRequestBodyJson(jsonStr)), new BaseObserver<SetDetailBean>(getView()) {
+        addSubscribe(create(APIService.class).sendSmsCode(map), new BaseObserver<SetDetailBean>(getView()) {
             @Override
             protected void onSuccess(SetDetailBean data) {
                 if (getView() != null) {

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

@@ -53,9 +53,9 @@ public class ModifyPasswordPresenter extends BasePresenter<ModifyPasswordContrac
 
     }
 
-    public void sendSmsCode(String jsonStr) {
+    public void sendSmsCode(Map<String,String> map) {
         getView().showLoading();
-        addSubscribe(create(APIService.class).sendSmsCode(RequestBodyUtil.convertToRequestBodyJson(jsonStr)), new BaseObserver<SetDetailBean>(getView()) {
+        addSubscribe(create(APIService.class).sendSmsCode(map), new BaseObserver<SetDetailBean>(getView()) {
             @Override
             protected void onSuccess(SetDetailBean data) {
                 if (getView() != null) {

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

@@ -81,11 +81,11 @@ public class ModifyPhoneNumPresenter extends BasePresenter<ModifyPhoneNumContrac
     }
 
 
-    public void sendSmsCode(String jsonStr) {
+    public void sendSmsCode(Map<String,String> map) {
         if (getView() != null) {
             getView().showLoading();
         }
-        addSubscribe(create(APIService.class).sendSmsCode(RequestBodyUtil.convertToRequestBodyJson(jsonStr)), new BaseObserver<SetDetailBean>(getView()) {
+        addSubscribe(create(APIService.class).sendSmsCode(map), new BaseObserver<SetDetailBean>(getView()) {
             @Override
             protected void onSuccess(SetDetailBean data) {
                 if (getView() != null) {

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

@@ -111,18 +111,21 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
             viewBinding.tvCourseStatus.setText(getString(R.string.course_not_start_str));
             viewBinding.tvCourseStatus.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_ff802c));
             viewBinding.tvEnterRoom.setVisibility(View.GONE);
+            viewBinding.bottomView.setVisibility(View.GONE);
         }
         if (TextUtils.equals(CourseConstants.COURSE_STATUS_ING, status)) {
             //课程进行中
             viewBinding.tvCourseStatus.setText(R.string.course_ing_str);
             viewBinding.tvCourseStatus.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_2dc7aa));
             viewBinding.tvEnterRoom.setVisibility(View.VISIBLE);
+            viewBinding.bottomView.setVisibility(View.VISIBLE);
         }
         if (TextUtils.equals(CourseConstants.COURSE_STATUS_COMPLETE, status)) {
             //课程已结束
             viewBinding.tvCourseStatus.setText(R.string.course_is_completed);
             viewBinding.tvCourseStatus.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_999999));
             viewBinding.tvEnterRoom.setVisibility(View.GONE);
+            viewBinding.bottomView.setVisibility(View.GONE);
         }
         //课后作业
         handleHomeworkData(infoBean);

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

@@ -148,11 +148,11 @@ public class HomePageActivity extends BaseMVPActivity<ActivityHomePageLayoutBind
             mMusicPageFragment.setMusicPersonCertStatus(info.musicianAuthStatus);
         }
         //星级
-        if (info.starGrade > 0 && TextUtils.equals(info.entryStatus, TeacherInfoConstants.ENTRY_STATUS_PASS)) {
+        if (info.starGrade > 0) {
             viewBinding.ratingBar.setVisibility(View.VISIBLE);
             viewBinding.ratingBar.setRating(info.starGrade);
             viewBinding.tvNoScore.setVisibility(View.GONE);
-        } else if (TextUtils.equals(info.entryStatus, TeacherInfoConstants.ENTRY_STATUS_PASS)) {
+        } else {
             viewBinding.ratingBar.setVisibility(View.INVISIBLE);
             viewBinding.tvNoScore.setVisibility(View.VISIBLE);
         }

teacher/src/main/java/com/cooleshow/teacher/ui/main/HomeFragment.kt

@@ -80,17 +80,11 @@ class HomeFragment : BaseMVPFragment<FragmentHomeLayoutBinding, HomePresenter>()
         mViewBinding.tvNickname.text =
             UserHelper.getTeacherName(teacherUserInfo.username, teacherUserInfo.userId);
         //星级
-        if (teacherUserInfo.starGrade.toFloat() > 0 && TextUtils.equals(
-                teacherUserInfo.entryStatus,
-                TeacherInfoConstants.ENTRY_STATUS_PASS
-            )) {
+        if (teacherUserInfo.starGrade.toFloat() > 0 ) {
             mViewBinding.ratingBar.visibility = View.VISIBLE
             mViewBinding.tvNoScore.visibility = View.GONE
             mViewBinding.ratingBar.rating = teacherUserInfo.starGrade.toFloat()
-        } else if(TextUtils.equals(
-                teacherUserInfo.entryStatus,
-                TeacherInfoConstants.ENTRY_STATUS_PASS
-            )){
+        } else {
             mViewBinding.ratingBar.visibility = View.GONE
             mViewBinding.tvNoScore.visibility = View.VISIBLE
         }

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

@@ -71,11 +71,11 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
         //昵称
         mViewBinding.tvNickname.setText(UserHelper.getTeacherName(teacherUserInfo.username, teacherUserInfo.userId));
         //星级
-        if (teacherUserInfo.starGrade > 0 && TextUtils.equals(teacherUserInfo.entryStatus, TeacherInfoConstants.ENTRY_STATUS_PASS)) {
+        if (teacherUserInfo.starGrade > 0) {
             mViewBinding.ratingBar.setVisibility(View.VISIBLE);
             mViewBinding.ratingBar.setRating(teacherUserInfo.starGrade);
             mViewBinding.tvNoScore.setVisibility(View.GONE);
-        } else if (TextUtils.equals(teacherUserInfo.entryStatus, TeacherInfoConstants.ENTRY_STATUS_PASS)) {
+        } else {
             mViewBinding.ratingBar.setVisibility(View.GONE);
             mViewBinding.tvNoScore.setVisibility(View.VISIBLE);
         }

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

@@ -23,6 +23,8 @@ import com.cooleshow.usercenter.bean.SetDetailBean;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -55,14 +57,10 @@ public class InputBankVCodeActivity extends BaseMVPActivity<ActivityInputBankVco
     }
 
     private void sendVcode() {
-        JSONObject jsonObject = new JSONObject();
-        try {
-            jsonObject.putOpt("mobile", phone);
-            jsonObject.putOpt("type", "BANK");
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        presenter.sendSmsCode(jsonObject.toString());
+        Map<String,String> jsonObject = new HashMap<>();
+        jsonObject.put("mobile", phone);
+        jsonObject.put("type", "BANK");
+        presenter.sendSmsCode(jsonObject);
     }
 
     @Override

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

@@ -98,14 +98,10 @@ public class ModifyPasswordActivity extends BaseMVPActivity<ActivityModifyPasswo
     }
 
     private void sendVerifyCode(String phone) {
-        JSONObject jsonObject = new JSONObject();
-        try {
-            jsonObject.putOpt("mobile", phone);
-            jsonObject.putOpt("type", "PASSWD");
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        presenter.sendSmsCode(jsonObject.toString());
+        Map<String,String> jsonObject = new HashMap<>();
+        jsonObject.put("mobile", phone);
+        jsonObject.put("type", "PASSWD");
+        presenter.sendSmsCode(jsonObject);
     }
 
     @Override

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

@@ -27,6 +27,8 @@ import com.cooleshow.usercenter.bean.SetDetailBean;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -65,7 +67,7 @@ public class ModifyPhoneNumActivity extends BaseMVPActivity<ActivityModifyPhonen
                     ToastUtil.getInstance().showShort("请输入验证码");
                     break;
                 }
-                presenter.updatePhone(oldPhone,phoneNum,authCode);
+                presenter.updatePhone(authCode,phoneNum,oldPhone);
                 break;
         }
     }
@@ -115,6 +117,7 @@ public class ModifyPhoneNumActivity extends BaseMVPActivity<ActivityModifyPhonen
 
     @Override
     public void updatePhoneSuccess(Object object) {
+        ToastUtil.getInstance().showShort("修改成功");
         Intent intent=new Intent();
         intent.putExtra("newPhoneNum",viewBinding.etPhoneNum.getText().toString().trim());
         setResult(RESULT_OK,intent);
@@ -133,14 +136,10 @@ public class ModifyPhoneNumActivity extends BaseMVPActivity<ActivityModifyPhonen
     }
 
     private void sendSmsCode(String phone) {
-        JSONObject jsonObject = new JSONObject();
-        try {
-            jsonObject.putOpt("mobile", phone);
-            jsonObject.putOpt("type", "PHONE");
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        presenter.sendSmsCode(jsonObject.toString());
+        Map<String,String> jsonObject = new HashMap<>();
+        jsonObject.put("mobile", phone);
+        jsonObject.put("type", "PHONE");
+        presenter.sendSmsCode(jsonObject);
     }
 
     @Override
@@ -229,9 +228,9 @@ public class ModifyPhoneNumActivity extends BaseMVPActivity<ActivityModifyPhonen
 
     @Override
     public void onDestroy() {
-        super.onDestroy();
         if (handler != null) {
             handler.removeCallbacksAndMessages(null);
         }
+        super.onDestroy();
     }
 }

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

@@ -275,7 +275,7 @@ public class PersonalSettingActivity extends BaseMVPActivity<ActivityPersonalSet
             //男
             viewBinding.tvSex.setText("男");
         }
-        viewBinding.tvPhone.setText(setDetailBean.phone);
+        viewBinding.tvPhone.setText(UserHelper.getUserPhone());
         if (setDetailBean.isReal==1) {
             //是
             viewBinding.tvCertificationStatus.setText("已认证");

teacher/src/main/java/com/cooleshow/teacher/ui/minestyle/MineStylePageActivity.java

@@ -191,7 +191,7 @@ public class MineStylePageActivity extends BaseMVPActivity<ActivityMineStylePage
             @Override
             public void afterTextChanged(Editable s) {
                 String trim = etSelfIntroduction.getText().toString();
-                viewBinding.tvNumHint.setText(trim.length() + "/150");
+                viewBinding.tvNumHint.setText(trim.length() + "/200");
             }
         });
     }

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

@@ -45,11 +45,12 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
+                    android:id="@+id/start_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="4dp"
-                    android:text="*可教授乐器（可多选）"
-                    android:textColor="@color/black_333"
+                    android:text="*"
+                    android:textColor="@color/red_eb6363"
                     android:textSize="@dimen/sp_16"
                     android:textStyle="bold"
                     app:layout_constraintBottom_toBottomOf="@+id/im_fan_pages"
@@ -57,6 +58,17 @@
                     app:layout_constraintTop_toTopOf="@+id/im_fan_pages" />
 
                 <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="可教授乐器（可多选）"
+                    android:textColor="@color/black_333"
+                    android:textSize="@dimen/sp_16"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/im_fan_pages"
+                    app:layout_constraintLeft_toRightOf="@+id/start_view"
+                    app:layout_constraintTop_toTopOf="@+id/im_fan_pages" />
+
+                <TextView
                     android:id="@+id/tv_select_fans"
                     android:layout_width="54dp"
                     android:layout_height="24dp"
@@ -143,8 +155,8 @@
                     android:background="@null"
                     android:gravity="left|top"
                     android:hint="个人介绍"
-                    android:maxLength="200"
                     android:lineSpacingExtra="4dp"
+                    android:maxLength="200"
                     android:minHeight="66dp"
                     android:textColor="@color/color_666666"
                     android:textColorHint="@color/color_999999"

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

@@ -51,7 +51,7 @@
             android:background="@null"
             android:gravity="center_vertical"
             android:hint="请输入验证码"
-            android:inputType="textPassword"
+            android:inputType="number"
             android:paddingLeft="14dp"
             android:paddingRight="14dp"
             android:textColor="@color/color_1a1a1a"

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

@@ -538,6 +538,11 @@
                         tools:text="每个音的指法比较熟练，但是遇到指法变换比较频繁的小节熟练度不足，建议平时可以选择指法变换较大的曲目多加练习！" />
                 </FrameLayout>
             </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <View
+                android:id="@+id/bottom_view"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_100"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 

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

@@ -62,7 +62,6 @@
             android:layout_marginLeft="11dp"
             android:layout_marginTop="17dp"
             android:layout_marginBottom="20dp"
-            android:src="@drawable/icon_piano_room_course"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/view_line"