从相册选择的识别调试成功了

app/src/main/java/com/miekir/ocr/tool/DateTool.java

@@ -12,6 +12,10 @@ import java.util.Locale;
  */
 public class DateTool {
     private DateTool(){}
+
+    /**
+     * 年月日时分秒毫秒
+     */
     private static final String FORMAT_REQUEST = "YYYYMMddHHmmssSSS";
     private static SimpleDateFormat mFormat = new SimpleDateFormat(FORMAT_REQUEST, Locale.getDefault());
 

app/src/main/java/com/miekir/ocr/ui/CameraActivity.java

@@ -405,9 +405,10 @@ public class CameraActivity extends BaseCameraActivity {
                 @Override
                 public void onCaptureCompleted(CameraCaptureSession session, CaptureRequest request, TotalCaptureResult result) {
                     super.onCaptureCompleted(session, request, result);
-
                     Toast.makeText(CameraActivity.this, "Saved:" + file, Toast.LENGTH_SHORT).show();
                     createCameraPreview();
+
+
                 }
 
             };

app/src/main/java/com/miekir/ocr/ui/OperationActivity.java

@@ -132,6 +132,8 @@ public class OperationActivity extends CameraActivity implements CropView.onLoca
     private void showResultDialog(OcrResult result) {
         AlertDialog dialog = new AlertDialog.Builder(this).setView(R.layout.dialog_result).create();
         dialog.show();
+        dialog.setCancelable(false);
+        dialog.setCanceledOnTouchOutside(false);
 
         dialog.findViewById(R.id.tv_copy).setOnClickListener(v -> {
             dialog.cancel();
@@ -142,7 +144,20 @@ public class OperationActivity extends CameraActivity implements CropView.onLoca
             SystemTool.copyText(OperationActivity.this, "");
             // todo 复制全部识别信息
             if (mCurrentType == CropView.SCAN_TYPE_ALL) {
-
+                StringBuilder builder = new StringBuilder();
+                if (result.postcode != null) {
+                    builder.append(result.postcode.getText()).append(",");
+                }
+                if (result.address != null) {
+                    builder.append(result.address.getText()).append(",");
+                }
+                if (result.name != null) {
+                    builder.append(result.name.getText()).append(",");
+                }
+                if (builder.length() > 0) {
+                    builder.deleteCharAt(builder.length()-1);
+                }
+                SystemTool.copyText(OperationActivity.this, builder.toString());
             } else if (mCurrentType == CropView.SCAN_TYPE_POSTAL) {
                 if (result.postcode != null) {
                     SystemTool.copyText(OperationActivity.this, result.postcode.getText());

app/src/main/java/com/miekir/ocr/ui/OperationPresenter.java

@@ -59,7 +59,7 @@ public class OperationPresenter extends BasePresenter<IOperationView> {
                 requestParams.put("appid", "10233937");
                 requestParams.put("image", photoBase64);
                 Map<String, Object> options = new HashMap<>();
-                options.put("options.scene", scene);
+                options.put("scene", scene);
                 requestParams.put("options", options);
 
                 // 发送识别请求

network/src/main/java/com/miekir/network/core/base/BaseResponse.java

@@ -9,7 +9,7 @@ public class BaseResponse<T> {
     private int code;
     private String message;
     private String request_id;
-    private T content;
+    private T data;
 
     /**
      *
@@ -27,11 +27,11 @@ public class BaseResponse<T> {
      * @return 返回数据
      */
     public T getContent() {
-        return content;
+        return data;
     }
 
     public void setContent(T content) {
-        this.content = content;
+        this.data = content;
     }
 
     /**