From 0459d1e87c260860da2649254deae630a662be15 Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Fri, 12 Aug 2022 15:22:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E9=87=87=E9=9B=86=E6=97=B6=E5=A4=A7=E5=9B=BE=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8D=E8=B7=9F=E9=9A=8F=E5=BD=93=E5=89=8D=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=9C=B0=E5=9B=BE=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                                   |  2 +-
 .../outdoor/activity/AutoTakePictureActivity.java  | 14 ++++++++------
 .../outdoor/fragment/ChargingStationFragment.java  |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1e19ba4..5b2618b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,7 +10,7 @@ android {
         minSdkVersion 24
         targetSdkVersion 30
         versionCode 25
-        versionName "8.220809"
+        versionName "8.220812"
         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 435d7aa..fb427d4 100644
--- a/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java
+++ b/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java
@@ -456,7 +456,6 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic
 
             @Override
             public boolean onFling(float v, float v1) {
-                setLocMarkerStyle(MyLocationStyle.LOCATION_TYPE_FOLLOW_NO_CENTER);
                 return false;
             }
 
@@ -472,6 +471,9 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic
 
             @Override
             public boolean onDown(float v, float v1) {
+                if (isMapSlide) {
+                    setLocMarkerStyle(MyLocationStyle.LOCATION_TYPE_FOLLOW_NO_CENTER);
+                }
                 return false;
             }
 
@@ -1385,10 +1387,10 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic
 
     // 设置当前界面亮度
     private void setWindowBrightness(int brightness) {
-        Window window = getWindow();
-        WindowManager.LayoutParams lp = window.getAttributes();
-        lp.screenBrightness = brightness / 255.0f;
-        window.setAttributes(lp);
+//        Window window = getWindow();
+//        WindowManager.LayoutParams lp = window.getAttributes();
+//        lp.screenBrightness = brightness / 255.0f;
+//        window.setAttributes(lp);
     }
 
     private TencentLocation obtainTecentLocation(LatLng latLng) {
@@ -1643,7 +1645,7 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic
                 return;
             }
             TencentLocation tencentLocation = (TencentLocation) msg.obj;
-            if (tencentMap != null && !isMapSlide) {
+            if (tencentMap != null && ivLocation!=null && !ivLocation.isEnabled()) { // 当定位按钮禁用，
                 CameraUpdate cameraSigma = CameraUpdateFactory.newCameraPosition(new CameraPosition(
                         new LatLng(tencentLocation.getLatitude(), tencentLocation.getLongitude()), //中心点坐标，地图目标经纬度
                         17,  //目标缩放级别
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java
index d2470a3..8ec29dd 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java
@@ -783,7 +783,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                 if (getPhoneBean.getCode() == 200) {
                     String code = getPhoneBean.getBody().getCode();
                     Integer telLength = getPhoneBean.getBody().getTelLength();
-                    if (!code.equals(Constant.CODE)) {
+                    if (!Constant.CODE.equals(code)) {
                         DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
                         MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "此地区区号为" + code + "，请手动修改", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
                             @Override