fix: 更新腾讯地图sdk版本,解决部分情况下无法登陆的问题
This commit is contained in:
parent
b1a89e1f05
commit
2a712986d7
@ -12,8 +12,8 @@ android {
|
|||||||
applicationId "com.navinfo.outdoor"
|
applicationId "com.navinfo.outdoor"
|
||||||
minSdkVersion 23
|
minSdkVersion 23
|
||||||
targetSdkVersion 30
|
targetSdkVersion 30
|
||||||
versionCode 41
|
versionCode 42
|
||||||
versionName "8.230109"
|
versionName "8.230112"
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
lintOptions {
|
lintOptions {
|
||||||
@ -127,16 +127,16 @@ dependencies {
|
|||||||
|
|
||||||
//腾讯地图
|
//腾讯地图
|
||||||
// 地图库
|
// 地图库
|
||||||
implementation 'com.tencent.map:tencent-map-vector-sdk:4.5.4'
|
implementation 'com.tencent.map:tencent-map-vector-sdk:4.5.10'
|
||||||
// 地图组件库,包括小车平移、点聚合等组件功能,详见开发指南。
|
// // 地图组件库,包括小车平移、点聚合等组件功能,详见开发指南。
|
||||||
implementation 'com.tencent.map:sdk-utilities:1.0.6'
|
// 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
|
// 权限请求框架:https://github.com/getActivity/XXPermissions
|
||||||
implementation 'com.github.getActivity:XXPermissions:11.6'
|
implementation 'com.github.getActivity:XXPermissions:11.6'
|
||||||
|
@ -58,13 +58,13 @@
|
|||||||
android:supportsRtl="true"
|
android:supportsRtl="true"
|
||||||
android:theme="@style/Theme.WhiteScreen"
|
android:theme="@style/Theme.WhiteScreen"
|
||||||
tools:targetApi="n">
|
tools:targetApi="n">
|
||||||
<activity
|
<!-- <activity-->
|
||||||
android:name=".NaviActivity"
|
<!-- android:name=".NaviActivity"-->
|
||||||
android:exported="false">
|
<!-- android:exported="false">-->
|
||||||
<meta-data
|
<!-- <meta-data-->
|
||||||
android:name="android.app.lib_name"
|
<!-- android:name="android.app.lib_name"-->
|
||||||
android:value="" />
|
<!-- android:value="" />-->
|
||||||
</activity>
|
<!-- </activity>-->
|
||||||
<activity android:name=".activity.RegardMapActivity" />
|
<activity android:name=".activity.RegardMapActivity" />
|
||||||
<activity android:name=".activity.StatementActivity" />
|
<activity android:name=".activity.StatementActivity" />
|
||||||
<activity
|
<activity
|
||||||
|
@ -106,6 +106,7 @@ import com.tencent.map.navi.TencentNaviManager;
|
|||||||
import com.tencent.map.navi.TencentRouteSearchCallback;
|
import com.tencent.map.navi.TencentRouteSearchCallback;
|
||||||
import com.tencent.map.navi.data.AttachedLocation;
|
import com.tencent.map.navi.data.AttachedLocation;
|
||||||
import com.tencent.map.navi.data.CalcRouteResult;
|
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.NaviPoi;
|
||||||
import com.tencent.map.navi.data.NaviTts;
|
import com.tencent.map.navi.data.NaviTts;
|
||||||
import com.tencent.map.navi.data.ParallelRoadStatus;
|
import com.tencent.map.navi.data.ParallelRoadStatus;
|
||||||
@ -1135,6 +1136,11 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic
|
|||||||
public int onVoiceBroadcast(NaviTts naviTts) {
|
public int onVoiceBroadcast(NaviTts naviTts) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onEnterIdleSection(IdleRangeInfo idleRangeInfo) {
|
||||||
|
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
return polyline;
|
return polyline;
|
||||||
|
@ -30,6 +30,7 @@ import com.navinfo.outdoor.http.HttpInterface;
|
|||||||
import com.navinfo.outdoor.util.TalentLocationUtils;
|
import com.navinfo.outdoor.util.TalentLocationUtils;
|
||||||
import com.tencent.map.navi.TencentNavi;
|
import com.tencent.map.navi.TencentNavi;
|
||||||
import com.tencent.navi.surport.utils.DeviceUtils;
|
import com.tencent.navi.surport.utils.DeviceUtils;
|
||||||
|
import com.tencent.tencentmap.mapsdk.maps.TencentMapInitializer;
|
||||||
import com.umeng.commonsdk.UMConfigure;
|
import com.umeng.commonsdk.UMConfigure;
|
||||||
import com.umeng.message.IUmengRegisterCallback;
|
import com.umeng.message.IUmengRegisterCallback;
|
||||||
import com.umeng.message.MsgConstant;
|
import com.umeng.message.MsgConstant;
|
||||||
@ -63,6 +64,9 @@ public class UserApplication extends Application {
|
|||||||
TalentLocationUtils.getInstance(this).startLocation(this);
|
TalentLocationUtils.getInstance(this).startLocation(this);
|
||||||
//创建一个线程池
|
//创建一个线程池
|
||||||
fixedThreadPool = Executors.newSingleThreadExecutor(); // 使用单线程线程池
|
fixedThreadPool = Executors.newSingleThreadExecutor(); // 使用单线程线程池
|
||||||
|
|
||||||
|
TencentMapInitializer.setAgreePrivacy(true);
|
||||||
|
TencentNavi.setUserAgreePrivacy(true);
|
||||||
// 初始化腾讯导航
|
// 初始化腾讯导航
|
||||||
TencentNavi.Config config = new TencentNavi.Config();
|
TencentNavi.Config config = new TencentNavi.Config();
|
||||||
// 记录设备标识,反馈导航问题时请提供该设备标识以及发生问题的时间
|
// 记录设备标识,反馈导航问题时请提供该设备标识以及发生问题的时间
|
||||||
|
@ -5,12 +5,12 @@ import androidx.lifecycle.DefaultLifecycleObserver;
|
|||||||
import androidx.lifecycle.LifecycleOwner;
|
import androidx.lifecycle.LifecycleOwner;
|
||||||
|
|
||||||
import com.tencent.map.navi.car.CarNaviView;
|
import com.tencent.map.navi.car.CarNaviView;
|
||||||
import com.tencent.map.ui.c;
|
import com.tencent.map.ui.NaviView;
|
||||||
|
|
||||||
public class NaviLifeCycle implements DefaultLifecycleObserver {
|
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;
|
this.naviView = naviView;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2,9 +2,9 @@ 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 IPm = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//开发接口-外网
|
public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//开发接口-外网
|
||||||
public static final String IP1 = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试接口-外网
|
public static final String IP2 = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试接口-外网
|
||||||
public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口
|
public static final String IP1 = "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/";//登录
|
||||||
|
@ -30,6 +30,7 @@ import com.tencent.map.navi.car.CarRouteSearchOptions;
|
|||||||
import com.tencent.map.navi.car.TencentCarNaviManager;
|
import com.tencent.map.navi.car.TencentCarNaviManager;
|
||||||
import com.tencent.map.navi.data.AttachedLocation;
|
import com.tencent.map.navi.data.AttachedLocation;
|
||||||
import com.tencent.map.navi.data.CalcRouteResult;
|
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.NaviPoi;
|
||||||
import com.tencent.map.navi.data.NaviTts;
|
import com.tencent.map.navi.data.NaviTts;
|
||||||
import com.tencent.map.navi.data.NavigationData;
|
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.ui.car.CarNaviInfoPanel;
|
||||||
import com.tencent.map.navi.walk.TencentWalkNaviManager;
|
import com.tencent.map.navi.walk.TencentWalkNaviManager;
|
||||||
import com.tencent.map.navi.walk.WalkNaviView;
|
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.CameraUpdateFactory;
|
||||||
import com.tencent.tencentmap.mapsdk.maps.TencentMap;
|
import com.tencent.tencentmap.mapsdk.maps.TencentMap;
|
||||||
import com.tencent.tencentmap.mapsdk.maps.model.BitmapDescriptorFactory;
|
import com.tencent.tencentmap.mapsdk.maps.model.BitmapDescriptorFactory;
|
||||||
@ -120,7 +122,7 @@ public class NaviUtils {
|
|||||||
selectNaviTypeDialog.show();
|
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) { // 驾车
|
if (nav_type == Constant.NAV_TYPE.CAR) { // 驾车
|
||||||
CarNaviView carNaviView = (CarNaviView) naviView;
|
CarNaviView carNaviView = (CarNaviView) naviView;
|
||||||
naviManager = new TencentCarNaviManager(mContext);
|
naviManager = new TencentCarNaviManager(mContext);
|
||||||
@ -222,6 +224,11 @@ public class NaviUtils {
|
|||||||
public int onVoiceBroadcast(NaviTts naviTts) {
|
public int onVoiceBroadcast(NaviTts naviTts) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onEnterIdleSection(IdleRangeInfo idleRangeInfo) {
|
||||||
|
|
||||||
|
}
|
||||||
});
|
});
|
||||||
} else if (nav_type == Constant.NAV_TYPE.RIDE) { // 骑行
|
} else if (nav_type == Constant.NAV_TYPE.RIDE) { // 骑行
|
||||||
RideNaviView rideNaviView = (RideNaviView) naviView;
|
RideNaviView rideNaviView = (RideNaviView) naviView;
|
||||||
|
12
build.gradle
12
build.gradle
@ -4,13 +4,13 @@ buildscript {
|
|||||||
ext.kotlin_version = '1.5.10'
|
ext.kotlin_version = '1.5.10'
|
||||||
repositories {
|
repositories {
|
||||||
maven { url "https://jitpack.io" }
|
maven { url "https://jitpack.io" }
|
||||||
maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
|
|
||||||
//友盟 检测bug
|
|
||||||
maven { url 'https://repo1.maven.org/maven2/' }
|
|
||||||
//腾讯地图
|
//腾讯地图
|
||||||
maven{
|
maven{
|
||||||
url "https://oss.sonatype.org/content/groups/public"
|
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()
|
jcenter()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
google()
|
google()
|
||||||
@ -31,13 +31,13 @@ buildscript {
|
|||||||
allprojects {
|
allprojects {
|
||||||
repositories {
|
repositories {
|
||||||
maven { url "https://jitpack.io" }
|
maven { url "https://jitpack.io" }
|
||||||
maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
|
|
||||||
//友盟 检测bug
|
|
||||||
maven { url 'https://repo1.maven.org/maven2/' }
|
|
||||||
//腾讯地图
|
//腾讯地图
|
||||||
maven{
|
maven{
|
||||||
url "https://oss.sonatype.org/content/groups/public"
|
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()
|
jcenter()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
google()
|
google()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user