fix: 合并主线代码

.gitignore

@@ -14,4 +14,5 @@
 .externalNativeBuild
 .cxx
 app/release/
-ocr/build
+app/build/
+ocr/build/

app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java

@@ -105,6 +105,7 @@ import java.io.File;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
@@ -437,9 +438,10 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
 
         pictureResultFlowable.subscribeOn(Schedulers.io()) // 指定上游为IO线程
                 .observeOn(Schedulers.io())
-                .doOnNext(new Consumer<Map<String, Object>>() {
+                .doOnNext(new io.reactivex.functions.Consumer<Map<String, Object>>() {
                     @Override
                     public void accept(Map<String, Object> map) throws Exception {
+
                         int fileIndex = (int) map.get("index");
                         PictureResult pictureResult = (PictureResult) map.get("picture");
                         // 图片和paper.txt处理
@@ -464,9 +466,9 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
                     }
                 })
                 .observeOn(AndroidSchedulers.mainThread())
-                .doOnNext(new Consumer<Map>() {
+                .doOnNext(new io.reactivex.functions.Consumer<Map<String, Object>>() {
                     @Override
-                    public void accept(Map map) throws Exception {
+                    public void accept(Map<String, Object> map) {
                         // 绘制图标
                         initMarker(booleanExtra);
                         // 设置主界面拍照个数显示
@@ -1481,7 +1483,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
         } else {
             disposable = Observable.interval(1000L, TimeUnit.MILLISECONDS, Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new Consumer<Long>() {
+                    .subscribe(new io.reactivex.functions.Consumer<Long>() {
                         @Override
                         public void accept(Long aLong) throws Exception {
                             camera.takePictureSnapshot();

ocr/.gitignore

@@ -1 +1 @@
-/build
+build

ocr/build/.transforms/19d119ac36131040a9afa42f1d608a78/results.bin

@@ -1 +0,0 @@
-i/

ocr/build/.transforms/1d6ae1cb6e95c2e6d3aa91a2c6e66d74/results.bin

@@ -1 +0,0 @@
-o/debug

ocr/build/.transforms/5bde194afdb746f0975a6236a3ce1657/results.bin

@@ -1 +0,0 @@
-i/

ocr/build/.transforms/5bfbc0aa6c9f2ad69af05afa08af3d7d/results.bin

@@ -1 +0,0 @@
-i/

ocr/build/.transforms/6a97db2c670c449186359429e306ad8b/results.bin

@@ -1 +0,0 @@
-o/debug

ocr/build/.transforms/7fb5608adf9b77b84e129829eea9eb33/results.bin

@@ -1 +0,0 @@
-o/debug

ocr/build/.transforms/84a780d2f8da7f2d2d4b039eb1c95063/results.bin

@@ -1 +0,0 @@
-o/release

ocr/build/.transforms/98c9ee37cab4a14ee72a0566836396a2/results.bin

@@ -1 +0,0 @@
-o/debug

ocr/build/.transforms/f4b168ab17f39721e81801ec988e4f71/results.bin

@@ -1 +0,0 @@
-o/release