From 6153bb607c55581abdf35adfec81ee25a13d0ffb Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Thu, 9 Nov 2023 16:33:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../navinfo/outdoor/http/HttpInterface.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) 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 cce0106..fb7cc7d 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -1,16 +1,17 @@ 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 IP = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//开发接口-外网 + // 开发 +// public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//开发地址 +// public static final String IP_UPLOAD = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//开发接口-数据上传 -// public static final String IP = "http://120.92.212.218/dtxb/test/m4";//金山云接口地址 -// public static final String IP_UPLOAD = "http://120.131.12.158/dtxb/test/m4";//金山云接口地址-数据上传 - public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//正式环境接口 - public static final String IP_UPLOAD = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//正式环境接口 - public static final String IP1 = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试接口-外网 - public static final String IP2 = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 - public static final String IP4 = "http://10.130.23.166/dtxb/jinshan/m4";//心榕给的测试地址 + // 测试 + public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试环境接口 + public static final String IP_UPLOAD = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试环境接口-数据上传 + + // 生产 +// public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/m4";//生产地址 +// public static final String IP_UPLOAD = "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/";//登录 From d59e2e65abc6423c84cc7f6dc5fcade4172ca3f2 Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Fri, 10 Nov 2023 11:04:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 778ade9..6c44d1c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,8 +37,8 @@ android { applicationId "com.navinfo.outdoor" minSdkVersion 24 targetSdkVersion 30 - versionCode 117 - versionName "8.231011-金山云测试版" + versionCode 118 + versionName "8.231110-测试版" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" ndk { From b6ea2b74e0ffb3cd1bb7c960547a24eb12fbcacf Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Mon, 20 Nov 2023 10:25:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9POI=E5=BD=95?= =?UTF-8?q?=E5=83=8F=E6=B2=A1=E6=9C=89=E7=AB=96=E5=90=91=E6=8B=8D=E6=91=84?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/AutoTakePicture4PoiVideoActivity.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePicture4PoiVideoActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePicture4PoiVideoActivity.java index ee7dc91..0fb4866 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePicture4PoiVideoActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePicture4PoiVideoActivity.java @@ -522,11 +522,11 @@ public class AutoTakePicture4PoiVideoActivity extends BaseActivity implements Vi super.onPictureTaken(result); System.out.println("收到拍照按钮jieguo:"+result.getSize().toString()); // poi录像不强制要求必须为横向拍照 -// if (Objects.requireNonNull(camera.getSnapshotSize()).getWidth() < camera.getSnapshotSize().getHeight()) { -// ToastUtils.Message(AutoTakePicture4PoiVideoActivity.this, "不允许竖向拍摄..."); -// systemTTS.playText("不允许竖向拍摄"); -// return; -// } + if (Objects.requireNonNull(camera.getSnapshotSize()).getWidth() < camera.getSnapshotSize().getHeight()) { + ToastUtils.Message(AutoTakePicture4PoiVideoActivity.this, "不允许竖向拍摄..."); + systemTTS.playText("不允许竖向拍摄"); + return; + } File tmpPicFolder = new File(tmpPicFoldPath); if (!tmpPicFolder.exists()) {