From 96304d65410dec7c36da05da6e70c347bf9c9e41 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 7 Dec 2023 17:07:32 +0800 Subject: [PATCH] [6.2.4] fix sonarbug --- .../module/map/AmapNaviToDestinationModel.java | 2 +- .../module/wigets/sfv/FrameSurfaceView.java | 8 ++++++++ .../bus/passenger/model/BusPassengerModel.java | 3 +++ .../mogo/och/sweepercloud/SweeperProvider.java | 4 ++-- .../och/sweeper/presenter/SweeperPresenter.java | 2 +- .../eagle/core/utilcode/util/CommonUtils.java | 2 +- .../map/sdk/inner/byteh/PayloadEncoder.java | 6 ++++-- .../zhidaoauto/map/sdk/inner/utils/MainInfo.java | 16 ++++++++-------- 8 files changed, 28 insertions(+), 15 deletions(-) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java index d49a3f7a34..317a4b9be0 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java @@ -46,7 +46,7 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { protected final List eList = new ArrayList(); protected List mWayPointList = new ArrayList(); private volatile ICommonNaviChangedCallback mNaviChangedCallback; - private AtomicInteger errorCount = new AtomicInteger(0); + private final AtomicInteger errorCount = new AtomicInteger(0); private boolean isPlay; public static AmapNaviToDestinationModel getInstance(Context context) { diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/sfv/FrameSurfaceView.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/sfv/FrameSurfaceView.java index 7b3ddd377a..8b8a303d7d 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/sfv/FrameSurfaceView.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/sfv/FrameSurfaceView.java @@ -1,5 +1,7 @@ package com.mogo.och.common.module.wigets.sfv; +import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_HMI; + import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -12,6 +14,8 @@ import android.os.Handler; import android.os.HandlerThread; import android.util.AttributeSet; +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; + import java.io.InputStream; import java.util.ArrayList; import java.util.List; @@ -21,6 +25,7 @@ import java.util.concurrent.atomic.AtomicInteger; * a SurfaceView which draws bitmaps one after another like frame animation */ public class FrameSurfaceView extends BaseSurfaceView { + private static final String TAG = "FrameSurfaceView"; public static final int INVALID_INDEX = Integer.MAX_VALUE; private final int bufferSize = 3; public static final String DECODE_THREAD_NAME = "DecodingThread"; @@ -320,6 +325,7 @@ public class FrameSurfaceView extends BaseSurfaceView { decodedBitmaps.put(linkedBitmap); } catch (InterruptedException e) { e.printStackTrace(); + CallerLogger.e(M_HMI + TAG, "decodeAndPutBitmap error"); } } @@ -338,6 +344,7 @@ public class FrameSurfaceView extends BaseSurfaceView { bitmap = drawnBitmaps.take(); } catch (InterruptedException e) { e.printStackTrace(); + CallerLogger.e(M_HMI + TAG, "getDrawnBitmap error"); } return bitmap; } @@ -354,6 +361,7 @@ public class FrameSurfaceView extends BaseSurfaceView { bitmap = decodedBitmaps.take(); } catch (InterruptedException e) { e.printStackTrace(); + CallerLogger.e(M_HMI + TAG, "getDecodedBitmap error"); } return bitmap; } diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java index 7c0ee5d18f..8613bdfb37 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java +++ b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java @@ -565,6 +565,9 @@ public class BusPassengerModel { public synchronized void onAutopilotRotting(@Nullable MessagePad.GlobalPathResp routeList) { // CallerLogger.d(M_BUS_P + TAG, "onAutopilotRotting = " // + GsonUtil.jsonFromObject(routeList)); + if(routeList == null){ + return; + } List routePoints = routeList.getWayPointsList(); if(globalPathTruncation!=null&&!globalPathTruncation.isDisposed()){ diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/SweeperProvider.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/SweeperProvider.java index 503ee93ce0..c24d2c0b49 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/SweeperProvider.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/SweeperProvider.java @@ -36,14 +36,14 @@ public class SweeperProvider implements IMogoOCH { FragmentManager supportFragmentManager = activity.getSupportFragmentManager(); if (sweeperFragment == null) { CallerLogger.d(TAG, "准备add fragment======"); - Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(sweeperFragment.TAG); + Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(SweeperFragment.TAG); if (fragmentByTag instanceof SweeperFragment) { sweeperFragment = (SweeperFragment) fragmentByTag; } else { sweeperFragment = new SweeperFragment(); } if(!sweeperFragment.isAdded()) { - supportFragmentManager.beginTransaction().add(containerId, sweeperFragment, sweeperFragment.TAG).commitAllowingStateLoss(); + supportFragmentManager.beginTransaction().add(containerId, sweeperFragment, SweeperFragment.TAG).commitAllowingStateLoss(); } return; } diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java index 451cd91a1a..68253f868c 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java @@ -354,7 +354,7 @@ public class SweeperPresenter extends Presenter } public static String format(double value) { - BigDecimal bd = new BigDecimal(value); + BigDecimal bd = BigDecimal.valueOf(value); bd = bd.setScale(2, RoundingMode.HALF_UP); return bd.toString(); } diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/CommonUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/CommonUtils.java index b08328aa46..b9808d3a2f 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/CommonUtils.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/CommonUtils.java @@ -580,7 +580,7 @@ public class CommonUtils { } BufferedReader in = new BufferedReader(new InputStreamReader(proc.getInputStream())); StringBuffer stringBuffer = new StringBuffer(); - String line = null; + String line; while ((line = in.readLine()) != null) { stringBuffer.append(line + " "); diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/byteh/PayloadEncoder.java b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/byteh/PayloadEncoder.java index 6f3f27d43e..dcb5928cc9 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/byteh/PayloadEncoder.java +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/byteh/PayloadEncoder.java @@ -39,8 +39,10 @@ public class PayloadEncoder { switch (typeName) { case "com.autonavi.nge.map.LonLat": LonLat lonLat = (LonLat) value; - buffer.writeDouble(lonLat.getLon()); - buffer.writeDouble(lonLat.getLat()); + if(lonLat != null){ + buffer.writeDouble(lonLat.getLon()); + buffer.writeDouble(lonLat.getLat()); + } break; case "java.lang.Boolean": case "kotlin.Boolean": diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/utils/MainInfo.java b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/utils/MainInfo.java index c3817df850..11c6df6f8d 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/utils/MainInfo.java +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/utils/MainInfo.java @@ -2,6 +2,7 @@ package com.zhidaoauto.map.sdk.inner.utils; import java.io.File; import java.io.FileWriter; +import java.io.IOException; import java.io.PrintWriter; import java.text.SimpleDateFormat; import java.util.Date; @@ -33,12 +34,11 @@ public class MainInfo { if (null == dir) { return; } - try { - FileWriter fw = new FileWriter((dir + "log.txt"), true); + try(FileWriter fw = new FileWriter((dir + "log.txt"), true)){ String date = dateFormat.format(new Date()); fw.write(date + " " + log + "\r\n"); - fw.close(); - } catch (Exception ex) { + } catch (IOException e) { + e.printStackTrace(); } } @@ -50,11 +50,11 @@ public class MainInfo { if (null == dir) { return; } - try { - FileWriter fw = new FileWriter((dir + "log.txt"), true); + + try(FileWriter fw = new FileWriter((dir + "log.txt"), true)){ e.printStackTrace(new PrintWriter(fw)); - fw.close(); - } catch (Exception ex) { + } catch (IOException ex) { + ex.printStackTrace(); } }