Explorar el Código

修改部分bug

Pq hace 3 años
padre
commit
6b965b933e

+ 8 - 3
student/src/main/java/com/cooleshow/student/adapter/CourseTableListAdapter.kt

@@ -41,7 +41,7 @@ class CourseTableListAdapter(layoutResId: Int) :
             //陪练课
             GlideUtils.loadImage(
                 context,
-                data!!.avatar,
+                data!!.cover,
                 ivAvatar,
                 R.drawable.icon_teacher_default_head
             )
@@ -54,7 +54,7 @@ class CourseTableListAdapter(layoutResId: Int) :
             //已购人数
             tvBuyNum.text = context.getString(R.string.pay_count_str, payCount)
             viewLine2.setVisible(true)
-            tvBuyNum.setVisible(true)
+            tvBuyNum.setVisible(false)
         }
         when (data?.status) {
             NOT_START -> {
@@ -81,7 +81,12 @@ class CourseTableListAdapter(layoutResId: Int) :
             }
             COMPLETE -> {
                 //已完成
-                tvCourseStatusBt.setVisible(true)
+                if (TextUtils.equals(OTHER_COURSE, data?.courseType)) {
+                    tvCourseStatusBt.setVisible(true)
+                } else {
+                    //直播课隐藏
+                    tvCourseStatusBt.setVisible(false)
+                }
                 tvCourseStatusBt.text = "评价"
                 baseViewHolder.setText(R.id.tv_course_status, "已结束")
                 tvCourseStatusBt.setBackgroundResource(R.drawable.shape_course_status_normal);

+ 10 - 7
student/src/main/java/com/cooleshow/student/ui/mine/ModifyPasswordActivity.java

@@ -44,22 +44,22 @@ import io.rong.imkit.utils.StatusBarUtil;
 public class ModifyPasswordActivity extends BaseMVPActivity<ActivityModifyPasswordBinding, ModifyPasswordPresenter> implements ModifyPasswordContract.ModifyPasswordView, View.OnClickListener {
     @Override
     public void onClick(View view) {
-        switch (view.getId()){
+        switch (view.getId()) {
             case R.id.tv_confirm:
                 String password = viewBinding.etPassword.getText().toString().trim();
-                if (TextUtils.isEmpty(password)||password.length()<6||password.length()>20){
+                if (TextUtils.isEmpty(password) || password.length() < 6 || password.length() > 20) {
                     ToastUtils.showShort("请输入6-20位密码");
                     break;
                 }
                 String authCode = viewBinding.etAuthCode.getText().toString().trim();
-                if (TextUtils.isEmpty(authCode)){
+                if (TextUtils.isEmpty(authCode)) {
                     ToastUtils.showShort("请输入验证码");
                     break;
                 }
                 Map<String, String> params = new HashMap<>();
-                params.put("mobile",phoneNum);
-                params.put("authCode",authCode);
-                params.put("newPassword",password);
+                params.put("mobile", phoneNum);
+                params.put("authCode", authCode);
+                params.put("newPassword", password);
                 presenter.updatePassword(params);
                 break;
             case R.id.tv_get_auth_code:
@@ -80,6 +80,7 @@ public class ModifyPasswordActivity extends BaseMVPActivity<ActivityModifyPasswo
         super.onCreate(savedInstanceState);
         StatusBarUtil.setStatusBarDarkTheme(this, true);
     }
+
     @Autowired(name = "phoneNum")
     String phoneNum;
 
@@ -198,6 +199,8 @@ public class ModifyPasswordActivity extends BaseMVPActivity<ActivityModifyPasswo
     @Override
     public void onDestroy() {
         super.onDestroy();
-        handler.removeCallbacksAndMessages(EXECUTE_LOADING);
+        if (handler != null) {
+            handler.removeCallbacksAndMessages(null);
+        }
     }
 }

+ 7 - 6
student/src/main/res/layout/activity_modify_password.xml

@@ -16,11 +16,11 @@
         android:id="@+id/tv_phone"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="20sp"
-        android:text="--"
         android:layout_marginLeft="12dp"
         android:layout_marginTop="15dp"
-        android:textColor="@color/black"/>
+        android:text="--"
+        android:textColor="@color/black"
+        android:textSize="20sp" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -61,6 +61,7 @@
             android:gravity="center_vertical"
             android:hint="请输入验证码"
             android:inputType="number"
+            android:maxLength="6"
             android:paddingLeft="14dp"
             android:paddingRight="14dp"
             android:textColor="@color/color_1a1a1a"
@@ -76,10 +77,10 @@
             android:layout_marginRight="12dp"
             android:gravity="center"
             android:text="获取验证码"
-            android:textSize="@dimen/sp_14"
             android:textColor="@color/color_01c0b5"
-            app:layout_constraintTop_toBottomOf="@+id/view_line"
-            app:layout_constraintRight_toRightOf="parent"/>
+            android:textSize="@dimen/sp_14"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/view_line" />
     </androidx.constraintlayout.widget.ConstraintLayout>