瀏覽代碼

修改我的曲谱,我的直播课,我的视频课等页面ui

Pq 2 年之前
父節點
當前提交
34392902a0

+ 0 - 12
teacher/src/main/java/com/cooleshow/teacher/adapter/MineLiveCourseAdapter.java

@@ -66,47 +66,35 @@ public class MineLiveCourseAdapter extends BaseQuickAdapter<MineLiveCourseListBe
         helper.setText(R.id.subject_name, item.subjectName);
 
         TextView tv_course_status_tip = helper.getView(R.id.tv_course_status_tip);
-        TextView tv_operate_tip = helper.getView(R.id.tv_operate_tip);
         if (TextUtils.equals(type, MineLiveCourseActivity.TYPE_ING)) {
             //进行中
             tv_course_status_tip.setText("进行中");
             tv_course_status_tip.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_2dc7aa));
             tv_course_status_tip.setBackgroundResource(R.drawable.shape_d5fff7_15dp_left);
-            tv_operate_tip.setVisibility(View.GONE);
         } else if (TextUtils.equals(type, MineLiveCourseActivity.TYPE_NOT_SALE)) {
             //未上架
             tv_course_status_tip.setText("未上架");
             tv_course_status_tip.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_ff4e19));
             tv_course_status_tip.setBackgroundResource(R.drawable.shape_ffeee3_15dp_left);
-            tv_operate_tip.setVisibility(View.GONE);
         } else if (TextUtils.equals(type, MineLiveCourseActivity.TYPE_APPLY)) {
             //销售中
             tv_course_status_tip.setText("销售中");
             tv_course_status_tip.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_ff1919));
             tv_course_status_tip.setBackgroundResource(R.drawable.shape_ffe7e7_15dp_left);
-            tv_operate_tip.setVisibility(View.VISIBLE);
-            tv_operate_tip.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_008ae0));
-            tv_operate_tip.setCompoundDrawablesWithIntrinsicBounds(null, null, getContext().getResources().getDrawable(com.cooleshow.base.R.drawable.icon_arrow_right_small_blue), null);
         } else if (TextUtils.equals(type, MineLiveCourseActivity.TYPE_COMPLETE)) {
             //已完成
             tv_course_status_tip.setText("已完成");
             tv_course_status_tip.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_008ae0));
             tv_course_status_tip.setBackgroundResource(R.drawable.shape_def2ff_15dp_left);
-            tv_operate_tip.setVisibility(View.GONE);
         } else if (TextUtils.equals(type, MineLiveCourseActivity.TYPE_CANCEL)) {
             //已取消
             tv_course_status_tip.setText("已取消");
             tv_course_status_tip.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_666666));
             tv_course_status_tip.setBackgroundResource(R.drawable.shape_f0f0f0_15dp_left);
-            tv_operate_tip.setVisibility(View.GONE);
         } else if (TextUtils.equals(type, MineLiveCourseActivity.TYPE_OUT_SALE)) {
             tv_course_status_tip.setText("已下架");
             tv_course_status_tip.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_666666));
             tv_course_status_tip.setBackgroundResource(R.drawable.shape_f0f0f0_15dp_left);
-            tv_operate_tip.setVisibility(View.VISIBLE);
-            tv_operate_tip.setText("重新上架");
-            tv_operate_tip.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_ff1919));
-            tv_operate_tip.setCompoundDrawablesWithIntrinsicBounds(null, null, getContext().getResources().getDrawable(com.cooleshow.base.R.drawable.icon_arrow_right_small_red), null);
         }
     }
 

+ 3 - 4
teacher/src/main/java/com/cooleshow/teacher/adapter/MineScoreAdapter.java

@@ -87,19 +87,18 @@ public class MineScoreAdapter extends BaseQuickAdapter<MusicSheetListBean.RowsBe
             tv_status_tip.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_ff4e19));
             tv_status_tip.setVisibility(View.VISIBLE);
             iv_play.setVisibility(View.GONE);
-            tv_status_tip.setCompoundDrawablesWithIntrinsicBounds(null, null, getContext().getResources().getDrawable(com.cooleshow.base.R.drawable.icon_arrow_right_small_red), null);
+            tv_status_tip.setCompoundDrawablesWithIntrinsicBounds(null, null, getContext().getResources().getDrawable(com.cooleshow.base.R.drawable.icon_arrow_right_small_orange), null);
         } else if (TextUtils.equals(scoreStatus, MineScoreActivity.TYPE_OUT_SALE)) {
-            tv_status_tip.setText("上架");
+            tv_status_tip.setText("修改");
             tv_status_tip.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_ff4e19));
             tv_status_tip.setVisibility(View.VISIBLE);
             iv_play.setVisibility(View.GONE);
-            tv_status_tip.setCompoundDrawablesWithIntrinsicBounds(null, null, getContext().getResources().getDrawable(com.cooleshow.base.R.drawable.icon_arrow_right_small_red), null);
+            tv_status_tip.setCompoundDrawablesWithIntrinsicBounds(null, null, getContext().getResources().getDrawable(com.cooleshow.base.R.drawable.icon_arrow_right_small_orange), null);
         } else {
             iv_play.setVisibility(View.VISIBLE);
             tv_status_tip.setVisibility(View.GONE);
         }
 
-
         //icon
         if (!TextUtils.isEmpty(item.titleImg)) {
             GlideUtils.INSTANCE.loadImage(getContext(), item.titleImg, im_music_mark, R.drawable.icon_music_mark);

+ 0 - 20
teacher/src/main/java/com/cooleshow/teacher/adapter/MineVideoCourseAdapter.java

@@ -63,48 +63,28 @@ public class MineVideoCourseAdapter extends BaseQuickAdapter<VideoCourseListBean
             tv_buy_num.setVisibility(View.VISIBLE);
         }
 
-        TextView tv_operate_tip = helper.getView(R.id.tv_operate_tip);
-        View view_divide_bottom = helper.getView(R.id.view_divide_bottom);
         TextView tv_course_status_tip = helper.getView(R.id.tv_course_status_tip);
         if(TextUtils.isEmpty(auditStatus)){
-            tv_operate_tip.setVisibility(View.GONE);
             tv_course_status_tip.setVisibility(View.GONE);
             return;
         }
         if (TextUtils.equals(auditStatus, MineVideoCourseActivity.TYPE_PASS)) {
             //已上架
-            tv_operate_tip.setVisibility(View.VISIBLE);
-            tv_operate_tip.setText("下架此课程");
-            tv_operate_tip.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_008ae0));
-            tv_operate_tip.setCompoundDrawablesWithIntrinsicBounds(null, null, getContext().getResources().getDrawable(com.cooleshow.base.R.drawable.icon_arrow_right_small_blue), null);
-            view_divide_bottom.setVisibility(View.VISIBLE);
             tv_course_status_tip.setText("已上架");
             tv_course_status_tip.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_2dc7aa));
             tv_course_status_tip.setBackgroundResource(R.drawable.shape_d5fff7_9dp_right);
         } else if (TextUtils.equals(auditStatus, MineVideoCourseActivity.TYPE_DOING)) {
             //审核中
-            tv_operate_tip.setVisibility(View.GONE);
-            view_divide_bottom.setVisibility(View.INVISIBLE);
             tv_course_status_tip.setText("审核中");
             tv_course_status_tip.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_008ae0));
             tv_course_status_tip.setBackgroundResource(R.drawable.shape_def2ff_9dp_right);
         } else if (TextUtils.equals(auditStatus, MineVideoCourseActivity.TYPE_UNPASS)) {
             //审核失败
-            tv_operate_tip.setVisibility(View.VISIBLE);
-            tv_operate_tip.setText("重新编辑");
-            tv_operate_tip.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_ff4e19));
-            tv_operate_tip.setCompoundDrawablesWithIntrinsicBounds(null, null, getContext().getResources().getDrawable(com.cooleshow.base.R.drawable.icon_arrow_right_small_orange), null);
-            view_divide_bottom.setVisibility(View.VISIBLE);
             tv_course_status_tip.setText("失败");
             tv_course_status_tip.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_ff1919));
             tv_course_status_tip.setBackgroundResource(R.drawable.shape_ffe7e7_9dp_right);
         } else if (TextUtils.equals(auditStatus, MineVideoCourseActivity.TYPE_OUT_SALE)) {
             //已下架
-            tv_operate_tip.setVisibility(View.VISIBLE);
-            tv_operate_tip.setText("重新上架");
-            tv_operate_tip.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_ff1919));
-            tv_operate_tip.setCompoundDrawablesWithIntrinsicBounds(null, null, getContext().getResources().getDrawable(com.cooleshow.base.R.drawable.icon_arrow_right_small_red), null);
-            view_divide_bottom.setVisibility(View.VISIBLE);
             tv_course_status_tip.setText("已下架");
             tv_course_status_tip.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_666666));
             tv_course_status_tip.setBackgroundResource(R.drawable.shape_f0f0f0_9dp_right);

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/main/MineFragment.java

@@ -393,7 +393,7 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
             return;
         }
         if (TextUtils.equals(type, MineFragmentToolsHelper.TYPE_MINE_COURSE)) {
-            //我的曲谱
+            //我的课程
             ARouter.getInstance().build(RouterPath.CourseCenter.TEACHER_MINE_COURSE)
                     .navigation();
             return;

+ 0 - 16
teacher/src/main/res/layout/layout_mine_live_course_item.xml

@@ -107,22 +107,6 @@
 
 
     <TextView
-        android:id="@+id/tv_operate_tip"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="14dp"
-        android:drawableRight="@drawable/icon_arrow_right_small_blue"
-        android:drawablePadding="4dp"
-        android:gravity="center"
-        android:text="下架课程"
-        android:textColor="@color/color_008ae0"
-        android:textSize="@dimen/sp_14"
-        app:layout_constraintBottom_toBottomOf="@+id/tv_price"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/tv_price" />
-
-
-    <TextView
         android:id="@+id/tv_student_count"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

+ 1 - 29
teacher/src/main/res/layout/layout_mine_video_course_item.xml

@@ -7,6 +7,7 @@
     android:layout_marginLeft="6dp"
     android:layout_marginTop="12dp"
     android:layout_marginRight="6dp"
+    android:paddingBottom="9dp"
     android:background="@drawable/bg_white_10dp">
 
 
@@ -111,33 +112,4 @@
         app:layout_constraintTop_toBottomOf="@+id/tv_price"
         tools:text="6人已购买" />
 
-    <View
-        android:id="@+id/view_divide_bottom"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginTop="9dp"
-        android:background="@color/color_F8F8F8"
-        android:visibility="invisible"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tv_buy_num"
-        tools:visibility="visible" />
-
-    <TextView
-        android:id="@+id/tv_operate_tip"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="10dp"
-        android:drawableRight="@drawable/icon_arrow_right_small_blue"
-        android:drawablePadding="5dp"
-        android:text="下架此课程"
-        android:textColor="@color/color_008ae0"
-        android:textSize="@dimen/sp_14"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/view_divide_bottom"
-        tools:visibility="visible" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>