zhanghaochen / ParentControl

Browse Code »

Commit f536f83fe340c6b8f6f60e36f386113a3684d35c

Authored by shixianjie 2025-08-05 10:54:50 +0800

1 parent 36364a3420

Exists in master

修改统一baidu key, 图片增强代替字迹擦除, 提前压缩图片

Showing 6 changed files with 65 additions and 22 deletions Show diff stats

.idea/inspectionProfiles/Project_Default.xml

Diff comments View file @f536f83

 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="Deprecation" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="IgnoreResultOfCall" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="m_reportAllNonLibraryCalls" value="false" />
       <option name="callCheckString" value="java.io.File,.*,java.io.InputStream,read|skip|available|markSupported,java.io.Reader,read|skip|ready|markSupported,java.lang.AbstractStringBuilder,capacity|codePointAt|codePointBefore|codePointCount|indexOf|lastIndexOf|offsetByCodePoints|substring|subSequence,java.lang.Boolean,.*,java.lang.Byte,.*,java.lang.Character,.*,java.lang.Double,.*,java.lang.Float,.*,java.lang.Integer,.*,java.lang.Long,.*,java.lang.Math,.*,java.lang.Object,equals|hashCode|toString,java.lang.Short,.*,java.lang.StrictMath,.*,java.lang.String,.*,java.lang.Thread,interrupted,java.math.BigDecimal,.*,java.math.BigInteger,.*,java.net.InetAddress,.*,java.net.URI,.*,java.nio.channels.AsynchronousChannelGroup,.*,java.nio.channels.Channel,isOpen,java.nio.channels.FileChannel,open|map|lock|tryLock|write,java.nio.channels.ScatteringByteChannel,read,java.nio.channels.SocketChannel,open|socket|isConnected|isConnectionPending,java.util.Arrays,.*,java.util.Collections,(?!addAll).*,java.util.List,of,java.util.Map,of|ofEntries|entry,java.util.Set,of,java.util.UUID,.*,java.util.concurrent.BlockingQueue,offer|remove,java.util.concurrent.CountDownLatch,await|getCount,java.util.concurrent.ExecutorService,awaitTermination|isShutdown|isTerminated,java.util.concurrent.ForkJoinPool,awaitQuiescence,java.util.concurrent.Semaphore,tryAcquire|availablePermits|isFair|hasQueuedThreads|getQueueLength|getQueuedThreads,java.util.concurrent.locks.Condition,await|awaitNanos|awaitUntil,java.util.concurrent.locks.Lock,tryLock|newCondition,java.util.regex.Matcher,pattern|toMatchResult|start|end|group|groupCount|matches|find|lookingAt|quoteReplacement|replaceAll|replaceFirst|regionStart|regionEnd|hasTransparentBounds|hasAnchoringBounds|hitEnd|requireEnd,java.util.regex.Pattern,.*,java.util.stream.BaseStream,.*,java.util.stream.DoubleStream,.*,java.util.stream.IntStream,.*,java.util.stream.LongStream,.*,java.util.stream.Stream,.*" />
     </inspection_tool>
+    <inspection_tool class="SameReturnValue" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="UnnecessaryLocalVariable" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="m_ignoreImmediatelyReturnedVariables" value="false" />
       <option name="m_ignoreAnnotatedVariables" value="false" />
     </inspection_tool>
   </profile>
 </component>

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

Diff comments View file @f536f83

 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;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
 public class ImageActivity extends BaseRxActivity<ActivityImageBinding> implements View.OnClickListener {
-    private List<String> images = new ArrayList<>();
+    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 ? "保存错题" : "录入题目");
-        images = getIntent().getStringArrayListExtra("images");
+        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) {
-//                    binding.ivPrevious.setEnabled(false);
-//                    binding.ivNext.setEnabled(false);
                     clearText();
                 }
                 binding.tvTitle.setText((binding.viewPager.getCurrentItem() + 1) + "/" + list.size());
                 if (position == 0) {
                     binding.ivPrevious.setImageResource(R.mipmap.ic_previous_gray);
-//                    binding.ivPrevious.setEnabled(true);
                 } else {
                     binding.ivPrevious.setImageResource(R.mipmap.ic_previous);
-//                    binding.ivPrevious.setEnabled(false);
                 }
                 if (position == list.size() - 1) {
                     binding.ivNext.setImageResource(R.mipmap.ic_next_gray);
-//                    binding.ivNext.setEnabled(true);
                 } else {
                     binding.ivNext.setImageResource(R.mipmap.ic_next);
-//                    binding.ivNext.setEnabled(false);
                 }
                 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());
+        String base64 = BitmapUtils.imageToBase64(list.get(index).getPath(), false);
-        NetWorks.removeWriting(base64, new Observer<JsonObject>() {
+        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.imageToBase64(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();
         } 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

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

Diff comments View file @f536f83

 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 java.io.ByteArrayOutputStream;
+import java.io.File;
+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();
+    }
 }

libs/common/build.gradle

Diff comments View file @f536f83

 apply plugin: 'com.android.library'
 def androidId = rootProject.ext.androidId
 def support = rootProject.ext.dependencies
 def url = rootProject.ext.url
 android {
     compileSdkVersion androidId.compileSdkVersion
     defaultConfig {
         minSdkVersion androidId.minSdkVersion
         targetSdkVersion androidId.targetSdkVersion
         versionCode androidId.versionCode
         versionName androidId.versionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        buildConfigField("String", "APIKey1", "\"eCa3YzEjTBBiNjlXcNnjnldP\"")
+        buildConfigField("String", "APIKey", "\"oj9XT8AOeTeLkdqaEX7RJA0N\"")
-        buildConfigField("String", "SecretKey1", "\"KnZPmjF0ZzmxWV964mzmm6yuDljnETLt\"")
+        buildConfigField("String", "SecretKey", "\"AfUFmACkfbd0RMuk11qbw1TW5LtxtJHK\"")
+        buildConfigField("String", "APIKey1", "\"oj9XT8AOeTeLkdqaEX7RJA0N\"")
+        buildConfigField("String", "SecretKey1", "\"AfUFmACkfbd0RMuk11qbw1TW5LtxtJHK\"")
     }
     buildTypes {
         debug {
             minifyEnabled false
             buildConfigField("String", "SERVER_URL", "\"${url.server_url}\"")
-            buildConfigField("String", "APIKey", "\"OmmSqorNFXjVHXlZWhHAyGyQ\"")
-            buildConfigField("String", "SecretKey", "\"Uwjz4XGi89RN4Mvl5mievKpjqpGgUy6D\"")
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         release {
             minifyEnabled false
             buildConfigField("String", "SERVER_URL", "\"${url.server_url_online}\"")
-            buildConfigField("String", "APIKey", "\"OmmSqorNFXjVHXlZWhHAyGyQ\"")
-            buildConfigField("String", "SecretKey", "\"Uwjz4XGi89RN4Mvl5mievKpjqpGgUy6D\"")
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     support.each { k, v -> implementation v }
     // 抓包, OkHttp拦截
     def chuckerVersion = "3.5.2"
     debugImplementation("com.github.chuckerteam.chucker:library:$chuckerVersion") {
         exclude module: 'lifecycle-viewmodel-ktx'
     }
     releaseImplementation("com.github.chuckerteam.chucker:library-no-op:$chuckerVersion") {
         exclude module: 'lifecycle-viewmodel-ktx'
     }
     implementation 'com.jakewharton:butterknife:10.2.3'

libs/common/src/main/java/com/prws/common/net/NetWorks.java

Diff comments View file @f536f83

 package com.prws.common.net;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.prws.common.BuildConfig;
 import com.prws.common.bean.CutPicBean;
 import com.prws.common.bean.GradeAndSubject;
 import com.prws.common.bean.PageInfo;
 import com.prws.common.bean.ResponseResult;
 import com.prws.common.bean.ScheduleBean;
 import com.prws.common.bean.Student;
 import com.prws.common.bean.Teacher;
 import com.prws.common.bean.TopicBean;
 import com.prws.common.bean.UpdateBean;
 import com.prws.common.bean.User;
 import com.prws.common.bean.baidu.BaiduInput;
 import com.prws.common.bean.homework.HomeWork;
 import com.prws.common.bean.homework.HomeworkDetail;
 import com.prws.common.bean.homework.HomeworkList;
 import com.prws.common.bean.homework.StDetail;
 import com.prws.common.utils.BitmapUtils;
 import com.prws.common.utils.SharedPreferencesUtil;
 import java.io.File;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import io.reactivex.Observable;
 import io.reactivex.Observer;
 import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 import okhttp3.MediaType;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Retrofit;
 import retrofit2.http.Body;
 import retrofit2.http.GET;
 import retrofit2.http.Header;
 import retrofit2.http.Headers;
 import retrofit2.http.Multipart;
 import retrofit2.http.POST;
 import retrofit2.http.PUT;
 import retrofit2.http.Part;
 import retrofit2.http.PartMap;
 import retrofit2.http.Query;
 import retrofit2.http.Url;
 /**
  * 类名称：NetWorks
  * 创建人：
  * <p>
  * 类描述：网络请求的操作类
  */
 public class NetWorks extends RetrofitUtils {
     //服务器路径
     public static final Retrofit retrofit = getMachineRetrofit(BuildConfig.SERVER_URL);
     public static final NetService service_url = retrofit.create(NetService.class);
     //设缓存有效期为1天
     protected static final long CACHE_STALE_SEC = 60 * 60 * 24 * 1;
     //查询缓存的Cache-Control设置，使用缓存
     protected static final String CACHE_CONTROL_CACHE = "only-if-cached, max-stale=" + CACHE_STALE_SEC;
     //查询网络的Cache-Control设置。不使用缓存
     protected static final String CACHE_CONTROL_NETWORK = "max-age=0";
     public interface NetService {
         @GET("/api/v1/user/logout")
         Observable<ResponseBody> logout();
         @Multipart
         @POST("/api/v1/user/upLoadAvatar")
         Observable<ResponseBody> upLoadAvatar(@Header("Authorization") String token, @Part List<MultipartBody.Part> partLis);
         @Headers("Content-Type: application/json")
         @POST("/api/v1/user/editUser")
         Observable<ResponseBody> editUser(@Header("Authorization") String token, @Body RequestBody body);
         @Headers("Content-Type: application/json")
         @POST("/api/v1/user/changePassword")
         Observable<ResponseBody> changePassword(@Header("Authorization") String token, @Body RequestBody body);
         @GET("/api/v1/user/searchById")
         Observable<ResponseBody> searchById(@Header("Authorization") String token, @Query("userId") String userId);
         @Headers("Content-Type: application/json")
         @POST("/api/v1/login/userLogin")
         Observable<ResponseBody> login(@Body RequestBody body);
         @GET("/api/v1/resource/listGradeAndSubject")
         Observable<ResponseResult<List<GradeAndSubject>>> listGradeAndSubject(@Header("Authorization") String token);
         @GET("/api/v1/manager/generalQrCode")
         Observable<ResponseBody> generalQrCode();
         @GET("/api/v1/parent/scanAndLogin")
         Observable<ResponseBody> scanAndLogin(@Header("Authorization") String token, @Query("code") String code, @Query("stuId") String stuId);
         @GET("/api/v1/parent/getChildrenList")
         Observable<ResponseBody> getChildrenList(@Header("Authorization") String token);
         @Headers("Content-Type: application/json")
         @POST("/api/v1/parent/registerParent")
         Observable<ResponseBody> registerParent(@Body RequestBody body);
         @GET("/api/v1/parent/listChildren")
         Observable<ResponseBody> listChildren(@Header("Authorization") String token);
         @Headers("Content-Type: application/json")
         @POST("/api/v1/parent/registerStudent")
         Observable<ResponseBody> registerStudent(@Header("Authorization") String token, @Body RequestBody body);
         @Headers("Content-Type: application/json")
         @POST("/api/v1/parent/bindTeacher")
         Observable<ResponseBody> bindTeacher(@Header("Authorization") String token, @Body RequestBody body);
         @Multipart
         @POST("/api/v1/user/upLoadAvatar")
         Observable<ResponseResult<Map<String, String>>> uploadAvatar(@Header("Authorization") String token, @Part() MultipartBody.Part file);
         @Multipart
         @POST("/api/v1/student/editStudentAvatar")
         Observable<ResponseResult<Map<String, String>>> uploadAvatar(@Header("Authorization") String token, @Part() MultipartBody.Part file, @PartMap Map<String, Object> map);
         @Headers("Content-Type: application/json")
         @POST("/api/v1/parent/editChild")
         Observable<ResponseResult> editStudent(@Header("Authorization") String token, @Body RequestBody body);
         @GET("/api/v1/student/getStudyPlanForThisWeek")
         Observable<ResponseResult<ScheduleBean>> getWeekPlan(@Header("Authorization") String token, @Query("stuId") String stuId);
         @GET("api/v1/parent/searchTeacher")
         Observable<ResponseResult<Teacher>> searchTeacher(@Header("Authorization") String token, @Query("phone") String phone);
         @POST("api/v1/question/listErrorBook")
         Observable<ResponseResult<PageInfo<TopicBean>>> getError(@Header("Authorization") String token, @Body Map<String, Object> body);
         @POST
         Observable<JsonObject> removeWriting(@Url String url, @Body RequestBody body);
+        @POST("https://aip.baidubce.com/rest/2.0/ocr/v1/doc_crop_enhance")
+        Observable<JsonObject> baiduEnhance(
+                @Query("access_token") String token,
+                @Body Object any
+        );
         @POST
         Observable<CutPicBean> cut(@Url String url, @Body RequestBody body);
         @POST
         Observable<JsonObject> getBaiduToken(@Url String url);
         @Multipart
         @POST("api/v1/pad/addErrorBook")
         Observable<ResponseResult> addError(@Part() MultipartBody.Part file, @PartMap Map<String, Object> map);
         @POST("api/v1/pad/deleteStuErrorBook")
         Observable<ResponseResult> deleteError(@Header("Authorization") String token, @Body List<String> map);
         @PUT("api/v1/pad/updateStuErrorBookInfo")
         Observable<ResponseResult> updateError(@Header("Authorization") String token, @Body List<HashMap<String, Object>> map);
         @POST("api/v1/question/editErrorBook")
         Observable<ResponseResult> editError(@Header("Authorization") String Authorization, @Body Map<String, Object> map);
         @GET("api/v1/resource/checkUpdate")
         Call<ResponseResult<UpdateBean>> checkUpdate(@Query("version") int version, @Query("packageName") String packageName, @Query("type") int type);
         @GET("api/v1/teacher/getStudentList")
         Observable<ResponseBody> getStudentList(@Header("Authorization") String token, @Query("userId") String id);
         @GET("api/v1/teacher/getStudentList")
         Single<ResponseResult<List<Student>>> getStudentList2(@Header("Authorization") String token, @Query("userId") String id);
         @GET("api/v1/answer/listRecordForTeacher")
         Observable<ResponseBody> getRecordList(@Header("Authorization") String token, @Query("userId") String id);
         @GET("api/v1/homework/listHomeworkByStuId")
         Single<ResponseResult<List<HomeworkList>>> getStudentHomework(@Header("Authorization") String token, @Query("stuId") String stuId);
         @POST
         Single<BaiduInput> inputImage(@Url String url, @Body RequestBody body);
         @Multipart
         @POST("api/v1/homework/uploadHomework")
         Single<ResponseResult> uploadImage(@Header("Authorization") String token, @Part() MultipartBody.Part file, @Query("brief") String id);
         @POST("api/v1/homework/uploadHomeworkAction")
         Single<ResponseResult> uploadHomework(@Header("Authorization") String token, @Body Object map);
         @GET("api/v1/homework/removeHomework")
         Single<ResponseResult<Boolean>> deleteHomework(
                 @Header("Authorization") String token,
                 @Query("homeworkId") String homeworkId
         );
         @GET("api/v1/homework/listHomeworkById")
         Single<ResponseResult<List<HomeWork>>> getHomeworkDetail(@Header("Authorization") String token, @Query("homeworkId") String homeworkId);
         @POST("api/v1/homework/uploadHomeworkFeedback")
         Single<ResponseResult> uploadHomeworkFeedback(@Header("Authorization") String token, @Body Map<String, Object> map);
         @POST("api/v1/homework/editHomeworkInfo")
         Single<ResponseResult<Boolean>> editHomework(
                 @Header("Authorization") String token,
                 @Body Object body
         );
         @GET("api/v1/homework/listHomeworkDetailByStuId")
         Single<ResponseResult<HomeworkDetail>> getHomeworkCompleteDetail(
                 @Header("Authorization") String token,
                 @Query("stuId") String stuId,
                 @Query("homeworkId") String homeworkId,
                 // type 固定传true
                 @Query("type") boolean type
         );
         @GET("api/v1/homework/listHomeworkStatistics")
         Single<ResponseResult<List<StDetail>>> getHuyouList(
                 @Header("Authorization") String token,
                 @Query("stuId") String stuId,
                 @Query("type") int type //0: 周报, 1:阶段总结
         );
         @GET("api/v1/homework/listHomeworkStatisticsDetailForStudent")
         Single<ResponseResult<StDetail>> getHuyouDetail(
                 @Header("Authorization") String token,
                 @Query("homeworkStatisticsId") String homeworkId
         );
         @GET("api/v1/demo/generalStatisticsHomework")
         Single<ResponseResult<Object>> generalHuyou();
         @POST("api/v1/homework/generalHomeworkStageStatistics")
         Single<ResponseResult<Boolean>> generalStageHuyou(
                 @Header("Authorization") String token,
                 @Body Object body
         );
         @GET("api/v1/homework/removeHomeworkStatistics")
         Single<ResponseResult<Boolean>> deleteHuyou(
                 @Header("Authorization") String token,
                 @Query("homeworkStatisticsId") String homeworkId
         );
         @GET("api/v1/login/smsCode")
         Single<ResponseResult<String>> smsCode(@Query("mobile") String mobile);
         @POST("api/v1/login/smsLogin")
         Single<ResponseResult<User>> smsLogin(@Body Object body);
     }
     public static String getUserId() {
         return (String) SharedPreferencesUtil.getData("userId", "");
     }
     public static String getHeader() {
         return (String) SharedPreferencesUtil.getData("token", "");
     }
     public static String getBaiduToken() {
         return (String) SharedPreferencesUtil.getData("baiduToken", "");
     }
     public static Single<BaiduInput> inputImage(String filePath, String id) {
         MediaType mediaType = MediaType.parse("application/x-www-form-urlencoded");
         String base64 = BitmapUtils.fileToBase64(filePath);
         File file = new File(filePath);
         RequestBody body = RequestBody.create(mediaType, "image=" + base64 + "&brief={\"name\":\"" + file.getName() + "\", \"id\":\"" + id + "\"}");
         return getBaiduTokenOcr().map(jsonObject -> jsonObject.get("access_token").getAsString())
                 .flatMap(token -> {
                     return service_url.inputImage("https://aip.baidubce.com/rest/2.0/realtime_search/same_hq/add?access_token=" + token, body);
                 });
     }
     public static Single<ResponseResult> uploadImage(String path, String id) {
         File file = new File(path);
         RequestBody requestBody = RequestBody.create(MediaType.parse("image/jpg"), file);
         MultipartBody.Part part = MultipartBody.Part.createFormData("file", file.getName(), requestBody);
         return service_url.uploadImage(getHeader(), part, id);
     }
     public static void checkUpdate(int code, String packageName, Callback<ResponseResult<UpdateBean>> callback) {
         service_url.checkUpdate(code, packageName, 0).enqueue(callback);
     }
     public static void addError(String path, Map<String, String> param, Observer<ResponseResult> observer) {
         File file = new File(path);
         RequestBody requestBody = RequestBody.create(MediaType.parse("image/jpg"), file);
         MultipartBody.Part part = MultipartBody.Part.createFormData("file", file.getName(), requestBody);
         Map<String, Object> map = new HashMap<>();
         map.put("condition", param);
         setSubscribe(service_url.addError(part, map), observer);
     }
     public static void cut(String base64, Observer<CutPicBean> observer) {
         MediaType mediaType = MediaType.parse("application/x-www-form-urlencoded");
         RequestBody body = RequestBody.create(mediaType, "image=" + base64 + "&detect_direction=true");
         setSubscribe(service_url.cut("https://aip.baidubce.com/rest/2.0/ocr/v1/paper_cut_edu?access_token=" + getBaiduToken(), body), observer);
     }
     public static void editError(Map<String, Object> map, Observer<ResponseResult> observer) {
         setSubscribe(service_url.editError(getHeader(), map), observer);
     }
     public static void editError(List<HashMap<String, Object>> map, Observer<ResponseResult> observer) {
         setSubscribe(service_url.updateError(getHeader(), map), observer);
     }
     public static void deleteError(List<String> map, Observer<ResponseResult> observer) {
         setSubscribe(service_url.deleteError(getHeader(), map), observer);
     }
     public static void getBaiduToken(Observer<JsonObject> observer) {
         setSubscribe(service_url.getBaiduToken("https://aip.baidubce.com/oauth/2.0/token?grant_type=client_credentials&client_id=" + BuildConfig.APIKey + "&client_secret=" + BuildConfig.SecretKey), observer);
     }
     public static Single<JsonObject> getBaiduTokenOcr() {
         return service_url.getBaiduToken("https://aip.baidubce.com/oauth/2.0/token?grant_type=client_credentials&client_id=" + BuildConfig.APIKey1 + "&client_secret=" + BuildConfig.SecretKey1).firstOrError();
     }
     public static void removeWriting(String base64, Observer<JsonObject> observer) {
         MediaType mediaType = MediaType.parse("application/x-www-form-urlencoded");
         RequestBody body = RequestBody.create(mediaType, "image=" + base64);
         setSubscribe(service_url.removeWriting(("https://aip.baidubce.com/rest/2.0/ocr/v1/remove_handwriting?access_token=" + getBaiduToken()), body), observer);
     }
+    public static void baiduEnhance(String base64, Observer<JsonObject> observer) {
+        Map<String, Object> body = new LinkedHashMap<>();
+        body.put("image", base64);
+        body.put("scan_type", 3);
+        body.put("enhance_type", 3);
+        setSubscribe(service_url.baiduEnhance(getBaiduToken(), body), observer);
+    }
     public static void searchTeacher(String phone, Observer<ResponseResult<Teacher>> observer) {
         setSubscribe(service_url.searchTeacher(getHeader(), phone), observer);
     }
     public static void logout(Observer<ResponseBody> observer) {
         setSubscribe(service_url.logout(), observer);
     }
     public static void editStudent(RequestBody body, Observer<ResponseResult> observable) {
         setSubscribe(service_url.editStudent(getHeader(), body), observable);
     }
     public static void getWeekPlan(String id, Observer<ResponseResult<ScheduleBean>> observer) {
         setSubscribe(service_url.getWeekPlan(getHeader(), id), observer);
     }
     public static void uploadStudentAvatar(File file, String stuId, Observer<ResponseResult<Map<String, String>>> observer) {
         RequestBody requestBody = RequestBody.create(MediaType.parse("multipart/form-data"), file);
         MultipartBody.Part part = MultipartBody.Part.createFormData("file", file.getName(), requestBody);
         Map<String, Object> map = new HashMap<>();
         map.put("stuId", stuId);
         setSubscribe(service_url.uploadAvatar(getHeader(), part, map), observer);
     }
     public static void uploadAvatar(File file, Observer<ResponseResult<Map<String, String>>> observer) {
         RequestBody requestBody = RequestBody.create(MediaType.parse("multipart/form-data"), file);
         MultipartBody.Part part = MultipartBody.Part.createFormData("file", file.getName(), requestBody);
         setSubscribe(service_url.uploadAvatar(getHeader(), part), observer);
     }
     public static void upLoadAvatar(List<MultipartBody.Part> partLis, Observer<ResponseBody> observer) {
         setSubscribe(service_url.upLoadAvatar(getHeader(), partLis), observer);
     }
     public static void editUser(RequestBody body, Observer<ResponseBody> observer) {
         setSubscribe(service_url.editUser(getHeader(), body), observer);
     }
     public static void changePassword(RequestBody body, Observer<ResponseBody> observer) {
         setSubscribe(service_url.changePassword(getHeader(), body), observer);
     }
     public static void searchById(String userId, Observer<ResponseBody> observer) {
         setSubscribe(service_url.searchById(getHeader(), userId), observer);
     }
     public static void login(RequestBody body, Observer<ResponseBody> observer) {
         setSubscribe(service_url.login(body), observer);
     }
     public static void listGradeAndSubject(Observer<ResponseResult<List<GradeAndSubject>>> observer) {
         setSubscribe(service_url.listGradeAndSubject(getHeader()), observer);
     }
     public static void scanAndLogin(String code, String stuId, Observer<ResponseBody> observer) {
         setSubscribe(service_url.scanAndLogin(getHeader(), code, stuId), observer);
     }
     public static void getChildrenList(Observer<ResponseBody> observer) {
         setSubscribe(service_url.getChildrenList(getHeader()), observer);
     }
     public static void registerParent(RequestBody body, Observer<ResponseBody> observer) {
         setSubscribe(service_url.registerParent(body), observer);
     }
     public static void listChildren(Observer<ResponseBody> observer) {
         setSubscribe(service_url.listChildren(getHeader()), observer);
     }
     public static void listStudent(Observer<ResponseBody> observer) {
         setSubscribe(service_url.getStudentList(getHeader(), (String) SharedPreferencesUtil.getData("userId", "")), observer);
     }
     public static Single<ResponseResult<List<Student>>> listStudent() {
         return service_url.getStudentList2(getHeader(), getUserId());
     }
     public static void listRecord(Observer<ResponseBody> observer) {
         setSubscribe(service_url.getRecordList(getHeader(), (String) SharedPreferencesUtil.getData("userId", "")), observer);
     }
     public static void registerStudent(RequestBody body, Observer<ResponseBody> observer) {
         setSubscribe(service_url.registerStudent(getHeader(), body), observer);
     }
     public static void bindTeacher(RequestBody body, Observer<ResponseBody> observer) {
         setSubscribe(service_url.bindTeacher(getHeader(), body), observer);
     }
     public static void getError(Map map, Observer<ResponseResult<PageInfo<TopicBean>>> observer) {
         setSubscribe(service_url.getError(getHeader(), map), observer);
     }
     public static RequestBody getMapRequestBody(Map map) {
         return RequestBody.create(MediaType.parse("text/plain"), new Gson().toJson(map));
     }
     public static RequestBody getArrayRequestBody(List list) {
         return RequestBody.create(MediaType.parse("text/plain"), new Gson().toJson(list));
     }
     public static RequestBody getFileRequestBody(File file) {
         return RequestBody.create(MediaType.parse("application/octet-stream"), file);
     }
     public static RequestBody getFileRequestBody(byte[] bytes) {
         return RequestBody.create(MediaType.parse("multipart/form-data"), bytes);
     }
     public static RequestBody getObjectRequestBody(Object obj) {
         return RequestBody.create(MediaType.parse("text/plain"), new Gson().toJson(obj));
     }
     public static RequestBody getStringRequestBody(String str) {
         return RequestBody.create(MediaType.parse("text/plain"), str);
     }
     /**
      * 插入观察者
      *
      * @param observable
      * @param observer
      * @param <T>
      */
     public static <T> void setSubscribe(Observable<T> observable, Observer<T> observer) {
         observable.subscribeOn(Schedulers.io())//子线程访问网络
                 .observeOn(AndroidSchedulers.mainThread())//回调到主线程
                 .subscribe(observer);
     }
 }

libs/common/src/main/java/com/prws/common/utils/BitmapUtils.java

Diff comments View file @f536f83

 package com.prws.common.utils;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.hardware.Camera;
 import android.text.TextUtils;
 import android.util.Base64;
 import android.view.View;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URLEncoder;
 public class BitmapUtils {
     public static Bitmap compress(Bitmap image) {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         image.compress(Bitmap.CompressFormat.JPEG, 100, baos);//质量压缩方法，这里100表示不压缩，把压缩后的数据存放到baos中
         int options = 100;
         while (baos.toByteArray().length / 1024 > 2000) { //循环判断如果压缩后图片是否大于100kb,大于继续压缩
             baos.reset();//重置baos即清空baos
             image.compress(Bitmap.CompressFormat.JPEG, options, baos);//这里压缩options%，把压缩后的数据存放到baos中
             options -= 10;//每次都减少10
         }
         ByteArrayInputStream isBm = new ByteArrayInputStream(baos.toByteArray());//把压缩后的数据baos存放到ByteArrayInputStream中
         Bitmap bitmap = BitmapFactory.decodeStream(isBm, null, null);//把ByteArrayInputStream数据生成图片
         return bitmap;
     }
     public static Bitmap getimage(String srcPath) {
         BitmapFactory.Options newOpts = new BitmapFactory.Options();
         //开始读入图片，此时把options.inJustDecodeBounds 设回true了
         newOpts.inJustDecodeBounds = true;
         Bitmap bitmap = BitmapFactory.decodeFile(srcPath, newOpts);//此时返回bm为空
         newOpts.inJustDecodeBounds = false;
         int w = newOpts.outWidth;
         int h = newOpts.outHeight;
         float hh = 2000f;//这里设置高度为800f
         float ww = 2000f;//这里设置宽度为480f
         //缩放比。由于是固定比例缩放，只用高或者宽其中一个数据进行计算即可
         int be = 1;//be=1表示不缩放
         if (w > h && w > ww) {//如果宽度大的话根据宽度固定大小缩放
             be = (int) (newOpts.outWidth / ww);
         } else if (w < h && h > hh) {//如果高度高的话根据宽度固定大小缩放
             be = (int) (newOpts.outHeight / hh);
         }
         if (be <= 0)
             be = 1;
         newOpts.inSampleSize = be;//设置缩放比例
         //重新读入图片，注意此时已经把options.inJustDecodeBounds 设回false了
         bitmap = BitmapFactory.decodeFile(srcPath, newOpts);
         return compress(bitmap);//压缩好比例大小后再进行质量压缩
     }
     /**
      * 注释：设置拍照图片正确方向
      *
      * @param id
      * @param bitmap
      * @return
      */
     public static Bitmap setTakePicktrueOrientation(int id, Bitmap bitmap) {
         //如果返回的图片宽度小于高度，说明FrameWork层已经做过处理直接返回即可
         try {
             if (bitmap.getWidth() < bitmap.getHeight()) {
                 return bitmap;
             }
             Camera.CameraInfo info = new Camera.CameraInfo();
             Camera.getCameraInfo(id, info);
             bitmap = rotaingImageView(id, info.orientation, bitmap);
         } catch (Exception e) {
         }
         return bitmap;
     }
     /**
      * 把相机拍照返回照片转正
      *
      * @param angle 旋转角度
      * @return bitmap 图片
      */
     private static Bitmap rotaingImageView(int id, int angle, Bitmap bitmap) {
         //矩阵
         Matrix matrix = new Matrix();
         matrix.postRotate(angle);
         //加入翻转 把相机拍照返回照片转正
         if (id == 1) {
             matrix.postScale(-1, 1);
         }
         // 创建新的图片
         Bitmap resizedBitmap = Bitmap.createBitmap(bitmap, 0, 0,
                 bitmap.getWidth(), bitmap.getHeight(), matrix, true);
         return resizedBitmap;
     }
     /**
      * 注释：保存图片
      *
      * @param bitmap
      * @param path
      * @return
      */
     public static boolean saveBitmap(Bitmap bitmap, String path) {
         try {
             File file = new File(path);
             File parent = file.getParentFile();
             if (!parent.exists()) {
                 parent.mkdirs();
             }
             FileOutputStream fos = new FileOutputStream(file);
             boolean b = bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos);
             fos.flush();
             fos.close();
             return b;
         } catch (Exception e) {
             e.printStackTrace();
         }
         return false;
     }
     public static Bitmap routeBitmap(Bitmap bitmap) {
         Matrix matrix = new Matrix();
         matrix.preRotate(90f);
         Bitmap bitmap1 = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, false);
         return bitmap1;
     }
     public static String fileToBase64(String path) {
         File file = new File(path);
         String base64 = null;
         InputStream in = null;
         try {
             in = new FileInputStream(file);
             byte[] bytes = new byte[in.available()];
             int length = in.read(bytes);
             base64 = Base64.encodeToString(bytes, 0, length, Base64.DEFAULT);
         } catch (FileNotFoundException e) {
             e.printStackTrace();
         } catch (IOException e) {
             e.printStackTrace();
         } finally {
             try {
                 if (in != null) {
                     in.close();
                 }
             } catch (IOException e) {
                 e.printStackTrace();
             }
         }
         return toURLEncoded(base64);
     }
     /**
      * 将图片转换成Base64编码的字符串
      */
-    public static String imageToBase64(String path) {
+    public static String imageToBase64WithUrlEncode(String path) {
+        return imageToBase64(path, true);
+    }
+    public static String imageToBase64(String path, boolean urlEncode) {
         if (TextUtils.isEmpty(path)) {
             return null;
         }
         InputStream is = null;
         byte[] data = null;
         String result = null;
         try {
             is = new FileInputStream(path);
             //创建一个字符流大小的数组。
             data = new byte[is.available()];
             //写入数组
             is.read(data);
             //用默认的编码格式进行编码
             result = Base64.encodeToString(data, Base64.NO_CLOSE);
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
             if (null != is) {
                 try {
                     is.close();
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
             }
         }
-        return toURLEncoded(result);
+        if (urlEncode) return toURLEncoded(result);
+        else return result;
     }
     public static String toURLEncoded(String paramString) {
         if (paramString == null || paramString.equals("")) {
             return "";
         }
         try {
             String str = new String(paramString.getBytes(), "UTF-8");
             str = URLEncoder.encode(str, "UTF-8");
             return str;
         } catch (Exception localException) {
         }
         return "";
     }
     public static Bitmap stringToBitmap(String string) {
         Bitmap bitmap = null;
         try {
             byte[] bitmapArray = Base64.decode(string, Base64.DEFAULT);
             bitmap = BitmapFactory.decodeByteArray(bitmapArray, 0, bitmapArray.length);
         } catch (Exception e) {
             e.printStackTrace();
         }
         return bitmap;
     }
     /**
      * 将图片转成byte数组
      *
      * @param bitmap 图片
      * @return 图片的字节数组
      */
     public static String bitmap2Byte(Bitmap bitmap) {
         if (null == bitmap) throw new NullPointerException();
         // if (null == bitmap) return null;
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         //把bitmap100%高质量压缩 到 output对象里
         bitmap.compress(Bitmap.CompressFormat.JPEG, 100, outputStream);
         return byte2Base64(outputStream.toByteArray());
     }
     /**
      * 将图片转成byte数组
      *
      * @param imageByte 图片
      * @return Base64 String
      */
     public static String byte2Base64(byte[] imageByte) {
         if (null == imageByte) return null;
         return Base64.encodeToString(imageByte, Base64.DEFAULT);
     }
     public static Bitmap shotView(View v) {
         Bitmap bitmap = Bitmap.createBitmap(v.getWidth(), v.getHeight(), Bitmap.Config.RGB_565);
         Canvas canvas = new Canvas(bitmap);
         v.draw(canvas);
         return bitmap;
     }
 }