diff --git a/app/build.gradle b/app/build.gradle index 2dfe5be..7f26e85 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { applicationId "com.navinfo.outdoor" minSdkVersion 23 targetSdkVersion 30 - versionCode 32 - versionName "8.221125" + versionCode 33 + versionName "8.221129" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { 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 99a439f..d596295 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java @@ -219,7 +219,7 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic private MediaPlayer mediaPlayer; private ImageView imgNaviDistance/*自动规划到距离最近的数据开关*/, imgRoadDirection; // 道路方向匹配开关 private Polyline currentNaviLine; // 当前界面上正显示的导航路径线,重绘路径时需要清除此前已绘制的路径 - private boolean startMatchEnableDirection = false; // 是否启用方向匹配起点 + private boolean startMatchEnableDirection = true; // 是否启用方向匹配起点 @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -271,6 +271,7 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic btnStopPicture = findViewById(R.id.btn_stop_picture); imgNaviDistance = findViewById(R.id.img_navi_distance); imgRoadDirection = findViewById(R.id.img_road_direction); + imgRoadDirection.setSelected(true); //获取地图 tencentMap = tvMapView.getMap(); @@ -418,6 +419,7 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic Toast.makeText(AutoTakePictureActivity.this, "打开设置功能", Toast.LENGTH_SHORT).show(); btnSetting.setVisibility(View.VISIBLE); locationSwitch.setVisibility(View.VISIBLE); + imgRoadDirection.setVisibility(View.VISIBLE); } else { if (settingHookClickCount>3) { Toast.makeText(AutoTakePictureActivity.this, "再点击"+(9-settingHookClickCount)+"下打开设置功能", Toast.LENGTH_SHORT).show(); @@ -1429,7 +1431,7 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic tencentMap.animateCamera(cameraSigma); } // 设置当前地图的定位显示模式为跟随 - setLocMarkerStyle(LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER); + setLocMarkerStyle(LOCATION_TYPE_LOCATION_ROTATE); break; } } @@ -1504,7 +1506,7 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic ivZoomAdd.setVisibility(View.GONE); ivZoomDel.setVisibility(View.GONE); ivLocation.setVisibility(View.GONE); - setLocMarkerStyle(LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER); + setLocMarkerStyle(LOCATION_TYPE_LOCATION_ROTATE); // 道路水平方向图标显示 ivPicRoadImage.setVisibility(View.VISIBLE); } @@ -1515,7 +1517,7 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic ivZoomAdd.setVisibility(View.VISIBLE); ivZoomDel.setVisibility(View.VISIBLE); ivLocation.setVisibility(View.VISIBLE); - setLocMarkerStyle(LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER); + setLocMarkerStyle(LOCATION_TYPE_LOCATION_ROTATE); // 道路水平方向图标不显示 ivPicRoadImage.setVisibility(View.GONE); } 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..720779c 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -3,8 +3,8 @@ 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/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/res/layout/activity_auto_take_pictures.xml b/app/src/main/res/layout/activity_auto_take_pictures.xml index 6326eaa..c7c624f 100644 --- a/app/src/main/res/layout/activity_auto_take_pictures.xml +++ b/app/src/main/res/layout/activity_auto_take_pictures.xml @@ -130,7 +130,7 @@ android:layout_width="36dp" android:layout_height="36dp" android:background="@drawable/selector_round_bg" - android:layout_marginTop="25dp" + android:layout_marginTop="35dp" android:src="@drawable/selector_picture_map_change" android:padding="@dimen/default_widget_padding" android:layout_marginRight="@dimen/default_widget_padding" @@ -176,6 +176,7 @@ android:id="@+id/img_road_direction" android:layout_width="36dp" android:layout_height="36dp" + android:visibility="gone" android:background="@drawable/selector_round_bg" android:text="起点方向捕捉" android:src="@drawable/selector_direction"