From 5853e3f9408a94f93eb270bc6bc222980eeefe7c Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Mon, 19 Jun 2023 14:42:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9zip=E5=8C=85=E4=B8=ADo?= =?UTF-8?q?cr=E6=96=87=E4=BB=B6=E5=90=8E=E7=BC=80=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=AB=96=E5=90=91=E6=8B=8D=E6=91=84=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=80=9F=E5=BA=A6=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E5=8E=9F=E5=88=99=EF=BC=88=E5=8D=AB=E6=98=9F=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../outdoor/activity/PicturesActivity.java | 138 +++++++++--------- .../navinfo/outdoor/http/HttpInterface.java | 4 +- .../outdoor/util/PicturesSpeedCheck.kt | 4 +- 3 files changed, 73 insertions(+), 73 deletions(-) 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 97c942b..6f409ca 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java @@ -345,6 +345,21 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen return; } if (isChecked) { + // 如果当前手机是竖向，则不允许拍照 + if (Objects.requireNonNull(camera.getPictureSize()).getWidth() < camera.getPictureSize().getHeight()) { + isOration = true; + ToastUtils.Message(PicturesActivity.this, "不允许竖向拍摄..."); + picturesBuilder.append("camera 用户竖屏拍照 ,"); + stopTakePhoto(); + capturePicture.setChecked(false); + if (radioPicture != 1) { + capturePicture.setText("开始采集"); + capturePicture.setChecked(false); + } + return; + } else { + isOration = false; + } if (radioPicture != 1) { capturePicture.setText("暂停采集"); picturesBuilder.append(TimestampUtil.time()).append(",").append("capturePicture 点击了开始采集 ,"); @@ -513,25 +528,10 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen super.onPictureTaken(result); System.out.println("收到拍照按钮jieguo:"+result.getSize().toString()); isBack = true; - // 如果当前手机是竖向，则不允许拍照 - if (Objects.requireNonNull(camera.getPictureSize()).getWidth() < camera.getPictureSize().getHeight()) { - isOration = true; - ToastUtils.Message(PicturesActivity.this, "不允许竖向拍摄..."); - picturesBuilder.append("camera 用户竖屏拍照 ,"); - stopTakePhoto(); - capturePicture.setChecked(false); - if (radioPicture != 1) { - capturePicture.setText("开始采集"); - capturePicture.setChecked(false); - } - return; - } else { - isOration = false; - } // 道路任务增加检查 if (type == 4) { // 检测到当前车辆未移动，则无需进行拍摄 - if (!speedCheck.checkIsMove(LocationLifeCycle.getInstance().getMainLocation(), GPSUtils.getInstance(PicturesActivity.this).getSateliteCount())) { + if (!speedCheck.checkIsMove(LocationLifeCycle.getInstance().getMainLocation(), LocationLifeCycle.getInstance().getTencentLocation().getGPSRssi())) { com.github.lazylibrary.util.ToastUtils.showToast(PicturesActivity.this, "车辆静止中，暂停拍摄！"); return; } @@ -544,9 +544,9 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen } } else { isBack = false; - if (isOration) { - stopTakePhoto(); - } + stopTakePhoto(); +// if (isOration) { +// } if (radioPicture != 1) { capturePicture.setText("开始采集"); } @@ -623,56 +623,56 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen } } - class Jpg2WebpRunnable implements Runnable { - //private PictureResult pictureResult; - private File file; - private int count;/*线程重复执行的次数*/ - private boolean isBoolean; - private int index; - // 该转换执行次数，如果连续3次执行失败，则不再转换 - - public Jpg2WebpRunnable(/*PictureResult pictureResult,*/ File file, int count, boolean isBoolean, int index/*照片的索引*/) { - //this.pictureResult = pictureResult; - this.file = file; - this.count = count; - this.isBoolean = isBoolean; - this.index = index; - } - - @Override - public void run() { - if (file.exists() && file != null) { - initMarkerPaper(index); - if (PicturesActivity.this != null&&handler != null) { - if (radioPicture == 1) { - Message message = new Message(); - message.what = 0x103; - handler.sendMessage(message); - } else { - Message message = new Message(); - message.what = 0x104; - message.arg1 = index; - handler.sendMessage(message); - } - } - } else { - isBack = false; - if (isOration) { - stopTakePhoto(); - } - if (radioPicture != 1) { - capturePicture.setText("开始采集"); - } - capturePicture.setChecked(false); - runOnUiThread(new Runnable() { - @Override - public void run() { - ToastUtils.Message(PicturesActivity.this, "源文件不存在"); - } - }); - } - } - } +// class Jpg2WebpRunnable implements Runnable { +// //private PictureResult pictureResult; +// private File file; +// private int count;/*线程重复执行的次数*/ +// private boolean isBoolean; +// private int index; +// // 该转换执行次数，如果连续3次执行失败，则不再转换 +// +// public Jpg2WebpRunnable(/*PictureResult pictureResult,*/ File file, int count, boolean isBoolean, int index/*照片的索引*/) { +// //this.pictureResult = pictureResult; +// this.file = file; +// this.count = count; +// this.isBoolean = isBoolean; +// this.index = index; +// } +// +// @Override +// public void run() { +// if (file.exists() && file != null) { +// initMarkerPaper(index); +// if (PicturesActivity.this != null&&handler != null) { +// if (radioPicture == 1) { +// Message message = new Message(); +// message.what = 0x103; +// handler.sendMessage(message); +// } else { +// Message message = new Message(); +// message.what = 0x104; +// message.arg1 = index; +// handler.sendMessage(message); +// } +// } +// } else { +// isBack = false; +// if (isOration) { +// stopTakePhoto(); +// } +// if (radioPicture != 1) { +// capturePicture.setText("开始采集"); +// } +// capturePicture.setChecked(false); +// runOnUiThread(new Runnable() { +// @Override +// public void run() { +// ToastUtils.Message(PicturesActivity.this, "源文件不存在"); +// } +// }); +// } +// } +// } private void initLine() { if (geoWkt != null) { diff --git a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java index e9a998b..b98eed1 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -3,8 +3,8 @@ package com.navinfo.outdoor.http; public class HttpInterface { // public static final String IP = "http://172.23.138.133:9999/m4";//测试接口-IP public static final String IP0 = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//开发接口-外网 - public static final String IP1 = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试接口-外网 - public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 + public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试接口-外网 + public static final String IP2 = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 public static final String USER_PATH = "/user/";//我的 public static final String MSG_LIST_PATH = "/msgList/";//发现 public static final String USER_LOGIN_PATH = "/userlogin/";//登录 diff --git a/app/src/main/java/com/navinfo/outdoor/util/PicturesSpeedCheck.kt b/app/src/main/java/com/navinfo/outdoor/util/PicturesSpeedCheck.kt index e2de604..eec859b 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/PicturesSpeedCheck.kt +++ b/app/src/main/java/com/navinfo/outdoor/util/PicturesSpeedCheck.kt @@ -10,7 +10,7 @@ class PicturesSpeedCheck { /** * 与前面的4个点做检查，如果当前点位距离前面4个点的距离超过阈值，且当前卫星信号强度为中以上（8颗），则返回false * */ - fun checkIsMove(myLocation: MyLocation, sateliteCount: Int/*卫星颗数*/): Boolean { + fun checkIsMove(myLocation: MyLocation, gpsRssi: Int/*定位信号强度*/): Boolean { pointList.add(myLocation) if (pointList.size<5) { // 点位小于4个，不做判断，默认为运动中 return true @@ -19,7 +19,7 @@ class PicturesSpeedCheck { pointList.removeAt(0) } - if (sateliteCount<3) { // 腾讯定位信号强度不是“强”，则忽略速度判定 + if (gpsRssi<3) { // 腾讯定位信号强度不是“强”，则忽略速度判定 return true }