zhanghaochen / ParentControl

Browse Code »

Commit 216ca52fecb9e58a653ebccfb5edefbcd369c323

Authored by shixianjie 2024-10-11 13:38:32 +0800

1 parent ab7bb5bf35

Exists in master

未制作解析的作业不能反馈

Showing 4 changed files with 18 additions and 15 deletions Show diff stats

.idea/deploymentTargetDropDown.xml

Diff comments View file @216ca52

1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<project version="4">	2	<project version="4">
3	<component name="deploymentTargetDropDown">	3	<component name="deploymentTargetDropDown">
4	<value>	4	<value>
5	<entry key="app">	5	<entry key="app">
6	<State>	6	<State />
7	<runningDeviceTargetSelectedWithDropDown>
8	<Target>
9	<type value="RUNNING_DEVICE_TARGET" />
10	<deviceKey>
11	<Key>
12	<type value="SERIAL_NUMBER" />
13	<value value="951f9ace" />
14	</Key>
15	</deviceKey>
16	</Target>
17	</runningDeviceTargetSelectedWithDropDown>
18	<timeTargetWasSelectedWithDropDown value="2024-10-11T03:36:34.174716500Z" />
19	</State>
20	</entry>	7	</entry>
21	</value>	8	</value>
22	</component>	9	</component>
23	</project>	10	</project>

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

Diff comments View file @216ca52

 package com.hjx.parent;
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.os.Bundle;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.bumptech.glide.Glide;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.hjx.parent.databinding.ActivityHomeworkDetailBinding;
 import com.hjx.parent.dialog.EditHomeworkDialog;
+import com.hjx.parent.dialog.MsgConfirmDialog;
 import com.hjx.parent.rx.BaseRxActivity;
 import com.prws.common.bean.ResponseResult;
 import com.prws.common.bean.Student;
 import com.prws.common.bean.homework.HomeWork;
 import com.prws.common.bean.homework.HomeworkList;
 import com.prws.common.net.NetWorks;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 public class HomeworkDetailActivity extends BaseRxActivity<ActivityHomeworkDetailBinding> {
     private HomeworkList mData;
     private Student student;
     private Adapter mAdapter = new Adapter();
     private EditHomeworkDialog mDialog;
+    private MsgConfirmDialog noAnalyseDialog;
     @Override
     public void initView(Bundle savedInstanceState) {
         binding.toolbar.setNavigationOnClickListener(v -> onBackPressed());
         mData = (HomeworkList) getIntent().getSerializableExtra("data");
         student = (Student) getIntent().getSerializableExtra("student");
         mDialog = new EditHomeworkDialog(this, mData);
+        noAnalyseDialog = new MsgConfirmDialog.Builder(this)
+                .setNegative("").setPositive("好的")
+                .setMessage("尚未完成解析制作，\n请先去好记星平板端制作解析").build();
         binding.tvTitle.setText(mData.getName());
         binding.recyclerView.setAdapter(mAdapter);
         getDetail();
         binding.btnFeedback.setOnClickListener(v -> {
             if (mAdapter.getData().size() == 0) return;
+            if (mData.getCompleteFlag() == 0) {
+                noAnalyseDialog.show();
+                return;
+            }
             Intent intent = new Intent(this, HomeworkSelectActivity.class);
             intent.putExtra("data", mData);
             intent.putExtra("student", student);
             intent.putExtra("list", new ArrayList<>(mAdapter.getData()));
             startActivityForResult(intent, 0xA01);
         });
         binding.btnEdit.setOnClickListener(v -> mDialog.show(data -> {
             edit(data);
         }));
     }
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == 0xA01 && resultCode == RESULT_OK) {
             finish();
         }
     }
     @SuppressLint("CheckResult")
     private void getDetail() {
         NetWorks.service_url.getHomeworkDetail(NetWorks.getHeader(), mData.getId())
                 .compose(transformSingle())
                 .map(ResponseResult::getData)
                 .subscribe((list, th) -> {
                     if (th != null) th.printStackTrace();
                     mAdapter.setNewData(list);
                 });
     }
     @SuppressLint("CheckResult")
     private void edit(HomeworkList data) {
         Map<String, Object> body = new HashMap<>();
         body.put("homeworkId", data.getId());
         body.put("name", data.getName());
         body.put("grade", data.getGrade());
         body.put("subject", data.getSubject());
         body.put("term", data.getTerm());
         body.put("uploadTime", data.uploadTime);
         showLoadingDialog("请稍等···");
         NetWorks.service_url.editHomework(NetWorks.getHeader(), body)
                 .compose(transformSingle())
                 .subscribe((response, th) -> {
                     if (th != null) th.printStackTrace();
                     if (response != null && response.getSuccess()) {
                         cancelLoadingDialog();
                         binding.tvTitle.setText(data.getName());
                     } else {
                         loadFail(response == null ? "" : response.getMsg());
                     }
                 });
     }
     @Override
     protected ActivityHomeworkDetailBinding getViewBinding() {
         return ActivityHomeworkDetailBinding.inflate(getLayoutInflater());
     }
     static class Adapter extends BaseQuickAdapter<HomeWork, BaseViewHolder> {
         public Adapter() {
             super(R.layout.item_homework_detail);
         }
         @SuppressLint("SetTextI18n")
         @Override
         protected void convert(@NonNull BaseViewHolder holder, HomeWork homeWork) {
             TextView tvNumber = holder.getView(R.id.tvNumber);
             ImageView imageView = holder.getView(R.id.ivTopic);
             int number = getData().indexOf(homeWork) + 1;
             tvNumber.setText("第" + number + "题");
             Glide.with(mContext).load(homeWork.url).into(imageView);
             holder.itemView.setOnClickListener(v -> {
                 Intent intent = new Intent(mContext, HomeworkTopicActivity.class);
                 intent.putExtra("position", getData().indexOf(homeWork));
                 intent.putExtra("list", new ArrayList<>(getData()));
                 mContext.startActivity(intent);
             });
         }
     }
 }

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

Diff comments View file @216ca52

 package com.hjx.parent.dialog;
 import android.content.Context;
+import android.view.View;
 import androidx.annotation.NonNull;
 import com.hjx.parent.databinding.DialogMessageConfirmBinding;
 import com.hjx.parent.function.Function10;
 public class MsgConfirmDialog extends BaseDialog<DialogMessageConfirmBinding>{
     private CharSequence title, message, positive, negative;
     private Function10<Boolean> positiveClick, negativeClick;
     private MsgConfirmDialog(Builder builder) {
         super(builder.context);
         title = builder.title;
         message = builder.message;
         positive = builder.positive;
         negative = builder.negative;
         positiveClick = builder.positiveClick;
         negativeClick = builder.negativeClick;
     }
     @Override
     public void initView() {
         binding.tvTitle.setText(title);
         binding.tvMessage.setText(message);
         binding.btnPositive.setText(positive);
         binding.btnNegative.setText(negative);
         binding.btnPositive.setOnClickListener(v -> {
             if (positiveClick != null) {
                 if (positiveClick.invoke()) dismiss();
             } else {
                 dismiss();
             }
         });
         binding.btnNegative.setOnClickListener(v -> {
             if (negativeClick != null) {
                 if (negativeClick.invoke()) dismiss();
             } else {
                 dismiss();
             }
         });
+        if (positive == null || positive.length() == 0) {
+            binding.btnPositive.setVisibility(View.GONE);
+        }
+        if (negative == null || negative.length() == 0) {
+            binding.btnNegative.setVisibility(View.GONE);
+        }
     }
     public void show(Function10<Boolean> positiveClick, Function10<Boolean> negativeClick) {
         this.positiveClick = positiveClick;
         this.negativeClick = negativeClick;
         super.show();
     }
     @NonNull
     @Override
     public DialogMessageConfirmBinding getBinding() {
         return DialogMessageConfirmBinding.inflate(getLayoutInflater());
     }
     public static class Builder {
         public Builder(Context context) {
             this.context = context;
         }
         private Context context;
         private CharSequence title = "温馨提示";
         private CharSequence message = "";
         private CharSequence positive = "确定";
         private CharSequence negative = "取消";
         private Function10<Boolean> positiveClick = () -> true;
         private Function10<Boolean> negativeClick = () -> true;
         public Builder setTitle(CharSequence title) {
             this.title = title;
             return this;
         }
         public Builder setMessage(CharSequence message) {
             this.message = message;
             return this;
         }
         public Builder setPositive(CharSequence positive) {
             this.positive = positive;
             return this;
         }
         public Builder setNegative(CharSequence negative) {
             this.negative = negative;
             return this;
         }
         public Builder setPositiveClick(Function10<Boolean> positiveClick) {
             this.positiveClick = positiveClick;
             return this;
         }
         public Builder setNegativeClick(Function10<Boolean> negativeClick) {
             this.negativeClick = negativeClick;
             return this;
         }
         public MsgConfirmDialog build() {
             return new MsgConfirmDialog(this);
         }
     }
 }

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

Diff comments View file @216ca52

 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     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:layout_width="match_parent"
     android:layout_height="match_parent">
     <LinearLayout
         android:orientation="vertical"
         android:background="@drawable/shape_radius_10"
         android:backgroundTint="@color/white"
         android:layout_gravity="center"
         android:layout_width="280dp"
         android:layout_height="wrap_content">
         <TextView
             android:id="@+id/tvTitle"
             tools:text="温馨提示"
             android:textSize="18sp"
             android:textColor="#333"
             android:textStyle="bold"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="20dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
         <TextView
             android:id="@+id/tvMessage"
             tools:text="确认要删除吗？一旦删除不可恢复"
             android:textSize="14sp"
             android:textColor="#333"
             android:gravity="center"
             android:layout_marginHorizontal="15dp"
             android:layout_marginTop="16dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
         <View
             android:background="#EEE"
             android:layout_marginHorizontal="10dp"
             android:layout_marginTop="26dp"
             android:layout_width="match_parent"
             android:layout_height="1dp"/>
         <LinearLayout
             android:orientation="horizontal"
-            android:weightSum="2"
             android:layout_width="match_parent"
             android:layout_height="44dp">
             <TextView
                 android:id="@+id/btnNegative"
                 tools:text="取消"
                 android:textSize="17sp"
                 android:textColor="#999"
                 android:textStyle="bold"
                 android:gravity="center"
                 android:layout_weight="1"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"/>
             <View
                 android:background="#EEE"
                 android:layout_marginVertical="3dp"
                 android:layout_width="1dp"
+                android:layout_marginStart="1dp"
                 android:layout_height="match_parent"/>
             <TextView
                 android:id="@+id/btnPositive"
                 tools:text="确定"
                 android:textSize="17sp"
                 android:textColor="#1C90F3"
                 android:textStyle="bold"
                 android:gravity="center"
                 android:layout_weight="1"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"/>
         </LinearLayout>
     </LinearLayout>