From 480ff37026d8faa4553f61a9a76d486c9bc7f23b Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Wed, 11 Oct 2023 15:39:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=A6=96=E6=AC=A1?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E6=97=B6=EF=BC=8C=E5=9B=A0=E4=B8=BA=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D=E5=88=9D=E5=A7=8B=E5=8C=96=E9=97=AE=E9=A2=98=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E5=B4=A9=E6=BA=83=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 | 4 +- .../outdoor/activity/MainActivity.java | 46 +++++++++---------- .../navinfo/outdoor/http/HttpInterface.java | 8 ++-- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 487c59e..778ade9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,8 +37,8 @@ android { applicationId "com.navinfo.outdoor" minSdkVersion 24 targetSdkVersion 30 - versionCode 116 - versionName "8.230926-正式版" + versionCode 117 + versionName "8.231011-金山云测试版" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" ndk { diff --git a/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java index b925e8e..836701b 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java @@ -142,35 +142,35 @@ public class MainActivity extends BaseActivity { @Override public void onGranted(List permissions, boolean all) { if (all) { + LogConfiguration logConfiguration = new LogConfiguration.Builder() + // .enableStackTrace(5) +// .enableBorder() + .tag("XLog").build(); + Printer androidPrinter = new AndroidPrinter(true); // 通过 android.util.Log 打印日志的打印器 + Printer consolePrinter = new ConsolePrinter(); // 通过 System.out 打印日志到控制台的打印器 + Printer filePrinter = new FilePrinter // 打印日志到文件的打印器 + .Builder(Constant.LOG_FOLDER) // 指定保存日志文件的路径 + .fileNameGenerator(new LevelFileNameGenerator()) // 指定日志文件名生成器，默认为 ChangelessFileNameGenerator("log") + .flattener(new ClassicFlattener()) + .build(); + // 初始化XLog + XLog.init( // 初始化 XLog + logConfiguration, // 指定日志配置，如果不指定，会默认使用 new LogConfiguration.Builder().build() + androidPrinter, // 添加任意多的打印器。如果没有添加任何打印器，会默认使用 AndroidPrinter(Android)/ConsolePrinter(java) + consolePrinter, + filePrinter); + + // 尝试定位 + LocationLifeCycle.getInstance().init(getApplicationContext()); + // 开始获取腾讯定位信息 + LocationLifeCycle.getInstance().startTencentLocation(); + if (Constant.USHERED != null) { HttpInterface.initAppPath(Constant.USHERED); Constant.initRootFolder(Constant.USHERED); HttpInterface.initHttpInter(Constant.USHERED); // 检查版本 initCheckVersion(); - - LogConfiguration logConfiguration = new LogConfiguration.Builder() - // .enableStackTrace(5) -// .enableBorder() - .tag("XLog").build(); - Printer androidPrinter = new AndroidPrinter(true); // 通过 android.util.Log 打印日志的打印器 - Printer consolePrinter = new ConsolePrinter(); // 通过 System.out 打印日志到控制台的打印器 - Printer filePrinter = new FilePrinter // 打印日志到文件的打印器 - .Builder(Constant.LOG_FOLDER) // 指定保存日志文件的路径 - .fileNameGenerator(new LevelFileNameGenerator()) // 指定日志文件名生成器，默认为 ChangelessFileNameGenerator("log") - .flattener(new ClassicFlattener()) - .build(); - // 初始化XLog - XLog.init( // 初始化 XLog - logConfiguration, // 指定日志配置，如果不指定，会默认使用 new LogConfiguration.Builder().build() - androidPrinter, // 添加任意多的打印器。如果没有添加任何打印器，会默认使用 AndroidPrinter(Android)/ConsolePrinter(java) - consolePrinter, - filePrinter); - - // 尝试定位 - LocationLifeCycle.getInstance().init(getApplicationContext()); - // 开始获取腾讯定位信息 - LocationLifeCycle.getInstance().startTencentLocation(); } else { initTime(); } 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 73b89be..cce0106 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -4,10 +4,10 @@ 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://120.92.15.187/dtxb/test/m4";//开发接口-外网 -// public static final String IP_UPLOAD = "http://120.92.109.239/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 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";//心榕给的测试地址