From 2a712986d7eba2618035714443c74460974dabd5 Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Fri, 13 Jan 2023 10:38:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E8=85=BE=E8=AE=AF?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BEsdk=E7=89=88=E6=9C=AC=EF=BC=8C=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E9=83=A8=E5=88=86=E6=83=85=E5=86=B5=E4=B8=8B=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E7=99=BB=E9=99=86=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                                 | 16 ++++++++--------
 app/src/main/AndroidManifest.xml                 | 14 +++++++-------
 .../activity/AutoTakePictureActivity.java        |  6 ++++++
 .../com/navinfo/outdoor/api/UserApplication.java |  4 ++++
 .../com/navinfo/outdoor/base/NaviLifeCycle.java  |  6 +++---
 .../com/navinfo/outdoor/http/HttpInterface.java  |  6 +++---
 .../java/com/navinfo/outdoor/util/NaviUtils.java |  9 ++++++++-
 build.gradle                                     | 12 ++++++------
 8 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b61baec..25fbade 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "com.navinfo.outdoor"
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 41
-        versionName "8.230109"
+        versionCode 42
+        versionName "8.230112"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
@@ -127,16 +127,16 @@ dependencies {
 
     //腾讯地图
     // 地图库
-    implementation 'com.tencent.map:tencent-map-vector-sdk:4.5.4'
-    // 地图组件库，包括小车平移、点聚合等组件功能，详见开发指南。
-    implementation 'com.tencent.map:sdk-utilities:1.0.6'
+    implementation 'com.tencent.map:tencent-map-vector-sdk:4.5.10'
+//    // 地图组件库，包括小车平移、点聚合等组件功能，详见开发指南。
+//    implementation 'com.tencent.map:sdk-utilities:1.0.6'
     // 导航库
-    implementation "com.tencent.map:tencent-map-nav-sdk:5.3.8.1"
+    implementation ("com.tencent.map:tencent-map-nav-sdk:5.4.2.3")
     // 导航依赖库
-    implementation 'com.tencent.map:tencent-map-nav-surport:1.0.2.9'
+    implementation ("com.tencent.map:tencent-map-nav-surport:1.1.0.1")
 
 //    //腾讯地图 定位
-//    implementation 'com.tencent.map.geolocation:TencentLocationSdk-openplatform:7.2.6'
+//    implementation 'com.tencent.map.geolocation:TencentLocationSdk-openplatform:7.4.9'
 
     // 权限请求框架：https://github.com/getActivity/XXPermissions
     implementation 'com.github.getActivity:XXPermissions:11.6'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index db73bc6..088f0f2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -58,13 +58,13 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.WhiteScreen"
         tools:targetApi="n">
-        <activity
-            android:name=".NaviActivity"
-            android:exported="false">
-            <meta-data
-                android:name="android.app.lib_name"
-                android:value="" />
-        </activity>
+<!--        <activity-->
+<!--            android:name=".NaviActivity"-->
+<!--            android:exported="false">-->
+<!--            <meta-data-->
+<!--                android:name="android.app.lib_name"-->
+<!--                android:value="" />-->
+<!--        </activity>-->
         <activity android:name=".activity.RegardMapActivity" />
         <activity android:name=".activity.StatementActivity" />
         <activity
diff --git a/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java
index 35635af..3603214 100644
--- a/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java
+++ b/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java
@@ -106,6 +106,7 @@ import com.tencent.map.navi.TencentNaviManager;
 import com.tencent.map.navi.TencentRouteSearchCallback;
 import com.tencent.map.navi.data.AttachedLocation;
 import com.tencent.map.navi.data.CalcRouteResult;
+import com.tencent.map.navi.data.IdleRangeInfo;
 import com.tencent.map.navi.data.NaviPoi;
 import com.tencent.map.navi.data.NaviTts;
 import com.tencent.map.navi.data.ParallelRoadStatus;
@@ -1135,6 +1136,11 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic
                 public int onVoiceBroadcast(NaviTts naviTts) {
                     return 0;
                 }
+
+                @Override
+                public void onEnterIdleSection(IdleRangeInfo idleRangeInfo) {
+
+                }
             });
         }
         return polyline;
diff --git a/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java b/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java
index 61f56bf..ba61f24 100644
--- a/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java
+++ b/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java
@@ -30,6 +30,7 @@ import com.navinfo.outdoor.http.HttpInterface;
 import com.navinfo.outdoor.util.TalentLocationUtils;
 import com.tencent.map.navi.TencentNavi;
 import com.tencent.navi.surport.utils.DeviceUtils;
+import com.tencent.tencentmap.mapsdk.maps.TencentMapInitializer;
 import com.umeng.commonsdk.UMConfigure;
 import com.umeng.message.IUmengRegisterCallback;
 import com.umeng.message.MsgConstant;
@@ -63,6 +64,9 @@ public class UserApplication extends Application {
         TalentLocationUtils.getInstance(this).startLocation(this);
         //创建一个线程池
         fixedThreadPool = Executors.newSingleThreadExecutor(); // 使用单线程线程池
+
+        TencentMapInitializer.setAgreePrivacy(true);
+        TencentNavi.setUserAgreePrivacy(true);
         // 初始化腾讯导航
         TencentNavi.Config config = new TencentNavi.Config();
         // 记录设备标识，反馈导航问题时请提供该设备标识以及发生问题的时间
diff --git a/app/src/main/java/com/navinfo/outdoor/base/NaviLifeCycle.java b/app/src/main/java/com/navinfo/outdoor/base/NaviLifeCycle.java
index d2af979..13a913c 100644
--- a/app/src/main/java/com/navinfo/outdoor/base/NaviLifeCycle.java
+++ b/app/src/main/java/com/navinfo/outdoor/base/NaviLifeCycle.java
@@ -5,12 +5,12 @@ import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 
 import com.tencent.map.navi.car.CarNaviView;
-import com.tencent.map.ui.c;
+import com.tencent.map.ui.NaviView;
 
 public class NaviLifeCycle implements DefaultLifecycleObserver {
-    private com.tencent.map.ui.c naviView;
+    private NaviView naviView;
 
-    public NaviLifeCycle(c naviView) {
+    public NaviLifeCycle(NaviView naviView) {
         this.naviView = naviView;
     }
 
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 e73822a..6dbca73 100644
--- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
+++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
@@ -2,9 +2,9 @@ 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 IPm = "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/dev/m4";//开发接口-外网
+    public static final String IP2 = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试接口-外网
+    public static final String IP1 = "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/NaviUtils.java b/app/src/main/java/com/navinfo/outdoor/util/NaviUtils.java
index f5af4b4..f2dde43 100644
--- a/app/src/main/java/com/navinfo/outdoor/util/NaviUtils.java
+++ b/app/src/main/java/com/navinfo/outdoor/util/NaviUtils.java
@@ -30,6 +30,7 @@ import com.tencent.map.navi.car.CarRouteSearchOptions;
 import com.tencent.map.navi.car.TencentCarNaviManager;
 import com.tencent.map.navi.data.AttachedLocation;
 import com.tencent.map.navi.data.CalcRouteResult;
+import com.tencent.map.navi.data.IdleRangeInfo;
 import com.tencent.map.navi.data.NaviPoi;
 import com.tencent.map.navi.data.NaviTts;
 import com.tencent.map.navi.data.NavigationData;
@@ -43,6 +44,7 @@ import com.tencent.map.navi.ride.TencentRideNaviManager;
 import com.tencent.map.navi.ui.car.CarNaviInfoPanel;
 import com.tencent.map.navi.walk.TencentWalkNaviManager;
 import com.tencent.map.navi.walk.WalkNaviView;
+import com.tencent.map.ui.NaviView;
 import com.tencent.tencentmap.mapsdk.maps.CameraUpdateFactory;
 import com.tencent.tencentmap.mapsdk.maps.TencentMap;
 import com.tencent.tencentmap.mapsdk.maps.model.BitmapDescriptorFactory;
@@ -120,7 +122,7 @@ public class NaviUtils {
         selectNaviTypeDialog.show();
     }
 
-    public TencentNaviManager obitainnaviManager(Activity mContext, Constant.NAV_TYPE nav_type, com.tencent.map.ui.c naviView) {
+    public TencentNaviManager obitainnaviManager(Activity mContext, Constant.NAV_TYPE nav_type, NaviView naviView) {
         if (nav_type == Constant.NAV_TYPE.CAR) { // 驾车
             CarNaviView carNaviView = (CarNaviView) naviView;
             naviManager = new TencentCarNaviManager(mContext);
@@ -222,6 +224,11 @@ public class NaviUtils {
                 public int onVoiceBroadcast(NaviTts naviTts) {
                     return 0;
                 }
+
+                @Override
+                public void onEnterIdleSection(IdleRangeInfo idleRangeInfo) {
+
+                }
             });
         } else if (nav_type == Constant.NAV_TYPE.RIDE) { // 骑行
             RideNaviView rideNaviView = (RideNaviView) naviView;
diff --git a/build.gradle b/build.gradle
index 823b054..4b6233f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,13 +4,13 @@ buildscript {
     ext.kotlin_version = '1.5.10'
     repositories {
         maven { url "https://jitpack.io" }
-        maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
-        //友盟 检测bug
-        maven { url 'https://repo1.maven.org/maven2/' }
         //腾讯地图
         maven{
             url "https://oss.sonatype.org/content/groups/public"
         }
+        maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
+        //友盟 检测bug
+        maven { url 'https://repo1.maven.org/maven2/' }
         jcenter()
         mavenCentral()
         google()
@@ -31,13 +31,13 @@ buildscript {
 allprojects {
     repositories {
         maven { url "https://jitpack.io" }
-        maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
-        //友盟 检测bug
-        maven { url 'https://repo1.maven.org/maven2/' }
         //腾讯地图
         maven{
             url "https://oss.sonatype.org/content/groups/public"
         }
+        maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
+        //友盟 检测bug
+        maven { url 'https://repo1.maven.org/maven2/' }
         jcenter()
         mavenCentral()
         google()