zhanghaochen / ParentControl

Browse Code »

Commit 19e49b3575d0c3e05d70ba23bbcf01a300be995a

Authored by shixianjie 2024-09-26 17:25:05 +0800

1 parent dbb1f52deb

Exists in master

录入作业成功页面

Showing 5 changed files with 32 additions and 10 deletions Show diff stats

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

Diff comments View file @19e49b3

 package com.hjx.parent;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import androidx.annotation.Nullable;
 import androidx.core.content.FileProvider;
 import com.hjx.parent.databinding.ActivityAddSuccessBinding;
 import com.prws.common.utils.BitmapUtils;
 import com.prws.common.utils.CommonUtil;
 import com.prws.common.utils.dialog.MyButtomDialog;
 import com.zhangteng.imagepicker.bean.ImageInfo;
 import com.zhangteng.imagepicker.config.ImagePickerConfig;
 import com.zhangteng.imagepicker.config.ImagePickerEnum;
 import com.zhangteng.imagepicker.config.ImagePickerOpen;
 import com.zhangteng.imagepicker.imageloader.GlideImageLoader;
 import com.zhangteng.utils.IHandlerCallBack;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 public class AddSuccessActivity extends BaseActivity<ActivityAddSuccessBinding> {
     private int REQUEST_CODE_IMAGE = 123;
     private String filePath;
+    private int type;
+    private String stuId;
     @Override
     public void initView(Bundle savedInstanceState) {
+        type = getIntent().getIntExtra("type", 0);
+        stuId = getIntent().getStringExtra("stuId");
+        if (type == 1) {
+            binding.tvMsg.setText("作业录入成功！");
+            binding.tvAdd.setText("继续录入作业");
+            binding.tvBook.setText("查看作业详情");
+        }
         binding.ivBack.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 finish();
             }
         });
         binding.tvAdd.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 MyButtomDialog dialog = new MyButtomDialog(context, R.style.BottomSheetDialog);
                 View bottomView = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_layout, null);
                 dialog.setContentView(bottomView);
                 bottomView.findViewById(R.id.take_photo).setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
                         dialog.dismiss();
                         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, REQUEST_CODE_IMAGE);
                         }
                     }
                 });
                 bottomView.findViewById(R.id.choose_photo).setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
                         dialog.dismiss();
                         ImagePickerConfig imagePickerConfig = new ImagePickerConfig.Builder().provider(getPackageName() + ".fileprovider").imageLoader(new GlideImageLoader()) //图片加载器
                                 .iHandlerCallBack(new HandlerCallBack())    //图片选择器生命周期监听（直接打开摄像头时无效）
                                 .multiSelect(true)                 //是否多选
                                 .isShowCamera(false).isVideoPicker(false)              //是否选择视频 默认false
                                 .isImagePicker(true).imagePickerType(ImagePickerEnum.PHOTO_PICKER) //选择器打开类型
                                 .maxImageSelectable(5)                        //图片可选择数
                                 .maxHeight(1920)                              //图片最大高度
                                 .maxWidth(1920)                               //图片最大宽度
                                 .maxImageSize(3)                             //图片最大大小Mb
                                 .isCrop(false).pathList(new ArrayList<>()).pickerThemeColorRes(R.color.image_picker_white).pickerTitleColorRes(R.color.image_picker_text_black).cropThemeColorRes(R.color.image_picker_white).cropTitleColorRes(R.color.image_picker_text_black).pickerBackRes(R.mipmap.image_picker_back_black).pickerFolderRes(R.mipmap.image_picker_folder_black).build();
                         ImagePickerOpen.getInstance().setImagePickerConfig(imagePickerConfig).pathList(new ArrayList<>()).open(AddSuccessActivity.this);
                     }
                 });
                 bottomView.findViewById(R.id.cancel).setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
                         dialog.dismiss();
                     }
                 });
                 dialog.show();
             }
         });
         binding.tvBook.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(new Intent(context, ErrorListActivity.class));
+                if (type == 0) {
+                    startActivity(new Intent(context, ErrorListActivity.class));
+                } else {
+                    // TODO
+                }
             }
         });
     }
     @Override
     protected ActivityAddSuccessBinding getViewBinding() {
         return ActivityAddSuccessBinding.inflate(getLayoutInflater());
     }
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == REQUEST_CODE_IMAGE && 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);
             List<String> strings = new ArrayList<>();
             Intent intent = new Intent(context, ImageActivity.class);
+            intent.putExtra("type", type);
             strings.add(path);
             intent.putStringArrayListExtra("images", (ArrayList<String>) strings);
             startActivity(intent);
             finish();
         }
     }
     public class HandlerCallBack implements IHandlerCallBack<ImageInfo> {
         private String TAG = "---ImagePicker---";
         List<ImageInfo> photoList = new ArrayList<>();
         @Override
         public void onStart() {
             Log.i(TAG, "onStart: 开启");
         }
         @Override
         public void onSuccess(List<ImageInfo> photoList) {
             this.photoList = photoList;
             Log.i(TAG, "onSuccess: 返回数据");
         }
         @Override
         public void onCancel() {
             Log.i(TAG, "onCancel: 取消");
         }
         @Override
         public void onFinish(List<ImageInfo> selectImage) {
             if (selectImage.size() == photoList.size()) {
                 List<String> strings = new ArrayList<>();
                 Intent intent = new Intent(context, ImageActivity.class);
+                intent.putExtra("type", type);
                 for (ImageInfo imageInfo : selectImage) {
                     strings.add(imageInfo.getPath());
                 }
                 intent.putStringArrayListExtra("images", (ArrayList<String>) strings);
                 startActivity(intent);
                 finish();
             }
         }
         @Override
         public void onError() {
             Log.i(TAG, "onError: 出错");
         }
     }
 }

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

Diff comments View file @19e49b3

 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.dialog.AddHomeworkDialog;
 import com.hjx.parent.dialog.ErrorInputDialog;
 import com.hjx.parent.dialog.TipDialog;
 import com.hjx.parent.rx.BaseRxActivity;
 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 io.reactivex.Observer;
 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 ImageAdapter imageAdapter;
     private List<ImageBean> list = new ArrayList<>();
     private String filePath;
     private int type = 0;
     private AddHomeworkDialog addHomeworkDialog;
     @Override
     public void initView(Bundle savedInstanceState) {
         type = getIntent().getIntExtra("type", 0);
         binding.tvSave.setText(type == 0 ? "保存错题" : "录入题目");
         images = getIntent().getStringArrayListExtra("images");
         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);
             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.ivNext.setOnClickListener(this);
         binding.ivPrevious.setOnClickListener(this);
         binding.ivBack.setOnClickListener(this);
         binding.tvPhoto.setOnClickListener(this);
         binding.tvAdd.setOnClickListener(this);
         binding.llEdit.setOnClickListener(this);
         binding.tvSave.setOnClickListener(this);
     }
     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());
         NetWorks.removeWriting(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);
                         imageAdapter.notifyItemChanged(index);
                         cut(filepath);
                     } else {
                         loadFail("去除字迹失败");
                     }
                 } else {
                     loadFail("去除字迹失败");
                 }
             }
             @Override
             public void onError(Throwable e) {
                 loadFail("去除字迹失败");
             }
             @Override
             public void onComplete() {
             }
         });
     }
     public void cut(String path) {
         String base64 = BitmapUtils.imageToBase64(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.iv_next:
                 if (binding.viewPager.getCurrentItem() + 1 < list.size()) {
                     binding.viewPager.setCurrentItem(binding.viewPager.getCurrentItem() + 1);
                 }
                 break;
             case R.id.iv_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());
                 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, () -> {
+            addHomeworkDialog.show(paths, student -> {
-                // TODO
+                Intent intent = new Intent(context, AddSuccessActivity.class);
+                intent.putExtra("type", type);
+                intent.putExtra("stuId", student.stuId);
+                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());
                     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();
                 list.remove(position);
                 String path = data.getStringExtra("path");
                 ImageBean imageBean = new ImageBean();
                 imageBean.setPath(path);
                 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);
             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/dialog/AddHomeworkDialog.java

Diff comments View file @19e49b3

 package com.hjx.parent.dialog;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.util.Pair;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Toast;
 import androidx.annotation.NonNull;
 import com.bigkoo.pickerview.builder.TimePickerBuilder;
 import com.google.gson.Gson;
 import com.hjx.parent.R;
 import com.hjx.parent.bean.StudentBean;
 import com.hjx.parent.databinding.DialogAddHomeworkBinding;
 import com.hjx.parent.function.Function0;
+import com.hjx.parent.function.Function1;
 import com.hjx.parent.rx.BaseRxActivity;
 import com.prws.common.bean.GradeAndSubject;
 import com.prws.common.bean.ResponseResult;
 import com.prws.common.bean.Student;
 import com.prws.common.bean.Subject;
 import com.prws.common.bean.baidu.BaiduInput;
 import com.prws.common.net.NetWorks;
 import com.prws.common.utils.SharedPreferencesUtil;
 import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 public class AddHomeworkDialog extends BaseDialog<DialogAddHomeworkBinding>{
     private final BaseRxActivity<?> activity;
-    private Function0 callback;
+    private Function1<Student> callback;
-    String stuId;
     SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日", Locale.CHINA);
     List<Student> studentList;
     List<GradeAndSubject> gradeAndSubjectList;
     List<String> images;
     Student student;
     String grade;
     String term;
     String subject;
     Date uploadTime = new Date();
     public AddHomeworkDialog(BaseRxActivity<?> context) {
         super((Context) context);
         activity = context;
     }
-    public void show(List<String> paths, Function0 callback) {
+    public void show(List<String> paths, Function1<Student> callback) {
         images = paths;
         this.callback = callback;
         super.show();
     }
     @SuppressLint("SetTextI18n")
     @Override
     public void initView() {
         binding.btnClose.setOnClickListener(v -> dismiss());
-        stuId = getCurrentStuId();
         binding.spStudent.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 student = studentList.get(position);
                 if (gradeAndSubjectList == null) return;
                 int p = 0;
                 for (GradeAndSubject it: gradeAndSubjectList) {
                     if (it.getGrade().getGrade().equals(student.grade)) {
                         p = gradeAndSubjectList.indexOf(it);
                         break;
                     }
                 }
                 binding.spGrade.setSelection(p);
             }
             @Override
             public void onNothingSelected(AdapterView<?> parent) {
             }
         });
         binding.spTerm.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) {
             }
         });
         binding.spGrade.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 grade = gradeAndSubjectList.get(position).getGrade().getGrade();
                 refreshSubjects(position);
             }
             @Override
             public void onNothingSelected(AdapterView<?> parent) {
             }
         });
         binding.tvDate.setText(dateFormat.format(uploadTime));
         binding.tvDate.setOnClickListener(v -> {
             new TimePickerBuilder(getContext(), (date, v1) -> {
                 uploadTime = date;
                 binding.tvDate.setText(dateFormat.format(uploadTime));
                 binding.etName.setText(dateFormat.format(uploadTime) + subject + "作业");
             }).setType(new boolean[]{true, true, true, false, false, false}).isDialog(true).build().show();
         });
         binding.btnConfirm.setOnClickListener(v -> {
             String name = binding.etName.getText().toString().trim();
             if (name.isEmpty()) {
                 Toast.makeText(getContext(), "请输入作业名称", Toast.LENGTH_SHORT).show();
                 return;
             }
             uploadImage(name);
         });
         getGrade();
     }
     private String getCurrentStuId() {
         String student = (String) SharedPreferencesUtil.getData("student", "");
         StudentBean studentBean = new Gson().fromJson(student, StudentBean.class);
         return studentBean.getStuId();
     }
     @SuppressLint("CheckResult")
     private void getStudents() {
         NetWorks.listStudent()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .compose(RxLifecycleAndroid.bindActivity(activity.getRxLifecycle()))
                 .map(ResponseResult::getData)
                 .subscribe((data, th) -> {
                     if (th != null) th.printStackTrace();
                     if (data != null && data.size() > 0) {
                         studentList = data;
                         int position = 0;
+                        String stuId = getCurrentStuId();
                         for (int i = 0; i < data.size(); i++) {
                             if (data.get(i).stuId.equals(stuId)) {
                                 position = i;
                                 break;
                             }
                         }
                         binding.spStudent.setAdapter(new ArrayAdapter<>(getContext(), R.layout.item_spinner, data));
                         binding.spStudent.setSelection(position);
                     }
                 });
     }
     @SuppressLint("CheckResult")
     private void getGrade() {
         NetWorks.service_url.listGradeAndSubject(NetWorks.getHeader())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .compose(RxLifecycleAndroid.bindActivity(activity.getRxLifecycle()))
                 .map(ResponseResult::getData)
                 .firstOrError()
                 .subscribe((data, th) -> {
                     if (th != null) th.printStackTrace();
                     if (data != null && data.size() > 0) {
                         gradeAndSubjectList = data;
                         List<String> grades = new ArrayList<>();
                         for (GradeAndSubject it: data) {
                             grades.add(it.getGrade().getGrade());
                         }
                         binding.spGrade.setAdapter(new ArrayAdapter<>(getContext(), R.layout.item_spinner, grades));
                     }
                     getStudents();
                 });
     }
     private void refreshSubjects(int gradePosition) {
         if (gradeAndSubjectList == null) return;
         List<Subject> subjectList = gradeAndSubjectList.get(gradePosition).getSubjects();
         List<String> subjects = new ArrayList<>();
         for (Subject s: subjectList) {
             subjects.add(s.getSubject());
         }
         binding.spSubject.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @SuppressLint("SetTextI18n")
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 subject = subjects.get(position);
                 binding.etName.setText(dateFormat.format(uploadTime) + subject + "作业");
             }
             @Override
             public void onNothingSelected(AdapterView<?> parent) {
             }
         });
         binding.spSubject.setAdapter(new ArrayAdapter<>(getContext(), R.layout.item_spinner, subjects));
     }
     @SuppressLint("CheckResult")
     public void uploadImage(String name) {
         activity.showLoadingDialog("上传作业中...");
         Observable.fromIterable(images)
                 .map(path -> {
                     int index = images.indexOf(path);
                     return new Pair<>(index, path);
                 })
                 .subscribeOn(Schedulers.io())
                 .flatMap(pair -> {
                     int index = pair.first;
                     String path = pair.second;
                     File file = new File(path);
                     String id = file.getName().substring(0, file.getName().lastIndexOf("."));
                     return Observable.just(file)
                             .map(var -> {
                                 BaiduInput baiduInput = NetWorks.inputImage(path, id).blockingGet();
                                 if (baiduInput.getError_code() != null) {
                                     throw new RuntimeException("图片入库失败");
                                 } else {
                                     return baiduInput;
                                 }
                             })
                             .map(var -> NetWorks.uploadImage(path, id).blockingGet())
                             .map(var -> {
                                 Map<String, Object> map = new HashMap<>();
                                 map.put("brief", id);
                                 map.put("sort", index);
                                 return map;
                             });
                 }, 2)
                 .toList()
                 .map(list -> {
                     List<String> stuIds = new ArrayList<>();
                     stuIds.add(student.stuId);
                     String userId = NetWorks.getUserId();
                     Map<String, Object> map = new HashMap<>();
                     map.put("name", name);
                     map.put("grade", grade);
                     map.put("term", term);
                     map.put("subject", subject);
                     map.put("userId", userId);
                     map.put("stuIds", stuIds);
                     map.put("briefList", list);
                     SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
                     map.put("uploadTime", format.format(uploadTime));
                     return map;
                 })
                 .flatMap(body -> {
                     return NetWorks.service_url.uploadHomework(NetWorks.getHeader(), body);
                 })
                 .observeOn(AndroidSchedulers.mainThread())
                 .compose(RxLifecycleAndroid.bindActivity(activity.getRxLifecycle()))
                 .subscribe((response, th) -> {
                     if (th != null) th.printStackTrace();
                     if (response != null && response.getSuccess()) {
                         activity.cancelLoadingDialog();
                         dismiss();
-                        if (callback != null) callback.invoke();
+                        if (callback != null) callback.invoke(student);
                     } else {
                         activity.loadFail("上传作业失败");
                     }
                 })
         ;
     }
     @NonNull
     @Override
     public DialogAddHomeworkBinding getBinding() {
         return DialogAddHomeworkBinding.inflate(getLayoutInflater());
     }

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

Diff comments View file @19e49b3

 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:xxx="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white">
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:background="@color/white">
         <ImageView
             android:id="@+id/iv_back"
             android:layout_width="30dp"
             android:layout_height="36dp"
             android:layout_centerVertical="true"
             android:layout_marginLeft="5dp"
             android:padding="10dp"
             android:src="@mipmap/icon_back" />
     </RelativeLayout>
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:orientation="vertical">
         <ImageView
             android:layout_width="50dp"
             android:layout_height="58dp"
             android:layout_gravity="center_horizontal"
             android:src="@mipmap/ic_add_success" />
         <TextView
+            android:id="@+id/tvMsg"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="20dp"
             android:text="加入错题本成功！"
             android:textColor="@color/text_title"
             android:textSize="20dp"
             android:textStyle="bold" />
         <TextView
             android:id="@+id/tv_add"
             android:layout_width="250dp"
             android:layout_height="45dp"
             android:layout_marginTop="40dp"
             android:background="@drawable/bg_soild_blue_25"
             android:gravity="center"
             android:text="继续录入错题"
             android:textColor="@color/white"
             android:textSize="20sp"
             android:visibility="visible" />
         <TextView
             android:id="@+id/tv_book"
             android:layout_width="250dp"
             android:layout_height="45dp"
             android:layout_marginTop="20dp"
             android:background="@drawable/bg_soild_blue_border_25"
             android:gravity="center"
             android:text="去错题本查看"
             android:textColor="#1C90F3"
             android:textSize="20sp"
             android:visibility="visible" />
     </LinearLayout>
 </RelativeLayout>

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

Diff comments View file @19e49b3

 package com.prws.common.net;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.jakewharton.retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 import com.prws.common.utils.LogUtil;
 import io.reactivex.schedulers.Schedulers;
 import okhttp3.OkHttpClient;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
 /**
  * 类名称：RetrofitUtils
  * 创建人：
  *
  * 类描述：封装一个retrofit集成0kHttp3的抽象基类
  */
 public abstract class RetrofitUtils {
     private static Retrofit prwsCloudRetrofit;
     private static OkHttpClient prwsCloudOkHttpClient;
     private static Retrofit mStaRetrofit;
     private static OkHttpClient mStaOkHttpClient;
     private static Retrofit nginxRetrofit;
     private static OkHttpClient nginxOkHttpClient;
     private static Retrofit mWebRetrofit;
     private static OkHttpClient mWebOkHttpClient;
     /**
      * 获取Retrofit对象
      *
      * @return
      */
     protected static Retrofit getMachineRetrofit(String API_SERVER) {
         if (null == mStaRetrofit) {
             if (null == mStaOkHttpClient) {
                 mStaOkHttpClient = OkHttp3Utils.getOkHttpClient();
             }
+            Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss").create();
             //Retrofit2后使用build设计模式
             mStaRetrofit = new Retrofit.Builder()
                     //设置服务器路径
                     .baseUrl( API_SERVER +"/")
                     //添加转化库，默认是Gson
-                    .addConverterFactory(GsonConverterFactory.create())
+                    .addConverterFactory(GsonConverterFactory.create(gson))
                     //添加回调库，采用RxJava
                     .addCallAdapterFactory(RxJava2CallAdapterFactory.createWithScheduler(Schedulers.io()))
                     //设置使用okhttp网络请求
                     .client(mStaOkHttpClient)
                     .build();
         }
         return mStaRetrofit;
     }
     protected static Retrofit getNginxRetrofit(String API_SERVER) {
         if (null == nginxRetrofit) {
             if (null == nginxOkHttpClient) {
                 nginxOkHttpClient = OkHttp3Utils.getOkHttpClient();
             }
             //Retrofit2后使用build设计模式
             nginxRetrofit = new Retrofit.Builder()
                     //设置服务器路径
                     .baseUrl( API_SERVER +"/")
                     //添加转化库，默认是Gson
                     .addConverterFactory(GsonConverterFactory.create())
                     //添加回调库，采用RxJava
                     .addCallAdapterFactory(RxJava2CallAdapterFactory.createWithScheduler(Schedulers.io()))
                     //设置使用okhttp网络请求
                     .client(nginxOkHttpClient)
                     .build();
         }
         return nginxRetrofit;
     }
     protected static Retrofit getPrwsCloudRetrofit(String API_SERVER,boolean isReInit) {
         if (isReInit){
             prwsCloudRetrofit = null;
         }
         if (null == prwsCloudRetrofit) {
             if (null == prwsCloudOkHttpClient) {
                 prwsCloudOkHttpClient = OkHttp3Utils.getOkHttpClient();
             }
             LogUtil.i("RetrofitUtils","url:"+API_SERVER);
             //Retrofit2后使用build设计模式
             prwsCloudRetrofit = new Retrofit.Builder()
                     //设置服务器路径
                     .baseUrl( API_SERVER +"/")
                     //添加转化库，默认是Gson
                     .addConverterFactory(GsonConverterFactory.create())
                     //添加回调库，采用RxJava
                     .addCallAdapterFactory(RxJava2CallAdapterFactory.createWithScheduler(Schedulers.io()))
                     //设置使用okhttp网络请求
                     .client(prwsCloudOkHttpClient)
                     .build();
         }
         return prwsCloudRetrofit;
     }
 //    protected static Retrofit getWebViewRetrofit(String  API_SERVER) {
 //
 //        if (null == mWebRetrofit) {
 //
 //            if (null == mWebOkHttpClient) {
 //                mWebOkHttpClient = OkHttp3Utils.getOkHttpClient();
 //            }
 //
 //            //Retrofit2后使用build设计模式
 //            mWebRetrofit = new Retrofit.Builder()
 //                    //设置服务器路径
 //                    .baseUrl( API_SERVER +"/")
 //                    //添加转化库，默认是Gson
 //                    .addConverterFactory(GsonConverterFactory.create())
 //                    //添加回调库，采用RxJava
 //                    .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
 //                    //设置使用okhttp网络请求
 //                    .client(mWebOkHttpClient)
 //                    .build();
 //
 //        }
 //
 //        return mWebRetrofit;
 //    }
 }