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

fix: 更新腾讯地图sdk版本，解决部分情况下无法登陆的问题

Browse Source
This commit is contained in:
xiaoyan
2023-01-13 10:38:31 +08:00
parent b1a89e1f05
commit 2a712986d7
8 changed files with 45 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/AndroidManifest.xml
View File

@@ -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

6
app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java
View File

@@ -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;

4
app/src/main/java/com/navinfo/outdoor/api/UserApplication.java
View File

@@ -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();
// 记录设备标识，反馈导航问题时请提供该设备标识以及发生问题的时间

6
app/src/main/java/com/navinfo/outdoor/base/NaviLifeCycle.java
View File

@@ -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;
}

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

@@ -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/";//登录

9
app/src/main/java/com/navinfo/outdoor/util/NaviUtils.java
View File

@@ -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;