Procházet zdrojové kódy

修改样式问题

Pq před 7 měsíci
rodič
revize
5769cfb2bf

+ 1 - 1
BaseLibrary/src/main/res/layout/pickerview_default_layout.xml

@@ -41,7 +41,7 @@
             android:layout_centerVertical="true"
             android:layout_marginRight="6dp"
             android:padding="14dp"
-            android:text="确"
+            android:text="确"
             android:textColor="@color/colorPrimary"
             android:textSize="@dimen/dp_16" />
 

+ 0 - 12
teacher/src/main/java/com/cooleshow/teacher/ui/work/AssignHomeworkActivity.java

@@ -150,15 +150,9 @@ public class AssignHomeworkActivity extends BaseMVPActivity<ActivityAssignHomewo
             //学员已提交课后作业
             viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.GONE);
             viewBinding.llHomeworkVideoContent.removeAllViews();
-            viewBinding.homeWordVideoView.setVisibility(View.VISIBLE);
             addVideoThumbnailView(bean.studentAttachments);
         } else {
             //学员未提交课后作业 || 作业过期
-            if (bean.decorateHomework == CourseConstants.COURSE_HOMEWORK_SET) {
-                viewBinding.homeWordVideoView.setVisibility(View.VISIBLE);
-            } else {
-                viewBinding.homeWordVideoView.setVisibility(View.GONE);
-            }
             viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.VISIBLE);
             if (bean.homeworkExpire == CourseConstants.COURSE_HOMEWORK_OVERDUE) {
                 viewBinding.tvHomeworkVideoEmptyText.setText("作业已过期无法查看!");
@@ -173,15 +167,9 @@ public class AssignHomeworkActivity extends BaseMVPActivity<ActivityAssignHomewo
             //老师已点评作业
             viewBinding.tvHomeworkCommentEmptyText.setVisibility(View.GONE);
             viewBinding.tvHomeworkSetComment.setVisibility(View.GONE);
-            viewBinding.commentView.setVisibility(View.VISIBLE);
             viewBinding.tvHomeworkCommentContent.setVisibility(View.VISIBLE);
             viewBinding.tvHomeworkCommentContent.setText(bean.teacherReplied);
         } else {
-            if (bean.submitHomework == CourseConstants.COURSE_HOMEWORK_STU_SUBMIT) {
-                viewBinding.commentView.setVisibility(View.VISIBLE);
-            } else {
-                viewBinding.commentView.setVisibility(View.GONE);
-            }
             viewBinding.tvHomeworkCommentEmptyText.setVisibility(View.VISIBLE);
             viewBinding.tvHomeworkCommentEmptyText.setText(CourseConstants.getHomeworkCommentDefaultTip(isSubmit));
             viewBinding.tvHomeworkSetComment.setVisibility(View.VISIBLE);

+ 15 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/work/HomeWorkFragment.java

@@ -13,6 +13,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.bigkoo.pickerview.builder.TimePickerBuilder;
+import com.bigkoo.pickerview.listener.OnDismissListener;
 import com.bigkoo.pickerview.view.TimePickerView;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.listener.OnItemChildClickListener;
@@ -22,6 +23,7 @@ import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.fragment.BaseMVPFragment;
 import com.cooleshow.base.utils.LOG;
 import com.cooleshow.base.utils.TimeUtils;
+import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.chatmodule.utils.helper.ChatHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.HomeworkAdapter;
@@ -280,6 +282,18 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
                     .isDialog(false)//是否显示为对话框样式
                     .setLabel("年", "月", "", "", "", "")
                     .build();
+
+            pvTime.setOnDismissListener(new OnDismissListener() {
+                @Override
+                public void onDismiss(Object o) {
+                    UiUtils.refreshFilterTextStyle2(false, mViewBinding.tvDate);
+                }
+
+                @Override
+                public void onShow() {
+                    UiUtils.refreshFilterTextStyle2(true, mViewBinding.tvDate);
+                }
+            });
         }
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(currentSelectDate);
@@ -291,7 +305,7 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
 
     private void reBuildFilter(Date date) {
         currentSelectDate = date != null ? date : TimeUtils.getNowDate();
-        String targetDateTimeStr = TimeUtils.date2String(currentSelectDate, TimeUtils.getSafeDateFormat("yyyy-MM"));
+        String targetDateTimeStr = TimeUtils.date2String(currentSelectDate, TimeUtils.getSafeDateFormat("yyyy年MM月"));
         if (TextUtils.equals(targetDateTimeStr, currentFilterDate)) {
             //防止重复条件触发
             return;

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

@@ -277,7 +277,7 @@
                 android:layout_marginTop="12dp"
                 android:background="@drawable/bg_white_10dp"
                 android:paddingBottom="10dp"
-                android:visibility="gone"
+                android:visibility="visible"
                 tools:visibility="visible"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/cs_homework">
@@ -350,7 +350,7 @@
                 android:layout_marginTop="12dp"
                 android:background="@drawable/bg_white_10dp"
                 android:paddingBottom="10dp"
-                android:visibility="gone"
+                android:visibility="visible"
                 tools:visibility="visible"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/home_word_video_view">