Bläddra i källkod

修改部分问题

Pq 2 månader sedan
förälder
incheckning
7dc6a1c5c8

+ 1 - 11
musicMerge/src/main/java/com/cooleshow/musicmerge/ui/work/MyWorkActivity.java

@@ -69,6 +69,7 @@ public class MyWorkActivity extends BaseMVPActivity<AcMyWorkLayoutBinding, MyWor
         MyWorkPagerAdapter workPagerAdapter = new MyWorkPagerAdapter(this);
         workPagerAdapter.setData(fragments);
         viewBinding.viewPager.setAdapter(workPagerAdapter);
+        viewBinding.viewPager.setOffscreenPageLimit(fragments.size());
         tabLayoutMediator.attach();
 
         if (mSelectPosition != 0 && mSelectPosition < fragments.size()) {
@@ -152,7 +153,6 @@ public class MyWorkActivity extends BaseMVPActivity<AcMyWorkLayoutBinding, MyWor
     @Override
     protected void onResume() {
         super.onResume();
-        refreshData();
     }
 
     @Override
@@ -177,14 +177,4 @@ public class MyWorkActivity extends BaseMVPActivity<AcMyWorkLayoutBinding, MyWor
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
     }
-
-    private void refreshData() {
-        if (mPublishFragment != null) {
-            mPublishFragment.refreshData();
-        }
-
-        if (mDraftFragment != null) {
-            mDraftFragment.refreshData();
-        }
-    }
 }

+ 4 - 5
musicMerge/src/main/java/com/cooleshow/musicmerge/ui/work/MyWorkDraftFragment.java

@@ -85,11 +85,11 @@ public class MyWorkDraftFragment extends BaseMVPFragment<FgMyWorkDraftLayoutBind
         mWorksTypes.addAll(Arrays.asList(values));
 
         initListener();
-        getData();
     }
 
     @Override
-    public void refreshData() {
+    public void onResume() {
+        super.onResume();
         refresh();
     }
 
@@ -131,8 +131,7 @@ public class MyWorkDraftFragment extends BaseMVPFragment<FgMyWorkDraftLayoutBind
         mViewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() {
             @Override
             public void onRefresh(@NonNull RefreshLayout refreshLayout) {
-                currentPage = 1;
-                getData();
+                refresh();
             }
         });
         mViewBinding.refreshLayout.setOnLoadMoreListener(new com.scwang.smart.refresh.layout.listener.OnLoadMoreListener() {
@@ -237,7 +236,7 @@ public class MyWorkDraftFragment extends BaseMVPFragment<FgMyWorkDraftLayoutBind
     }
 
     private void getData() {
-        if (currentPage == 1) {
+        if (currentPage == 1 && mViewBinding!=null) {
             mViewBinding.refreshLayout.resetNoMoreData();
         }
         if (presenter != null) {

+ 3 - 3
musicMerge/src/main/java/com/cooleshow/musicmerge/ui/work/MyWorkPublishFragment.java

@@ -73,11 +73,11 @@ public class MyWorkPublishFragment extends BaseMVPFragment<FgMyWorkPublishLayout
         mWorksTypes.addAll(Arrays.asList(values));
 
         initListener();
-        getData();
     }
 
     @Override
-    public void refreshData() {
+    public void onResume() {
+        super.onResume();
         refresh();
     }
 
@@ -120,7 +120,7 @@ public class MyWorkPublishFragment extends BaseMVPFragment<FgMyWorkPublishLayout
     }
 
     private void getData() {
-        if (currentPage == 1) {
+        if (currentPage == 1 && mViewBinding!=null ) {
             mViewBinding.refreshLayout.resetNoMoreData();
         }
         if (presenter != null) {

+ 4 - 4
student/src/main/java/com/cooleshow/student/ui/work/HomeWorkDetailActivity.java

@@ -107,12 +107,12 @@ public class HomeWorkDetailActivity extends BaseMVPActivity<ActivityHomeworkDeta
                 }
             }
         });
-        refresh();
     }
 
     @Override
     protected void onResume() {
         super.onResume();
+        refresh();
     }
 
     private void getVideoPermission() {
@@ -161,12 +161,12 @@ public class HomeWorkDetailActivity extends BaseMVPActivity<ActivityHomeworkDeta
         viewBinding.tvTime.setText(UiUtils.getCourseTimeString(infoBean.startTime, infoBean.endTime));
         //学生头像
         int avatarByType = CourseType.getAvatarByType(infoBean.courseType);
+        viewBinding.tvTitle.setText(infoBean.courseGroupName);
+        viewBinding.tvName.setText(infoBean.teacherName);
         if (avatarByType != -1) {
             viewBinding.ivAvatar.setImageResource(avatarByType);
-            viewBinding.tvTitle.setText(infoBean.courseGroupName);
         } else {
             GlideUtils.INSTANCE.loadImage(this, infoBean.teacherAvatar, viewBinding.ivAvatar, R.drawable.icon_teacher_default_head);
-            viewBinding.tvTitle.setText(infoBean.teacherName);
         }
 
         //subjectName
@@ -363,7 +363,7 @@ public class HomeWorkDetailActivity extends BaseMVPActivity<ActivityHomeworkDeta
         }
     }
 
-    private void submit(String result){
+    private void submit(String result) {
         if (UiUtils.isFastClick()) {
             return;
         }

+ 2 - 2
student/src/main/res/layout/activity_practice_course_detail_layout.xml

@@ -332,7 +332,7 @@
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
                     android:paddingStart="5dp"
-                    android:text="视频作业"
+                    android:text="作业视频"
                     android:textColor="@color/color_1a1a1a"
                     android:textSize="@dimen/sp_13"
                     android:textStyle="bold"
@@ -353,7 +353,7 @@
                     android:paddingTop="@dimen/dp_10"
                     android:paddingRight="@dimen/dp_8"
                     android:paddingBottom="@dimen/dp_6"
-                    android:text="课程结束之后可上传视频作业!"
+                    android:text="课程结束之后可上传作业视频"
                     android:textColor="@color/color_999999"
                     android:textSize="@dimen/sp_13"
                     app:layout_constraintTop_toTopOf="parent" />

+ 2 - 2
teacher/src/main/res/layout/activity_assign_homework.xml

@@ -22,7 +22,7 @@
         android:layout_height="wrap_content"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:title_text="布置作业" />
+        app:title_text="作业详情" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -299,7 +299,7 @@
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
                     android:paddingStart="5dp"
-                    android:text="视频作业"
+                    android:text="作业视频"
                     android:textColor="@color/color_1a1a1a"
                     android:textSize="@dimen/sp_13"
                     android:textStyle="bold"