浏览代码

修改部分问题

Pq 6 月之前
父节点
当前提交
77d0050a54

+ 2 - 2
student/src/main/java/com/cooleshow/student/ui/course/GroupCourseGroupDetailActivity.java

@@ -86,7 +86,7 @@ public class GroupCourseGroupDetailActivity extends BaseMVPActivity<AcGroupCours
 
     @Override
     protected void initView() {
-        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "小组课详情");
+        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "课程组详情");
         viewBinding.scCoursePlan.setOnTouchListener(new SolveEditTextScrollClash(viewBinding.scCoursePlan));
         viewBinding.scCoursePlan.setVerticalScrollBarEnabled(true);
     }
@@ -238,7 +238,7 @@ public class GroupCourseGroupDetailActivity extends BaseMVPActivity<AcGroupCours
         String tip = UiUtils.getBuyNumTip2("", String.valueOf(bean.getStudentCount()));
         viewBinding.tvBuyNum.setText(tip);
 
-        viewBinding.tvTeacherName.setText(bean.getTeacherName());
+        viewBinding.tvTeacherName.setText(bean.getUserName());
         viewBinding.tvCourseCompletedValue.setText(bean.getCompleteCourseNum());
         viewBinding.tvCourseTotalValue.setText(String.valueOf(bean.getCourseNum()));
 

二进制
student/src/main/res/drawable-xhdpi/icon_group_course_des_tag.png


二进制
student/src/main/res/drawable-xxhdpi/icon_group_course_des_tag.png


+ 11 - 2
student/src/main/res/layout/ac_group_course_group_detail_layout.xml

@@ -327,7 +327,7 @@
                             android:id="@+id/tv_plan_title"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:drawableStart="@drawable/icon_course_group_plan_tag"
+                            android:drawableStart="@drawable/icon_group_course_des_tag"
                             android:drawablePadding="6dp"
                             android:gravity="center"
                             android:includeFontPadding="false"
@@ -337,6 +337,15 @@
                             app:layout_constraintLeft_toLeftOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
 
+                        <View
+                            android:id="@+id/view_line2"
+                            android:layout_marginTop="12dp"
+                            app:layout_constraintRight_toRightOf="parent"
+                            app:layout_constraintLeft_toLeftOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/tv_plan_title"
+                            android:background="@color/color_f2f2f2"
+                            android:layout_width="match_parent"
+                            android:layout_height="1dp"/>
 
                         <androidx.core.widget.NestedScrollView
                             android:layout_marginTop="12dp"
@@ -347,7 +356,7 @@
                             android:scrollbarStyle="outsideInset"
                             app:layout_constraintLeft_toLeftOf="parent"
                             app:layout_constraintRight_toRightOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/tv_plan_title"
+                            app:layout_constraintTop_toBottomOf="@+id/view_line2"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content">
                             <TextView

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/course/GroupCourseGroupDetailActivity.java

@@ -70,7 +70,7 @@ public class GroupCourseGroupDetailActivity extends BaseMVPActivity<AcGroupCours
 
     @Override
     protected void initView() {
-        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "小组课详情");
+        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "课程组详情");
         viewBinding.scCoursePlan.setOnTouchListener(new SolveEditTextScrollClash(viewBinding.scCoursePlan));
         viewBinding.scCoursePlan.setVerticalScrollBarEnabled(true);
     }
@@ -221,7 +221,7 @@ public class GroupCourseGroupDetailActivity extends BaseMVPActivity<AcGroupCours
         viewBinding.tvTime.setText(String.format("开课时间:%s", timeStr));
         viewBinding.tvBuyNum.setText(UiUtils.getBuyNumTip2("", String.valueOf(bean.getStudentCount())));
 
-        viewBinding.tvTeacherName.setText(bean.getTeacherName());
+        viewBinding.tvTeacherName.setText(bean.getUserName());
         viewBinding.tvCourseCompletedValue.setText(bean.getCompleteCourseNum());
         viewBinding.tvCourseTotalValue.setText(String.valueOf(bean.getCourseNum()));
 

二进制
teacher/src/main/res/drawable-xhdpi/icon_group_course_des_tag.png


二进制
teacher/src/main/res/drawable-xxhdpi/icon_group_course_des_tag.png


+ 12 - 2
teacher/src/main/res/layout/ac_group_course_group_detail_layout.xml

@@ -327,7 +327,7 @@
                             android:id="@+id/tv_plan_title"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:drawableStart="@drawable/icon_course_group_plan_tag"
+                            android:drawableStart="@drawable/icon_group_course_des_tag"
                             android:drawablePadding="6dp"
                             android:gravity="center"
                             android:includeFontPadding="false"
@@ -337,6 +337,16 @@
                             app:layout_constraintLeft_toLeftOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
 
+                        <View
+                            android:id="@+id/view_line2"
+                            android:layout_marginTop="12dp"
+                            app:layout_constraintRight_toRightOf="parent"
+                            app:layout_constraintLeft_toLeftOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/tv_plan_title"
+                            android:background="@color/color_f2f2f2"
+                            android:layout_width="match_parent"
+                            android:layout_height="1dp"/>
+
                         <TextView
                             android:visibility="gone"
                             android:id="@+id/tv_edit_plan"
@@ -361,7 +371,7 @@
                             android:scrollbarStyle="outsideInset"
                             app:layout_constraintLeft_toLeftOf="parent"
                             app:layout_constraintRight_toRightOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/tv_plan_title"
+                            app:layout_constraintTop_toBottomOf="@+id/view_line2"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content">
                             <TextView