zhanghaochen / ParentControl

Browse Code »

Commit 25e17c06b185875e09fa06706129c6286f6a81f5

Authored by shixianjie 2025-08-05 11:36:52 +0800

1 parent f536f83fe3

Exists in master

批改后录入错题

Showing 6 changed files with 92 additions and 8 deletions Show diff stats

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

Diff comments View file @25e17c0

 package com.hjx.parent;
 import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.MediaStore;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import androidx.annotation.Nullable;
 import androidx.core.content.FileProvider;
 import androidx.viewpager2.widget.ViewPager2;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.hjx.parent.adapter.ImageAdapter;
 import com.hjx.parent.databinding.ActivityImageBinding;
 import com.hjx.parent.databinding.ItemImageBinding;
 import com.hjx.parent.dialog.AddHomeworkDialog;
 import com.hjx.parent.dialog.ErrorInputDialog;
 import com.hjx.parent.dialog.PhotoViewDialog;
 import com.hjx.parent.dialog.TipDialog;
 import com.hjx.parent.rx.BaseRxActivity;
 import com.hjx.parent.utils.CutUtil;
 import com.prws.common.bean.CutPicBean;
 import com.prws.common.bean.ImageBean;
 import com.prws.common.bean.TopicBean;
 import com.prws.common.net.NetWorks;
 import com.prws.common.utils.BitmapUtils;
 import com.prws.common.utils.CommonUtil;
 import com.xiasuhuei321.loadingdialog.view.LoadingDialog;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import io.reactivex.Observer;
 import io.reactivex.Single;
 import io.reactivex.disposables.Disposable;
 public class ImageActivity extends BaseRxActivity<ActivityImageBinding> implements View.OnClickListener {
     private final List<String> images = new ArrayList<>();
     private ImageAdapter imageAdapter;
     private List<ImageBean> list = new ArrayList<>();
     private String filePath;
     private int type = 0;
     private AddHomeworkDialog addHomeworkDialog;
     @SuppressLint("CheckResult")
     @Override
     public void initView(Bundle savedInstanceState) {
         type = getIntent().getIntExtra("type", 0);
         binding.tvSave.setText(type == 0 ? "保存错题" : "录入题目");
         List<String> originList = getIntent().getStringArrayListExtra("images");
         List<String> originListFinal = originList == null ? new ArrayList<>() : originList;
         Single.fromCallable(() -> CutUtil.compressAllSync(this, originListFinal, 200))
                 .map(it -> it.stream().map(File::getAbsolutePath).collect(Collectors.toList()))
                 .compose(transformSingle())
                 .subscribe((it, throwable) -> {
                     if (throwable != null) Log.e(getClass().getName(), "", throwable);
                     images.clear();
                     if (it == null) {
                         images.addAll(originListFinal);
                     } else {
                         images.addAll(it);
                     }
                     start();
                 });
     }
     private void start() {
         if (images == null || images.size() <= 1) {
             binding.rlPrevious.setVisibility(View.GONE);
             binding.rlNext.setVisibility(View.GONE);
         }
         for (String s : images) {
             String filepath = context.getExternalFilesDir("images").getPath() + "/" + System.currentTimeMillis() + CommonUtil.getStr() + ".jpg";
             ImageBean imageBean = new ImageBean();
             Bitmap bitmap = BitmapUtils.getimage(s);
             CommonUtil.saveBitmapToUri(bitmap, filepath);
             imageBean.setPath(filepath);
             imageBean.source = filepath;
             list.add(imageBean);
         }
         imageAdapter = new ImageAdapter(this, list);
         binding.viewPager.setAdapter(imageAdapter);
         binding.viewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
             @Override
             public void onPageSelected(int position) {
                 if (list.get(position).getCuts() == null) {
                     clearText();
                 }
                 binding.tvTitle.setText((binding.viewPager.getCurrentItem() + 1) + "/" + list.size());
                 if (position == 0) {
                     binding.ivPrevious.setImageResource(R.mipmap.ic_previous_gray);
                 } else {
                     binding.ivPrevious.setImageResource(R.mipmap.ic_previous);
                 }
                 if (position == list.size() - 1) {
                     binding.ivNext.setImageResource(R.mipmap.ic_next_gray);
                 } else {
                     binding.ivNext.setImageResource(R.mipmap.ic_next);
                 }
                 super.onPageSelected(position);
             }
         });
         binding.rlNext.setOnClickListener(this);
         binding.rlPrevious.setOnClickListener(this);
         binding.ivBack.setOnClickListener(this);
         binding.tvPhoto.setOnClickListener(this);
         binding.tvAdd.setOnClickListener(this);
         binding.llEdit.setOnClickListener(this);
         binding.tvSave.setOnClickListener(this);
         binding.btnShowSource.setOnClickListener(v -> {
             if (list.isEmpty()) return;
             ImageBean data = list.get(binding.viewPager.getCurrentItem());
             new PhotoViewDialog(this).show(data.source);
         });
         binding.btnJudge.setVisibility(type == 0 ? View.VISIBLE : View.GONE);
         binding.btnJudge.setOnClickListener(v -> {
             goJudge();
         });
     }
     private void goJudge() {
         if (list.isEmpty()) return;
         int position = binding.viewPager.getCurrentItem();
         ImageBean imageBean = list.get(position);
         Bitmap bitmap = BitmapFactory.decodeFile(imageBean.getPath());
         if (bitmap == null || imageBean.getCuts() == null) {
             showToast("请先框选题目");
             return;
         }
         ItemImageBinding ib = imageAdapter.viewArray.get(position);
         if (ib == null) {
             showToast("出错");
             return;
         }
         View view = ib.ivPic;
         float[] size = CutUtil.measureBitmap(view, bitmap);
         ArrayList<Rect> rects = new ArrayList<>();
         for (ImageBean.Cut cut: imageBean.getCuts()) {
             if (cut.getRect1() == null) continue;
             Rect rectV = cut.getRect1();
             rects.add(getRectB(rectV, bitmap, size));
         }
         if (list.isEmpty()) {
             showToast("请先框选题目");
             return;
         }
         Intent intent = new Intent(this, JudgeActivity.class);
         intent.putExtra("path", imageBean.getPath());
         intent.putParcelableArrayListExtra("rects", rects);
         startActivity(intent);
     }
     private Rect getRectB(Rect rectV, Bitmap bitmap, float[] measuredSize) {
         float realW = measuredSize[0];
         float realH = measuredSize[1];
         float offsetX = measuredSize[2];
         float offsetY = measuredSize[3];
         float percentX = bitmap.getWidth() / realW;
         float percentY = bitmap.getHeight() / realH;
         float left = (rectV.left - offsetX) * percentX;
         float right = (rectV.right - offsetX) * percentX;
         float top = (rectV.top - offsetY) * percentY;
         float bottom = (rectV.bottom - offsetY) * percentY;
         Rect rectB = new Rect((int) left, (int) top, (int) right, (int) bottom);
         return rectB;
     }
     public void clearText() {
         int index = binding.viewPager.getCurrentItem();
         showLoadingDialog(getString(R.string.loading_text), new LoadingDialog.DismissListener() {
             @Override
             public void dimiss() {
 //                binding.ivPrevious.setEnabled(index != 0);
 //                binding.ivNext.setEnabled(index != list.size() - 1);
             }
         });
         Log.i("clearText", list.get(index).getPath());
         String base64 = BitmapUtils.imageToBase64(list.get(index).getPath(), false);
         NetWorks.baiduEnhance(base64, new Observer<JsonObject>() {
             @Override
             public void onSubscribe(Disposable d) {
             }
             @Override
             public void onNext(JsonObject jsonObject) {
                 if (jsonObject != null && jsonObject.get("image_processed") != null) {
                     String image = jsonObject.get("image_processed").getAsString();
                     if (image != null) {
                         String filepath = context.getExternalFilesDir("images").getPath() + "/" + String.valueOf(System.currentTimeMillis()) + CommonUtil.getStr() + ".jpg";
                         CommonUtil.saveBitmapToUri(BitmapUtils.stringToBitmap(image), filepath);
                         list.get(index).setPath(filepath);
                         if (list.get(index).getCuts() == null) {
                             list.get(index).setCuts(new ArrayList<>());
                         }
                         imageAdapter.notifyItemChanged(index);
                         cut(filepath);
                     } else {
                         loadFail("去除字迹失败");
                     }
                 } else {
                     loadFail("去除字迹失败");
                 }
             }
             @Override
             public void onError(Throwable e) {
                 e.printStackTrace();
                 loadFail("去除字迹失败");
             }
             @Override
             public void onComplete() {
             }
         });
     }
     public void cut(String path) {
         String base64 = BitmapUtils.imageToBase64WithUrlEncode(path);
         Log.i("figLoaction", path);
         NetWorks.cut(base64, new Observer<CutPicBean>() {
             @Override
             public void onSubscribe(Disposable d) {
             }
             @Override
             public void onNext(CutPicBean cutPicBean) {
                 if (cutPicBean != null) {
                     if (cutPicBean.getDirection() != 0) {
                         rotatingImage(cutPicBean);
                     } else {
                         if (cutPicBean.getQus_figure() != null && cutPicBean.getQus_figure().size() > 0) {
                             List<CutPicBean.FigLoaction> figLoactions = new ArrayList<>();
                             for (CutPicBean.CutLocation cutLocation : cutPicBean.getQus_figure()) {
                                 figLoactions.add(cutLocation.getFig_location());
                             }
                             new Handler().postDelayed(new Runnable() {
                                 @Override
                                 public void run() {
                                     getRects(figLoactions);
                                 }
                             }, 1000);
                         } else {
                             cancelLoadingDialog();
                         }
                     }
                 } else {
                     loadFail("自动切题失败");
                 }
             }
             @Override
             public void onError(Throwable e) {
                 loadFail("自动切题失败");
             }
             @Override
             public void onComplete() {
             }
         });
     }
     private void getRects(List<CutPicBean.FigLoaction> figLoactions) {
         Log.i("figLoaction", new Gson().toJson(figLoactions));
         int index = binding.viewPager.getCurrentItem();
         List<ImageBean.Cut> cuts = new ArrayList<>();
         for (CutPicBean.FigLoaction figLoaction : figLoactions) {
             ImageBean.Cut cut = new ImageBean.Cut();
             cut.setRect(figLoaction);
             cut.setSelect(false);
             cuts.add(cut);
         }
         list.get(index).setCuts(cuts);
         imageAdapter.notifyItemChanged(index);
         cancelLoadingDialog();
     }
     private void rotatingImage(CutPicBean cutPicBean) {
         int index = binding.viewPager.getCurrentItem();
         Bitmap bitmap = BitmapFactory.decodeFile(list.get(index).getPath());
         int angle = 0;
         switch (cutPicBean.getDirection()) {
             case 1:
                 angle = 90;
                 break;
             case 2:
                 angle = 180;
                 break;
             case 3:
                 angle = 270;
                 break;
         }
         if (cutPicBean.getQus_figure() != null && cutPicBean.getQus_figure().size() > 0) {
             List<CutPicBean.FigLoaction> figLoactions = new ArrayList<>();
             for (CutPicBean.CutLocation cutLocation : cutPicBean.getQus_figure()) {
                 figLoactions.add(cutLocation.getFig_location());
             }
             figLoactions = CommonUtil.rotaingLocation(angle, figLoactions, bitmap.getWidth(), bitmap.getHeight());
             bitmap = CommonUtil.rotaingImageView(angle, bitmap);
             String filepath = context.getExternalFilesDir("images").getPath() + "/" + String.valueOf(System.currentTimeMillis()) + CommonUtil.getStr() + ".jpg";
             CommonUtil.saveBitmapToUri(bitmap, filepath);
             list.get(index).setPath(filepath);
             imageAdapter.notifyItemChanged(index);
             List<CutPicBean.FigLoaction> finalFigLoactions = figLoactions;
             new Handler().postDelayed(new Runnable() {
                 @Override
                 public void run() {
                     getRects(finalFigLoactions);
                 }
             }, 500);
         } else {
             cancelLoadingDialog();
         }
     }
     @Override
     protected ActivityImageBinding getViewBinding() {
         return ActivityImageBinding.inflate(getLayoutInflater());
     }
     @SuppressLint("SetTextI18n")
     public void refreshNum() {
         int num = 0;
         for (ImageBean imageBean : list) {
             if (imageBean.getCuts() != null && imageBean.getCuts().size() > 0) {
                 for (ImageBean.Cut cut : imageBean.getCuts()) {
                     if (cut.isSelect()) {
                         num++;
                     }
                 }
             }
         }
         String btnText = type == 0 ? "保存错题" : "录入题目";
         if (num > 0) {
             binding.tvSave.setEnabled(true);
             binding.tvSave.setBackgroundResource(R.drawable.bg_soild_blue_5);
             binding.tvSave.setText(btnText + "(" + num + ")");
         } else {
             binding.tvSave.setEnabled(false);
             binding.tvSave.setBackgroundResource(R.drawable.bg_soild_blue_light_5);
             binding.tvSave.setText(btnText);
         }
     }
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.iv_back:
                 back();
                 break;
             case R.id.rl_next:
                 if (binding.viewPager.getCurrentItem() + 1 < list.size()) {
                     binding.viewPager.setCurrentItem(binding.viewPager.getCurrentItem() + 1);
                 }
                 break;
             case R.id.rl_previous:
                 if (binding.viewPager.getCurrentItem() != 0) {
                     binding.viewPager.setCurrentItem(binding.viewPager.getCurrentItem() - 1);
                 }
                 break;
             case R.id.ll_edit:
                 Intent intent = new Intent(context, ImageEditActivity.class);
                 intent.putExtra("path", list.get(binding.viewPager.getCurrentItem()).getPath());
                 startActivityForResult(intent, 1001);
                 break;
             case R.id.tv_photo:
                 Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
                 //确保有相机来处理Intent
                 filePath = context.getExternalFilesDir("images").getPath() + "/" + String.valueOf(System.currentTimeMillis()) + CommonUtil.getStr() + ".jpg";
                 File photoFile = new File(filePath);
                 if (photoFile != null) {
                     //适配Android 7.0文件权限，通过FileProvider创建一个content类型的Uri
                     Uri photoUri = FileProvider.getUriForFile(activity, "com.hjx.parent.fileprovider", photoFile);
                     takePictureIntent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
                     takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoUri);
                     activity.startActivityForResult(takePictureIntent, 1002);
                 }
                 break;
             case R.id.tv_add:
                 Intent intent1 = new Intent(context, ImageSelectActivity.class);
                 intent1.putExtra("path", list.get(binding.viewPager.getCurrentItem()).getPath());
                 intent1.putExtra("source", list.get(binding.viewPager.getCurrentItem()).source);
                 startActivityForResult(intent1, 1001);
                 break;
             case R.id.tv_save:
                 List<TopicBean> topicBeans = new ArrayList<>();
                 for (ImageBean imageBean : list) {
                     if (imageBean.getCuts() != null && imageBean.getCuts().size() > 0) {
                         for (ImageBean.Cut cut : imageBean.getCuts()) {
                             if (cut.isSelect()) {
                                 TopicBean bean = new TopicBean();
                                 String path = context.getExternalFilesDir("images").getPath() + "/" + String.valueOf(System.currentTimeMillis()) + CommonUtil.getStr() + ".jpg";
                                 BitmapUtils.saveBitmap(cut.getBitmap(), path);
                                 bean.setPath(path);
                                 topicBeans.add(bean);
                             }
                         }
                     }
                 }
                 save(topicBeans);
                 break;
         }
     }
     private void save(List<TopicBean> topicBeans) {
         if (type == 0) {
             ErrorInputDialog dialog = new ErrorInputDialog(this, topicBeans);
-            dialog.show();
+            dialog.show(() -> {
+                Intent intent = new Intent(this, AddSuccessActivity.class);
+                startActivity(intent);
+                finish();
+            });
         } else {
             List<String> paths = new ArrayList<>();
             for (TopicBean it: topicBeans) {
                 paths.add(it.getPath());
             }
             if (addHomeworkDialog == null) {
                 addHomeworkDialog = new AddHomeworkDialog(this);
             }
             addHomeworkDialog.show(paths, student -> {
                 Intent intent = new Intent(context, AddSuccessActivity.class);
                 intent.putExtra("type", type);
                 intent.putExtra("studentJson", new Gson().toJson(student));
                 startActivity(intent);
                 finish();
             });
         }
     }
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == 1001) {
             if (resultCode == 1002) {
                 if (list.size() > 1) {
                     list.remove(binding.viewPager.getCurrentItem());
                     if (list.size() <= 1) {
                         binding.rlPrevious.setVisibility(View.GONE);
                         binding.rlNext.setVisibility(View.GONE);
                     }
                     imageAdapter.notifyItemRemoved(binding.viewPager.getCurrentItem());
                     binding.tvTitle.setText((binding.viewPager.getCurrentItem() + 1) + "/" + list.size());
                     refreshNum();
                 } else {
                     finish();
                 }
             } else if (resultCode == 1003) {
                 int position = binding.viewPager.getCurrentItem();
                 String src = list.get(position).source;
                 list.remove(position);
                 String path = data.getStringExtra("path");
                 ImageBean imageBean = new ImageBean();
                 imageBean.setPath(path);
                 imageBean.source = src;
                 list.add(position, imageBean);
                 imageAdapter.notifyItemChanged(position);
                 clearText();
                 refreshNum();
             } else if (resultCode == 1004) {
                 Rect rect = data.getParcelableExtra("cut");
                 if (rect != null) {
                     int position = binding.viewPager.getCurrentItem();
                     ImageBean.Cut cut = new ImageBean.Cut();
                     cut.setRect1(rect);
                     cut.setSelect(false);
                     if (list.get(position).getCuts() != null) {
                         list.get(position).getCuts().add(cut);
                     } else {
                         List<ImageBean.Cut> cuts =new ArrayList<>();
                         cuts.add(cut);
                         list.get(position).setCuts(cuts);
                     }
                     imageAdapter.notifyItemChanged(position);
                     refreshNum();
                 }
             } else if (resultCode == 1005) {
                 int i = data.getIntExtra("position", 0);
                 int position = binding.viewPager.getCurrentItem();
                 Rect rect = data.getParcelableExtra("cut");
                 if (rect != null) {
                     ImageBean.Cut cut = new ImageBean.Cut();
                     cut.setRect1(rect);
                     cut.setSelect(false);
                     list.get(position).getCuts().remove(i);
                     list.get(position).getCuts().add(i, cut);
                     imageAdapter.notifyItemChanged(position);
                     refreshNum();
                 } else {
                     list.get(position).getCuts().remove(i);
                     imageAdapter.notifyItemChanged(position);
                     refreshNum();
                 }
             }
         } else if (requestCode == 1002 && resultCode == RESULT_OK && !TextUtils.isEmpty(filePath)) {
             Bitmap b = BitmapUtils.compress(BitmapFactory.decodeFile(filePath));
             String path = context.getExternalFilesDir("images").getPath() + "/" + String.valueOf(System.currentTimeMillis()) + CommonUtil.getStr() + ".jpg";
             CommonUtil.saveBitmapToUri(b, path);
             int position = binding.viewPager.getCurrentItem();
             list.remove(position);
             ImageBean imageBean = new ImageBean();
             imageBean.setPath(path);
             imageBean.source = path;
             list.add(position, imageBean);
             imageAdapter.notifyItemChanged(position);
             clearText();
             refreshNum();
         }
     }
     private void back() {
         showTipDialog("温馨提示", "是否确认退出？", "取消", "确定", new TipDialog.TipDialogInterface() {
             @Override
             public void onConfirm(Dialog dialog) {
                 dialog.dismiss();
                 finish();
             }
             @Override
             public void onCancel(Dialog dialog) {
                 dialog.dismiss();
             }
         });
     }
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK) {
             back();
             return true;
         }
         return super.onKeyDown(keyCode, event);
     }
 }

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

Diff comments View file @25e17c0

 package com.hjx.parent;
 import android.annotation.SuppressLint;
+import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.util.Log;
 import com.bumptech.glide.Glide;
 import com.hjx.parent.api.JudgeRepository;
 import com.hjx.parent.databinding.ActivityJudgeBinding;
 import com.hjx.parent.databinding.LayoutJudgeRectBinding;
+import com.hjx.parent.dialog.ErrorInputDialog;
 import com.hjx.parent.rx.BaseRxActivity;
 import com.hjx.parent.utils.CutUtil;
+import com.prws.common.bean.TopicBean;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 import io.reactivex.Observable;
 import io.reactivex.Single;
 import top.zibin.luban.Luban;
 public class JudgeActivity extends BaseRxActivity<ActivityJudgeBinding> {
     private Bitmap bitmap;
     private final List<JudgeCut> mList = new ArrayList<>();
     @SuppressLint("CheckResult")
     @Override
     public void initView(Bundle savedInstanceState) {
         binding.ivBack.setOnClickListener(v -> {
             onBackPressed();
         });
         String path = getIntent().getStringExtra("path");
         if (path == null) return;
         final ArrayList<Rect> rects = getIntent().getParcelableArrayListExtra("rects");
         if (rects == null) return;
         Single.just(path)
                 .map(origin -> Luban.with(this).load(origin).ignoreBy(300).get().get(0))
                 .map(file -> Glide.with(this).asBitmap().load(file).submit().get())
                 .compose(transformSingle())
                 .subscribe((bitmap, th) -> {
                     if (th != null) th.printStackTrace();
                     if (bitmap == null) return;
                     this.bitmap = bitmap;
                     binding.ivPic.setImageBitmap(bitmap);
                     CutUtil.onLayoutReady(binding.ivPic, v -> {
                         prepareRects(rects);
                     });
                 });
         binding.btnSelectAll.setOnClickListener(v -> {
             if (mList.isEmpty()) return;
             mList.forEach(it -> it.vb.getRoot().setSelected(true));
             checkCount();
         });
+        binding.btnAdd.setOnClickListener(v -> {
+            if (mList.isEmpty()) return;
+            List<TopicBean> selected = mList.stream()
+                    .filter(it -> it.vb.getRoot().isSelected())
+                    .map(it -> {
+                        TopicBean bean = new TopicBean();
+                        bean.setPath(it.getPath());
+                        return bean;
+                    })
+                    .collect(Collectors.toList());
+            ErrorInputDialog dialog = new ErrorInputDialog(this, selected);
+            dialog.show(() -> {
+                showToast("已加入错题本");
+                finish();
+            });
+        });
     }
     private void prepareRects(List<Rect> rects) {
         mList.clear();
         binding.flRects.removeAllViews();
         float[] measuredSize = CutUtil.measureBitmap(binding.ivPic, bitmap);
         for (int i = 0; i < rects.size(); i++) {
             Rect it = rects.get(i);
             Bitmap bitmap = CutUtil.cut(this.bitmap, it.left, it.top, it.width(), it.height(), this);
             Rect rect = measureRect(it, measuredSize);
             LayoutJudgeRectBinding vb = showRect(rect);
             mList.add(new JudgeCut(i, bitmap, rect, vb));
         }
         judge();
     }
     @SuppressLint("CheckResult")
     private void judge() {
         showLoadingDialog("");
         Observable.fromIterable(mList)
                 .map(it -> {
                     if (it.url != null && !it.url.isEmpty()) return it;
                     String base64 = CutUtil.bitmapToBase64(it.bitmap, true);
                     it.url = base64;
                     return it;
                 })
                 .flatMap(it -> JudgeRepository.singleJudge(it.url)
                         .map(result -> {
                             it.correctResult = result;
                             return it;
                         })
                         .toObservable()
                 )
                 .compose(transform())
                 .subscribe(it -> {
                     if (it.correctResult == 1) {
                         it.vb.ivResult.setImageResource(R.drawable.png_ic_judge_correct);
                     } else if (it.correctResult == 2) {
                         it.vb.ivResult.setImageResource(R.drawable.png_ic_judge_wrong);
                     }
                     it.vb.getRoot().setSelected(it.correctResult != 1);
                     checkCount();
                 }, th -> {
                     cancelLoadingDialog();
                     Log.e(getClass().getName(), "", th);
                 }, this::cancelLoadingDialog)
         ;
     }
     private LayoutJudgeRectBinding showRect(Rect rect) {
         LayoutJudgeRectBinding vb = LayoutJudgeRectBinding.inflate(getLayoutInflater(), binding.flRects, false);
         vb.getRoot().setMinimumWidth(rect.width());
         vb.getRoot().setMinimumHeight(rect.height());
         vb.getRoot().setTranslationX((float) rect.left);
         vb.getRoot().setTranslationY((float) rect.top);
         vb.getRoot().setOnClickListener(v -> {
             v.setSelected(!v.isSelected());
             checkCount();
         });
         binding.flRects.addView(vb.getRoot());
         return vb;
     }
     @SuppressLint("SetTextI18n")
     private void checkCount() {
         int count = (int) mList.stream().filter(it -> it.vb.getRoot().isSelected()).count();
         if (count == 0) binding.btnAdd.setText("加入错题");
         else binding.btnAdd.setText("加入错题(" + count + ")");
         binding.btnAdd.setEnabled(count > 0);
     }
     /** bitmapRect 转换为 viewRect */
     private Rect measureRect(Rect rect, float[] measuredSize) {
         float realW = measuredSize[0];
         float realH = measuredSize[1];
         float offsetX = measuredSize[2];
         float offsetY = measuredSize[3];
         float percentX = realW / bitmap.getWidth();
         float percentY = realH / bitmap.getHeight();
         float left = rect.left * percentX + offsetX;
         float right = rect.right * percentX + offsetX;
         float top = rect.top * percentY + offsetY;
         float bottom = rect.bottom * percentY + offsetY;
         return new Rect((int) left, (int) top, (int) right, (int) bottom);
     }
     @Override
     protected ActivityJudgeBinding getViewBinding() {
         return ActivityJudgeBinding.inflate(getLayoutInflater());
     }
     static class JudgeCut {
         final int index;
         final Bitmap bitmap;
         final Rect rect;
         final LayoutJudgeRectBinding vb;
         String url;
         /** 0：未批改；1：正确；2：错误；3：未作答  */
         int correctResult = 0;
         public JudgeCut(int index, Bitmap bitmap, Rect rect, LayoutJudgeRectBinding vb) {
             this.index = index;
             this.bitmap = bitmap;
             this.rect = rect;
             this.vb = vb;
         }
+        private String path;
+        public String getPath() {
+            if (path != null) return path;
+            path = CutUtil.saveBitmapToCache(bitmap, App.getInstance());
+            return path;
+        }
     }
 }

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

Diff comments View file @25e17c0

 package com.hjx.parent.dialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.Gravity;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.CompoundButton;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.bumptech.glide.Glide;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.google.gson.Gson;
 import com.hjx.parent.AddSuccessActivity;
 import com.hjx.parent.App;
 import com.hjx.parent.ImageActivity;
 import com.hjx.parent.R;
 import com.hjx.parent.bean.StudentBean;
 import com.hjx.parent.databinding.DialogAddErrorBinding;
+import com.hjx.parent.function.Function0;
 import com.prws.common.bean.Grade;
 import com.prws.common.bean.GradeAndSubject;
 import com.prws.common.bean.ResponseResult;
 import com.prws.common.bean.Subject;
 import com.prws.common.bean.TopicBean;
 import com.prws.common.net.NetWorks;
 import com.prws.common.utils.CommonUtil;
 import com.prws.common.utils.LogUtil;
 import com.prws.common.utils.SharedPreferencesUtil;
 import com.prws.common.utils.StringUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import io.reactivex.Observer;
 import io.reactivex.disposables.Disposable;
 import okhttp3.ResponseBody;
 public class ErrorInputDialog extends Dialog {
-    private ImageActivity context;
+    private FragmentActivity context;
     private DialogAddErrorBinding binding;
     private List<TopicBean> list;
     private int select = 0;
     private Grade grade;
     private String term;
     private Subject subject;
     private int reason;
     private int type = 0;
     BaseQuickAdapter adapter;
-    public ErrorInputDialog(@NonNull ImageActivity context, List<TopicBean> list) {
+    private Function0 function = () -> {};
+    public void show(Function0 callback) {
+        this.function = callback;
+        super.show();
+    }
+    public ErrorInputDialog(@NonNull FragmentActivity context, List<TopicBean> list) {
         super(context, R.style.MyAlertDialog);
         this.context = context;
         this.list = list;
     }
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         binding = DialogAddErrorBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         Window dialogWindow = getWindow();
         WindowManager.LayoutParams lp = dialogWindow.getAttributes();
         lp.width = CommonUtil.getScreenWidth(getContext());
         dialogWindow.setGravity(Gravity.BOTTOM);
         dialogWindow.setAttributes(lp);
         adapter = new BaseQuickAdapter(R.layout.item_topic, list) {
             @Override
             protected void convert(@NonNull BaseViewHolder item, Object o) {
                 int position = item.getAdapterPosition();
                 item.setText(R.id.tv_name, context.getString(R.string.num_topic, StringUtils.intToChinese(position + 1)));
                 if (list.get(position).isFinish()) {
                     item.setGone(R.id.iv_click, true);
                     item.setBackgroundRes(R.id.tv_name, R.drawable.topic_finish_bg);
                     item.setTextColor(R.id.tv_name, Color.parseColor("#1C90F3"));
                 } else if (select == position) {
                     item.setGone(R.id.iv_click, false);
                     item.setBackgroundRes(R.id.tv_name, R.drawable.button_select_topic_bg);
                     item.setTextColor(R.id.tv_name, Color.parseColor("#1C90F3"));
                 } else {
                     item.setGone(R.id.iv_click, false);
                     item.setBackgroundRes(R.id.tv_name, R.drawable.button_topic_bg);
                     item.setTextColor(R.id.tv_name, Color.parseColor("#999999"));
                 }
                 item.getConvertView().setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
                         select = position;
                         loadError();
                         notifyDataSetChanged();
                     }
                 });
             }
             @Override
             public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
             }
         };
         binding.listItem.setLayoutManager(new LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false));
         binding.listItem.setAdapter(adapter);
         List<String> grades = new ArrayList<>();
         for (GradeAndSubject grade : App.getInstance().getGradeAndSubjects()) {
             grades.add(grade.getGrade().getGrade());
         }
         ArrayAdapter<String> gradeAdapter = new ArrayAdapter<>(context, R.layout.item_for_custom_spinner, grades);
         binding.spinnerGrade.setAdapter(gradeAdapter);
         binding.spinnerGrade.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 grade = App.getInstance().getGradeAndSubjects().get(position).getGrade();
                 refreshSubject(App.getInstance().getGradeAndSubjects().get(position).getSubjects());
             }
             @Override
             public void onNothingSelected(AdapterView<?> parent) {
             }
         });
         ArrayAdapter<String> gradeAdapter1 = new ArrayAdapter<>(context, R.layout.item_for_custom_spinner, getContext().getResources().getStringArray(R.array.grade_array));
         binding.spinnerGrade1.setAdapter(gradeAdapter1);
         binding.spinnerGrade1.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 term = getContext().getResources().getStringArray(R.array.grade_array)[position];
             }
             @Override
             public void onNothingSelected(AdapterView<?> parent) {
             }
         });
         ArrayAdapter<String> reasonAdapter = new ArrayAdapter<>(context, R.layout.item_for_custom_spinner, context.getResources().getStringArray(R.array.error_reason));
         binding.spinnerReason.setAdapter(reasonAdapter);
         binding.spinnerReason.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 reason = position;
             }
             @Override
             public void onNothingSelected(AdapterView<?> parent) {
             }
         });
         RadioButton typeButton = (RadioButton) binding.typeRadio.getChildAt(type);
         typeButton.setChecked(true);
         binding.typeRadio.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(RadioGroup group, int checkedId) {
                 RadioButton rcheck = (RadioButton) findViewById(checkedId);
                 type = getContext().getString(R.string.topic_type_in).equals(rcheck.getText().toString()) ? 0 : 1;
                 list.get(select).setType(type);
             }
         });
         binding.ivBack.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 dismiss();
             }
         });
         binding.checkbox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 if (isChecked) {
                     binding.addTopic.setText("全部加入错题本");
                 } else {
                     binding.addTopic.setText("第" + StringUtils.intToChinese(select + 1) + "题加入错题本");
                 }
             }
         });
         binding.addTopic.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (binding.checkbox.isChecked()) {
                     for (TopicBean topicBean : list) {
                         addTopic(topicBean);
                     }
                 } else {
                     addTopic(list.get(select));
                 }
             }
         });
         loadError();
     }
     private void refreshSubject(List<Subject> subjects) {
         List<String> s = new ArrayList<>();
         for (Subject subject : subjects) {
             s.add(subject.getSubject());
         }
         ArrayAdapter<String> subjectAdapter = new ArrayAdapter<>(context, R.layout.item_for_custom_spinner, s);
         binding.spinnerSubject.setAdapter(subjectAdapter);
         binding.spinnerSubject.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 subject = subjects.get(position);
             }
             @Override
             public void onNothingSelected(AdapterView<?> parent) {
             }
         });
     }
     private void loadError() {
         TopicBean bean = list.get(select);
         Glide.with(getContext()).load(bean.getPath()).override(CommonUtil.getScreenWidth(context) - CommonUtil.dpToPx(getContext(), 40), CommonUtil.dpToPx(getContext(), 90)).fitCenter().into(binding.ivTopic);
         if (!binding.checkbox.isChecked()) {
             binding.addTopic.setText("第" + StringUtils.intToChinese(select + 1) + "题加入错题本");
         }
     }
     private void addTopic(TopicBean bean) {
         if (!bean.isFinish()) {
             bean.setId(String.valueOf(System.currentTimeMillis()));
             bean.setDate(String.valueOf(System.currentTimeMillis()));
             bean.setGrade(grade.getGrade());
             bean.setType(type);
             bean.setSubject(subject.getSubject());
             String student = (String) SharedPreferencesUtil.getData("student", "");
             StudentBean studentBean = new Gson().fromJson(student, StudentBean.class);
             Map<String, String> param = new HashMap<>();
             param.put("bookId", bean.getId());
             param.put("stuId", studentBean.getStuId());
             param.put("errorReason", String.valueOf(reason));
             param.put("title", grade.getGrade() + "-" + subject.getSubject() + "-" + (type == 0 ? "课内" : "课外") + "错题");
             param.put("subject", bean.getSubject());
             param.put("grade", bean.getGrade() + term);
             param.put("type", String.valueOf(bean.getType()));
             param.put("teacherFlag", "0");
             param.put("controlFlag", "1");
             NetWorks.addError(bean.getPath(), param, new Observer<ResponseResult>() {
                 @Override
                 public void onSubscribe(Disposable d) {
                 }
                 @Override
                 public void onNext(ResponseResult responseResult) {
                     if (responseResult.getCode() == 200) {
                         bean.setFinish(true);
                         boolean isAllAdd = true;
                         for (int i = 0; i < list.size(); i++) {
                             if (!list.get(i).isFinish()) {
                                 select = i;
                                 adapter.notifyDataSetChanged();
                                 isAllAdd = false;
                                 loadError();
                                 break;
                             }
                         }
                         if (isAllAdd) {
                             dismiss();
-                            Intent intent = new Intent(context, AddSuccessActivity.class);
+                            function.invoke();
-                            context.startActivity(intent);
+//                            Intent intent = new Intent(context, AddSuccessActivity.class);
-                            context.finish();
+//                            context.startActivity(intent);
+//                            context.finish();
                         }
                     }
                 }
                 @Override
                 public void onError(Throwable e) {
                 }
                 @Override
                 public void onComplete() {
                 }
             });
         }
     }
 }

app/src/main/java/com/hjx/parent/utils/CutUtil.java

Diff comments View file @25e17c0

 package com.hjx.parent.utils;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.util.Base64;
 import android.view.View;
 import android.view.ViewTreeObserver;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.hjx.parent.function.Function1;
+import com.prws.common.utils.CommonUtil;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.List;
 import top.zibin.luban.Luban;
 public class CutUtil {
     public static float[] measureBitmap(View view, Bitmap bitmap) {
         float realW;
         float realH;
         float offsetX;
         float offsetY;
         float vp = 1f * view.getWidth() / view.getHeight();
         float bp = 1f * bitmap.getWidth() / bitmap.getHeight();
         if (vp > bp) {
             realW = view.getHeight() * bp;
             realH = (float) view.getHeight();
             offsetY = 0f;
             offsetX = (view.getWidth() - realW) * 0.5f;
         } else if (vp < bp) {
             realW = (float) view.getWidth();
             realH = view.getWidth() * (1f / bp);
             offsetX = 0f;
             offsetY = (view.getHeight() - realH) * 0.5f;
         } else {
             realW = (float) view.getWidth();
             realH = (float) view.getHeight();
             offsetX = 0f;
             offsetY = 0f;
         }
         return new float[]{realW, realH, offsetX, offsetY};
     }
     public static Bitmap cut(Bitmap source, float x, float y, int w, int h, Context context) {
         // 获取 Glide 的 BitmapPool
         BitmapPool bitmapPool = Glide.get(context).getBitmapPool();
         // 从 BitmapPool 中获取可复用的 Bitmap
         Bitmap result = bitmapPool.get(w, h, source.getConfig() != null ? source.getConfig() : Bitmap.Config.ARGB_8888);
         // 填充白色背景
         result.eraseColor(Color.WHITE);
         // 创建画布并绘制
         Canvas canvas = new Canvas(result);
         Paint paint = new Paint();
         canvas.drawBitmap(source, -x, -y, paint);
         return result;
     }
     public static void onLayoutReady(final View view, final Function1<View> action) {
         view.getViewTreeObserver().addOnGlobalLayoutListener(
                 new ViewTreeObserver.OnGlobalLayoutListener() {
                     @Override
                     public void onGlobalLayout() {
                         view.getViewTreeObserver().removeOnGlobalLayoutListener(this);
                         action.invoke(view);
                     }
                 }
         );
     }
     public static byte[] bitmapToByteArray(Bitmap bitmap) {
         ByteArrayOutputStream output = new ByteArrayOutputStream();
         bitmap.compress(Bitmap.CompressFormat.JPEG, 100, output);
         return output.toByteArray();
     }
     public static String bitmapToBase64(Bitmap bitmap, Boolean usePrefix) {
         String base64 = Base64.encodeToString(bitmapToByteArray(bitmap), Base64.NO_WRAP);
         if (usePrefix) return "data:image/jpeg;base64," + base64;
         else return base64;
     }
     public static List<File> compressAllSync(Context context, List<String> originList, int ignore) throws IOException {
         return Luban.with(context).ignoreBy(ignore)
                 .setTargetDir(context.getExternalCacheDir().getAbsolutePath())
                 .load(originList)
                 .get();
     }
+    public static String saveBitmapToCache(Bitmap bitmap, Context context) {
+        String fileName = System.currentTimeMillis() + CommonUtil.getStr() + ".jpg";
+        String path = context.getExternalCacheDir().getPath() + "/images/" + fileName;
+        try {
+            File file = new File(path);
+            File parent = file.getParentFile();
+            if (parent != null && !parent.exists()) {
+                parent.mkdirs();
+            }
+            FileOutputStream fos = new FileOutputStream(file);
+            boolean success = bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos);
+            fos.flush();
+            fos.close();
+            if (success) {
+                return path;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 }

app/src/main/res/drawable/bg_error_add_enabled.xml

Diff comments View file @25e17c0

File was created	1	<?xml version="1.0" encoding="utf-8"?>
	2	<selector xmlns:android="http://schemas.android.com/apk/res/android">
	3	<item android:state_enabled="false">
	4	<shape>
	5	<corners android:radius="5dp"/>
	6	<solid android:color="#8DC7F9"/>
	7	</shape>
	8	</item>
	9	<item>
	10	<shape>
	11	<corners android:radius="5dp"/>
	12	<solid android:color="#1C90F3"/>
	13	</shape>
	14	</item>
	15	</selector>

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

Diff comments View file @25e17c0

 <?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:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:ignore="UseCompoundDrawables,HardcodedText,SmallSp,ContentDescription">
     <androidx.appcompat.widget.Toolbar
         android:background="@color/white"
         app:contentInsetStart="0dp"
         android:layout_width="match_parent"
         android:layout_height="40dp">
         <ImageView
             android:id="@+id/ivBack"
             android:layout_width="30dp"
             android:layout_height="36dp"
             android:layout_centerVertical="true"
             android:layout_marginStart="5dp"
             android:padding="10dp"
             android:src="@mipmap/icon_back" />
     </androidx.appcompat.widget.Toolbar>
     <FrameLayout
         android:background="@color/white"
         android:padding="8dp"
         android:layout_margin="16dp"
         android:layout_width="match_parent"
         android:layout_height="0px"
         android:layout_weight="1">
         <ImageView
             android:id="@+id/ivPic"
             android:layout_width="match_parent"
             android:layout_height="match_parent"/>
         <FrameLayout
             android:id="@+id/flRects"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
     </FrameLayout>
     <LinearLayout
         android:orientation="horizontal"
         android:gravity="center_vertical"
         android:paddingHorizontal="16dp"
         android:background="@color/white"
         android:layout_width="match_parent"
         android:layout_height="64dp">
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/btnSelectAll"
             android:text="全选"
             android:textSize="16sp"
             android:textColor="#333"
             android:gravity="center_vertical"
             android:paddingHorizontal="8dp"
             android:paddingVertical="4dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
         <Space style="@style/empty_space"/>
         <TextView
             android:id="@+id/btnAdd"
+            android:enabled="false"
             android:text="加入错题"
             android:textSize="16sp"
             android:textColor="@color/white"
             android:gravity="center"
-            android:background="@drawable/shape_radius_5"
+            android:background="@drawable/bg_error_add_enabled"
-            android:backgroundTint="#1C90F3"
             android:layout_width="112dp"
             android:layout_height="36dp"/>
     </LinearLayout>