From b329f9dc548acd35406cd420d3157143c02b64fb Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Mon, 19 Jun 2023 16:50:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BA=86=E6=8B=8D?= =?UTF-8?q?=E6=91=84=E9=97=B4=E9=9A=94=E9=80=89=E6=8B=A9=E5=A4=B1=E6=95=88?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../com/navinfo/outdoor/activity/PicturesActivity.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7d16f4f..35d802c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,7 +37,7 @@ android { applicationId "com.navinfo.outdoor" minSdkVersion 24 targetSdkVersion 30 - versionCode 103 + versionCode 104 versionName "8.230619-正式版-OCR" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java index 6f409ca..604a860 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java @@ -1479,10 +1479,16 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen } private void startTakePhoto(int radioPicture) { - if (radioPicture == 1) { + if (radioPicture == 1) { // 手动拍摄 camera.takePictureSnapshot(); } else { - disposable = Observable.interval(1000L, TimeUnit.MILLISECONDS, Schedulers.io()) + long period = 1000L; + if (radioPicture == 3) { + period = 2000L; + } else if (radioPicture == 4) { + period = 500L; + } + disposable = Observable.interval(period, TimeUnit.MILLISECONDS, Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new io.reactivex.functions.Consumer() { @Override