zhanghaochen / ParentControl

Browse Code »

Commit 028132f43d218831dcfa384a2fbfaa70dd866c44

Authored by shixianjie 2024-09-27 17:52:30 +0800

1 parent 1863fd36a1

Exists in master

MessageDialog

Showing 5 changed files with 215 additions and 2 deletions Show diff stats

app/src/main/java/com/hjx/parent/StuHomeworkActivity.java

Diff comments View file @028132f

 package com.hjx.parent;
 import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import androidx.lifecycle.MutableLiveData;
 import com.google.gson.Gson;
-import com.hjx.parent.adapter.HomeworkAdapter;
 import com.hjx.parent.adapter.HomeworkListAdapter;
 import com.hjx.parent.databinding.ActivityStudentHomeworkBinding;
 import com.hjx.parent.databinding.PopupFilterFeedbackBinding;
 import com.hjx.parent.databinding.PopupFilterGradeBinding;
 import com.hjx.parent.databinding.PopupFilterSubjectBinding;
 import com.hjx.parent.databinding.PopupFilterTermBinding;
+import com.hjx.parent.dialog.MsgConfirmDialog;
 import com.hjx.parent.rx.BaseRxActivity;
 import com.prws.common.bean.Student;
 import com.prws.common.net.NetWorks;
 import com.prws.common.utils.SharedPreferencesUtil;
 import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
 import java.util.Collections;
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 public class StuHomeworkActivity extends BaseRxActivity<ActivityStudentHomeworkBinding> {
     private final HomeworkListAdapter homeworkAdapter = new HomeworkListAdapter();
     PopupWindow subjectFilter, gradeFilter, termFilter, feedbackFilter;
+    MsgConfirmDialog deleteDialog;
     State state = new State();
     private void handlerIntent() {
         String json = getIntent().getStringExtra("studentJson");
         if (json == null) json = (String) SharedPreferencesUtil.getData("student", "");
         try { state.student = new Gson().fromJson(json, Student.class); }
         catch (Throwable t) { t.printStackTrace(); }
     }
     @SuppressLint("SetTextI18n")
     @Override
     public void initView(Bundle savedInstanceState) {
         handlerIntent();
         if (state.student == null) {
             finish();
             return;
         }
         binding.toolbar.setNavigationOnClickListener(v -> onBackPressed());
         binding.tvTitle.setText(state.student.stuName + "的全部作业");
         binding.recyclerView.setAdapter(homeworkAdapter);
         getHomework();
         binding.ftSubject.setOnClickListener(v -> showSubjectFilter());
         binding.ftGrade.setOnClickListener(v -> showGradeFilter());
         binding.ftTerm.setOnClickListener(v -> showTermFilter());
         binding.ftFeedback.setOnClickListener(v -> showFeedbackFilter());
+        homeworkAdapter.deleteCall = data -> {
+            if (deleteDialog == null) {
+                deleteDialog = new MsgConfirmDialog.Builder(this)
+                        .setMessage("确认要删除吗？一旦删除不可恢复")
+                        .setPositive("暂不删除")
+                        .setNegative("确定删除")
+                        .build();
+            }
+            deleteDialog.show(() -> {
+                // TODO Delete
+                return true;
+            }, null);
+        };
     }
     @SuppressLint("CheckResult")
     protected void getHomework() {
         NetWorks.service_url.getStudentHomework(NetWorks.getHeader(), state.student.stuId)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .compose(RxLifecycleAndroid.bindActivity(getRxLifecycle()))
                 .toObservable()
                 .flatMap(response -> Observable.fromIterable(response.getData()))
                 // 过滤
                 .filter(data -> { // 学科
                     String subject = state.subject.getValue();
                     if (subject == null || subject.isEmpty()) return true;
                     else return subject.equals(data.getSubject());
                 })
                 .filter(data -> { // 年级
                     String grade = state.grade.getValue();
                     if (grade == null || grade.isEmpty()) return true;
                     else return grade.equals(data.getGrade());
                 })
                 .filter(data -> { // 学期
                     String term = state.term.getValue();
                     if (term == null || term.isEmpty()) return true;
                     else return term.equals(data.getTerm());
                 })
                 .filter(data -> { // 反馈
                     Integer feedback = state.feedback.getValue();
                     if (feedback == null || feedback == 0) return true;
                     else return (feedback == 1 && data.getRight() != null) || (feedback == 2 && data.getRight() == null);
                 })
                 // 过滤完成, 收集
                 .toList()
                 .subscribe((data, th) -> {
                     if (th != null) th.printStackTrace();
-                    Collections.sort(data);
+                    if (data != null) {
+                        Collections.sort(data);
+                    }
                     homeworkAdapter.setNewData(data);
                 });
     }
     private void showSubjectFilter() {
         if (subjectFilter == null) {
             PopupFilterSubjectBinding db = PopupFilterSubjectBinding.inflate(getLayoutInflater());
             db.setLifecycleOwner(this);
             db.setState(state);
             db.bg.setOnClickListener(v -> subjectFilter.dismiss());
             subjectFilter = new PopupWindow(db.getRoot(), LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
             subjectFilter.setOutsideTouchable(true);
             subjectFilter.setOnDismissListener(this::getHomework);
         }
         subjectFilter.showAsDropDown(binding.anchorView);
     }
     private void showGradeFilter() {
         if (gradeFilter == null) {
             PopupFilterGradeBinding db = PopupFilterGradeBinding.inflate(getLayoutInflater());
             db.setLifecycleOwner(this);
             db.setState(state);
             db.bg.setOnClickListener(v -> gradeFilter.dismiss());
             gradeFilter = new PopupWindow(db.getRoot(), LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
             gradeFilter.setOutsideTouchable(true);
             gradeFilter.setOnDismissListener(this::getHomework);
         }
         gradeFilter.showAsDropDown(binding.anchorView);
     }
     private void showTermFilter() {
         if (termFilter == null) {
             PopupFilterTermBinding db = PopupFilterTermBinding.inflate(getLayoutInflater());
             db.setLifecycleOwner(this);
             db.setState(state);
             db.bg.setOnClickListener(v -> termFilter.dismiss());
             termFilter = new PopupWindow(db.getRoot(), LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
             termFilter.setOutsideTouchable(true);
             termFilter.setOnDismissListener(this::getHomework);
         }
         termFilter.showAsDropDown(binding.anchorView);
     }
     private void showFeedbackFilter() {
         if (feedbackFilter == null) {
             PopupFilterFeedbackBinding db = PopupFilterFeedbackBinding.inflate(getLayoutInflater());
             db.setLifecycleOwner(this);
             db.setState(state);
             db.bg.setOnClickListener(v -> feedbackFilter.dismiss());
             feedbackFilter = new PopupWindow(db.getRoot(), LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
             feedbackFilter.setOutsideTouchable(true);
             feedbackFilter.setOnDismissListener(this::getHomework);
         }
         feedbackFilter.showAsDropDown(binding.anchorView);
     }
     @Override
     protected ActivityStudentHomeworkBinding getViewBinding() {
         return ActivityStudentHomeworkBinding.inflate(getLayoutInflater());
     }
     public static class State {
         public Student student;
         public MutableLiveData<String> subject = new MutableLiveData<>("");
         public void setSubject(String value) {
             subject.setValue(value);
         }
         public MutableLiveData<String> grade = new MutableLiveData<>("");
         public void setGrade(String value) {
             grade.setValue(value);
         }
         public MutableLiveData<String> term = new MutableLiveData<>("");
         public void setTerm(String value) {
             term.setValue(value);
         }
         //0:全部, 1: 已反馈, 2:未反馈
         public MutableLiveData<Integer> feedback = new MutableLiveData<>(0);
         public void setFeedback(int value) {
             feedback.setValue(value);
         }
     }
 }

app/src/main/java/com/hjx/parent/adapter/HomeworkListAdapter.java

Diff comments View file @028132f

 package com.hjx.parent.adapter;
 import android.view.View;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.hjx.parent.R;
+import com.hjx.parent.function.Function0;
+import com.hjx.parent.function.Function1;
 import com.prws.common.bean.homework.HomeworkList;
 public class HomeworkListAdapter extends BaseQuickAdapter<HomeworkList, BaseViewHolder> {
+    public Function1<HomeworkList> deleteCall;
     public HomeworkListAdapter() {
         super(R.layout.item_homework_list);
     }
     @Override
     protected void convert(@NonNull BaseViewHolder helper, HomeworkList homework) {
         helper.setGone(R.id.tvFlag, homework.getRight() != null);
         helper.setText(R.id.tvName, homework.getName());
         helper.setText(R.id.tvGrade, homework.getGrade() + "-" + homework.getTerm());
         int subjectImg;
         switch (homework.getSubject()) {
             case "语文":
                 subjectImg = R.drawable.ic_chinese;
                 break;
             case "英语":
                 subjectImg = R.drawable.ic_english;
                 break;
             case "物理":
                 subjectImg = R.drawable.ic_physics;
                 break;
             case "化学":
                 subjectImg = R.drawable.ic_chemistry;
                 break;
             case "数学":
             default:
                 subjectImg = R.drawable.ic_math;
         }
         helper.setImageResource(R.id.ivSubject, subjectImg);
         TextView tvDate = helper.getView(R.id.tvDate);
         int index = getData().indexOf(homework);
         if (index == 0) {
             tvDate.setVisibility(View.VISIBLE);
         } else if (!homework.getFormatTime().equals(getData().get(index - 1).getFormatTime())) {
             tvDate.setVisibility(View.VISIBLE);
         } else {
             tvDate.setVisibility(View.GONE);
         }
         tvDate.setText(homework.getFormatTime());
+        View btnDelete = helper.getView(R.id.btnDelete);
+        btnDelete.setOnClickListener(v -> {
+            if (deleteCall != null) deleteCall.invoke(homework);
+        });
+        View btnDetail = helper.getView(R.id.btnDetail);
+        btnDetail.setOnClickListener(v -> {
+            // TODO
+        });
     }
 }

app/src/main/java/com/hjx/parent/dialog/MsgConfirmDialog.java

Diff comments View file @028132f

File was created	1	package com.hjx.parent.dialog;
	2
	3	import android.content.Context;
	4
	5	import androidx.annotation.NonNull;
	6
	7	import com.hjx.parent.databinding.DialogMessageConfirmBinding;
	8	import com.hjx.parent.function.Function10;
	9
	10	public class MsgConfirmDialog extends BaseDialog<DialogMessageConfirmBinding>{
	11	private CharSequence title, message, positive, negative;
	12	private Function10<Boolean> positiveClick, negativeClick;
	13
	14	private MsgConfirmDialog(Builder builder) {
	15	super(builder.context);
	16	title = builder.title;
	17	message = builder.message;
	18	positive = builder.positive;
	19	negative = builder.negative;
	20	positiveClick = builder.positiveClick;
	21	negativeClick = builder.negativeClick;
	22	}
	23
	24	@Override
	25	public void initView() {
	26	binding.tvTitle.setText(title);
	27	binding.tvMessage.setText(message);
	28	binding.btnPositive.setText(positive);
	29	binding.btnNegative.setText(negative);
	30	binding.btnPositive.setOnClickListener(v -> {
	31	if (positiveClick != null) {
	32	if (positiveClick.invoke()) dismiss();
	33	} else {
	34	dismiss();
	35	}
	36	});
	37	binding.btnNegative.setOnClickListener(v -> {
	38	if (negativeClick != null) {
	39	if (negativeClick.invoke()) dismiss();
	40	} else {
	41	dismiss();
	42	}
	43	});
	44	}
	45
	46	public void show(Function10<Boolean> positiveClick, Function10<Boolean> negativeClick) {
	47	this.positiveClick = positiveClick;
	48	this.negativeClick = negativeClick;
	49	super.show();
	50	}
	51
	52	@NonNull
	53	@Override
	54	public DialogMessageConfirmBinding getBinding() {
	55	return DialogMessageConfirmBinding.inflate(getLayoutInflater());
	56	}
	57
	58	public static class Builder {
	59	public Builder(Context context) {
	60	this.context = context;
	61	}
	62	private Context context;
	63	private CharSequence title = "温馨提示";
	64	private CharSequence message = "";
	65	private CharSequence positive = "确定";
	66	private CharSequence negative = "取消";
	67	private Function10<Boolean> positiveClick = () -> true;
	68	private Function10<Boolean> negativeClick = () -> true;
	69
	70	public Builder setTitle(CharSequence title) {
	71	this.title = title;
	72	return this;
	73	}
	74
	75	public Builder setMessage(CharSequence message) {
	76	this.message = message;
	77	return this;
	78	}
	79
	80	public Builder setPositive(CharSequence positive) {
	81	this.positive = positive;
	82	return this;
	83	}
	84
	85	public Builder setNegative(CharSequence negative) {
	86	this.negative = negative;
	87	return this;
	88	}
	89
	90	public Builder setPositiveClick(Function10<Boolean> positiveClick) {
	91	this.positiveClick = positiveClick;
	92	return this;
	93	}
	94
	95	public Builder setNegativeClick(Function10<Boolean> negativeClick) {
	96	this.negativeClick = negativeClick;
	97	return this;
	98	}
	99
	100	public MsgConfirmDialog build() {
	101	return new MsgConfirmDialog(this);
	102	}
	103	}
	104	}
	105

app/src/main/res/layout/dialog_message_confirm.xml

Diff comments View file @028132f

File was created	1	<?xml version="1.0" encoding="utf-8"?>
	2	<FrameLayout
	3	xmlns:android="http://schemas.android.com/apk/res/android"
	4	xmlns:app="http://schemas.android.com/apk/res-auto"
	5	xmlns:tools="http://schemas.android.com/tools"
	6	android:layout_width="match_parent"
	7	android:layout_height="match_parent">
	8
	9	<LinearLayout
	10	android:orientation="vertical"
	11	android:background="@drawable/shape_radius_10"
	12	android:backgroundTint="@color/white"
	13	android:layout_gravity="center"
	14	android:layout_width="280dp"
	15	android:layout_height="wrap_content">
	16
	17	<TextView
	18	android:id="@+id/tvTitle"
	19	tools:text="温馨提示"
	20	android:textSize="18sp"
	21	android:textColor="#333"
	22	android:textStyle="bold"
	23	android:layout_gravity="center_horizontal"
	24	android:layout_marginTop="20dp"
	25	android:layout_width="wrap_content"
	26	android:layout_height="wrap_content"/>
	27
	28	<TextView
	29	android:id="@+id/tvMessage"
	30	tools:text="确认要删除吗？一旦删除不可恢复"
	31	android:textSize="14sp"
	32	android:textColor="#333"
	33	android:gravity="center"
	34	android:layout_marginHorizontal="15dp"
	35	android:layout_marginTop="16dp"
	36	android:layout_width="match_parent"
	37	android:layout_height="wrap_content"/>
	38	<View
	39	android:background="#EEE"
	40	android:layout_marginHorizontal="10dp"
	41	android:layout_marginTop="26dp"
	42	android:layout_width="match_parent"
	43	android:layout_height="1dp"/>
	44	<LinearLayout
	45	android:orientation="horizontal"
	46	android:weightSum="2"
	47	android:layout_width="match_parent"
	48	android:layout_height="44dp">
	49	<TextView
	50	android:id="@+id/btnNegative"
	51	tools:text="取消"
	52	android:textSize="17sp"
	53	android:textColor="#999"
	54	android:textStyle="bold"
	55	android:gravity="center"
	56	android:layout_weight="1"
	57	android:layout_width="0dp"
	58	android:layout_height="match_parent"/>
	59	<View
	60	android:background="#EEE"
	61	android:layout_marginVertical="3dp"
	62	android:layout_width="1dp"
	63	android:layout_height="match_parent"/>
	64	<TextView
	65	android:id="@+id/btnPositive"
	66	tools:text="确定"
	67	android:textSize="17sp"
	68	android:textColor="#1C90F3"
	69	android:textStyle="bold"
	70	android:gravity="center"
	71	android:layout_weight="1"
	72	android:layout_width="0dp"
	73	android:layout_height="match_parent"/>
	74	</LinearLayout>
	75	</LinearLayout>
	76
	77	</FrameLayout>

app/src/main/res/layout/item_homework_list.xml

Diff comments View file @028132f

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:paddingHorizontal="10dp"
     android:layout_marginVertical="8dp"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     tools:ignore="SmallSp,HardcodedText">
     <TextView
         android:id="@+id/tvDate"
         android:visibility="gone"
         tools:visibility="visible"
         tools:text="2024-09-25"
         android:textSize="12sp"
         android:textColor="#999"
         android:layout_marginBottom="15dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
     <FrameLayout
         android:background="@drawable/shape_radius_10"
         android:backgroundTint="@color/white"
         android:layout_width="match_parent"
         android:layout_height="75dp">
         <LinearLayout
             android:orientation="horizontal"
             android:gravity="center_vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
             <ImageView
                 android:id="@+id/ivSubject"
                 tools:src="@drawable/ic_math"
                 android:layout_marginStart="10dp"
                 android:layout_width="44dp"
                 android:layout_height="56dp"
                 android:importantForAccessibility="no" />
             <LinearLayout
                 android:orientation="vertical"
                 android:layout_marginStart="14dp"
                 android:layout_marginEnd="10dp"
                 android:layout_marginVertical="16dp"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
                 <TextView
                     android:id="@+id/tvName"
                     tools:text="作业名称"
                     android:textSize="13sp"
                     android:textColor="#333"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
                 <Space style="@style/empty_space"/>
                 <LinearLayout
                     android:orientation="horizontal"
                     android:gravity="center_vertical"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
                     <TextView
                         android:id="@+id/tvGrade"
                         tools:text="七年级-上学期"
                         android:textSize="10sp"
                         android:textColor="#666"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content" />
                     <Space style="@style/empty_space"/>
                     <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/btnDelete"
                         android:text="删除"
                         android:textSize="10sp"
                         android:textColor="#666"
                         android:gravity="center_vertical"
                         android:drawableStart="@drawable/svg_delete"
                         android:drawableTint="#C5C5C5"
                         android:drawablePadding="2dp"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"/>
                     <View
                         android:background="#F5F5F5"
                         android:layout_marginHorizontal="15dp"
                         android:layout_width="1dp"
                         android:layout_height="10dp"/>
                     <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/btnDetail"
                         android:text="详情"
                         android:textSize="10sp"
                         android:textColor="#666"
                         android:gravity="center_vertical"
                         android:drawableStart="@drawable/svg_go_detail"
                         android:drawablePadding="5dp"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"/>
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
         <TextView
             android:id="@+id/tvFlag"
             android:text="已反馈"
             android:textSize="9sp"
             android:textColor="@color/white"
             android:background="@drawable/bg_homework_feedback_flag"
             android:layout_gravity="end"
             android:paddingHorizontal="7dp"
             android:paddingVertical="2dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
     </FrameLayout>
 </LinearLayout>