xiaoyan159/NavinfoOutDoor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修改zip包中ocr文件后缀，修改竖向拍摄检查，修改速度检查原则（卫星）

Browse Source
This commit is contained in:
xiaoyan
2023-06-19 14:42:15 +08:00
parent 82605b895e
commit 5853e3f940
3 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java
View File

@@ -345,6 +345,21 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
return; return;
} }
if (isChecked) { 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) { if (radioPicture != 1) {
capturePicture.setText("暂停采集"); capturePicture.setText("暂停采集");
picturesBuilder.append(TimestampUtil.time()).append(",").append("capturePicture 点击了开始采集 ,"); picturesBuilder.append(TimestampUtil.time()).append(",").append("capturePicture 点击了开始采集 ,");
@@ -513,25 +528,10 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
super.onPictureTaken(result); super.onPictureTaken(result);
System.out.println("收到拍照按钮jieguo:"+result.getSize().toString()); System.out.println("收到拍照按钮jieguo:"+result.getSize().toString());
isBack = true; 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 (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, "车辆静止中，暂停拍摄！"); com.github.lazylibrary.util.ToastUtils.showToast(PicturesActivity.this, "车辆静止中，暂停拍摄！");
return; return;
} }
@@ -544,9 +544,9 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
} }
} else { } else {
isBack = false; isBack = false;
if (isOration) {
stopTakePhoto(); stopTakePhoto();
} // if (isOration) {
// }
if (radioPicture != 1) { if (radioPicture != 1) {
capturePicture.setText("开始采集"); capturePicture.setText("开始采集");
} }
@@ -623,56 +623,56 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
} }
} }
class Jpg2WebpRunnable implements Runnable { // class Jpg2WebpRunnable implements Runnable {
//private PictureResult pictureResult; // //private PictureResult pictureResult;
private File file; // private File file;
private int count;/*线程重复执行的次数*/ // private int count;/*线程重复执行的次数*/
private boolean isBoolean; // private boolean isBoolean;
private int index; // private int index;
// 该转换执行次数，如果连续3次执行失败，则不再转换 // // 该转换执行次数，如果连续3次执行失败，则不再转换
//
public Jpg2WebpRunnable(/*PictureResult pictureResult,*/ File file, int count, boolean isBoolean, int index/*照片的索引*/) { // public Jpg2WebpRunnable(/*PictureResult pictureResult,*/ File file, int count, boolean isBoolean, int index/*照片的索引*/) {
//this.pictureResult = pictureResult; // //this.pictureResult = pictureResult;
this.file = file; // this.file = file;
this.count = count; // this.count = count;
this.isBoolean = isBoolean; // this.isBoolean = isBoolean;
this.index = index; // this.index = index;
} // }
//
@Override // @Override
public void run() { // public void run() {
if (file.exists() && file != null) { // if (file.exists() && file != null) {
initMarkerPaper(index); // initMarkerPaper(index);
if (PicturesActivity.this != null&&handler != null) { // if (PicturesActivity.this != null&&handler != null) {
if (radioPicture == 1) { // if (radioPicture == 1) {
Message message = new Message(); // Message message = new Message();
message.what = 0x103; // message.what = 0x103;
handler.sendMessage(message); // handler.sendMessage(message);
} else { // } else {
Message message = new Message(); // Message message = new Message();
message.what = 0x104; // message.what = 0x104;
message.arg1 = index; // message.arg1 = index;
handler.sendMessage(message); // handler.sendMessage(message);
} // }
} // }
} else { // } else {
isBack = false; // isBack = false;
if (isOration) { // if (isOration) {
stopTakePhoto(); // stopTakePhoto();
} // }
if (radioPicture != 1) { // if (radioPicture != 1) {
capturePicture.setText("开始采集"); // capturePicture.setText("开始采集");
} // }
capturePicture.setChecked(false); // capturePicture.setChecked(false);
runOnUiThread(new Runnable() { // runOnUiThread(new Runnable() {
@Override // @Override
public void run() { // public void run() {
ToastUtils.Message(PicturesActivity.this, "源文件不存在"); // ToastUtils.Message(PicturesActivity.this, "源文件不存在");
} // }
}); // });
} // }
} // }
} // }
private void initLine() { private void initLine() {
if (geoWkt != null) { if (geoWkt != null) {

4
app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
View File

@@ -3,8 +3,8 @@ package com.navinfo.outdoor.http;
public class HttpInterface { public class HttpInterface {
// public static final String IP = "http://172.23.138.133:9999/m4";//测试接口-IP // 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 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/test/m4";//测试接口-外网
public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 public static final String IP2 = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口
public static final String USER_PATH = "/user/";//我的 public static final String USER_PATH = "/user/";//我的
public static final String MSG_LIST_PATH = "/msgList/";//发现 public static final String MSG_LIST_PATH = "/msgList/";//发现
public static final String USER_LOGIN_PATH = "/userlogin/";//登录 public static final String USER_LOGIN_PATH = "/userlogin/";//登录

4
app/src/main/java/com/navinfo/outdoor/util/PicturesSpeedCheck.kt
View File

@@ -10,7 +10,7 @@ class PicturesSpeedCheck {
/** /**
* 与前面的4个点做检查，如果当前点位距离前面4个点的距离超过阈值，且当前卫星信号强度为中以上（8颗），则返回false * 与前面的4个点做检查，如果当前点位距离前面4个点的距离超过阈值，且当前卫星信号强度为中以上（8颗），则返回false
* */ * */
fun checkIsMove(myLocation: MyLocation, sateliteCount: Int/*卫星颗数*/): Boolean { fun checkIsMove(myLocation: MyLocation, gpsRssi: Int/*定位信号强度*/): Boolean {
pointList.add(myLocation) pointList.add(myLocation)
if (pointList.size<5) { // 点位小于4个，不做判断，默认为运动中 if (pointList.size<5) { // 点位小于4个，不做判断，默认为运动中
return true return true
@@ -19,7 +19,7 @@ class PicturesSpeedCheck {
pointList.removeAt(0) pointList.removeAt(0)
} }
if (sateliteCount<3) { // 腾讯定位信号强度不是“强”，则忽略速度判定 if (gpsRssi<3) { // 腾讯定位信号强度不是“强”，则忽略速度判定
return true return true
} }