From 59c27070ce088570267a971c6652fbe614548c72 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 21 Sep 2023 16:35:23 +0800 Subject: [PATCH] [3.4.0-map-sdk] code style and add npl catch --- .../och/bus/fragment/BaseBusTabFragment.java | 4 +++- .../och/charter/base/CharterBaseFragment.kt | 7 +++---- .../och/bus/fragment/BaseBusTabFragment.java | 4 +++- .../mogo/och/taxi/ui/BaseTaxiTabFragment.java | 4 +++- .../och/taxi/passenger/utils/blur/Util.java | 5 +++-- .../taxi/bean/TaxiDriverTaskWithOrderBean.kt | 14 ++++++------- .../och/taxi/ui/base/BaseTaxiTabFragment.kt | 2 +- .../mogo/och/taxi/ui/task/TaxiTaskModel.kt | 3 --- codequality/custom-pmd-ruleset.xml | 14 +++++++++++++ .../core/utilcode/mogo/glide/utils/Util.java | 5 +++-- .../mogo/storage/lrucache/CacheUtil.java | 5 +++-- .../map/sdk/inner/byteh/PayloadDecoder.java | 5 +++-- .../map/sdk/inner/byteh/PayloadEncoder.java | 5 +++-- .../sdk/inner/marker/MarkerNativeInterface.kt | 21 +++++++++---------- .../map/sdk/inner/nav/NaviController.kt | 2 +- .../com/zhidaoauto/map/sdk/open/MapAutoApi.kt | 5 +++-- .../com/zhidaoauto/map/sdk/open/NavAutoApi.kt | 5 +++-- 17 files changed, 66 insertions(+), 44 deletions(-) diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java index a73242b151..43eebbf35c 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java @@ -543,7 +543,9 @@ public abstract class BaseBusTabFragment @Override public void onDestroy() { super.onDestroy(); - smallMapView.onDestroy(); + if(smallMapView != null){ + smallMapView.onDestroy(); + } MogoMapListenerHandler.Companion.getMogoMapListenerHandler().unregisterHostMapListener(TAG); } diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt index 81fbc508ed..2953cd6fe3 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt @@ -39,7 +39,7 @@ import com.mogo.map.uicontroller.VisualAngleMode import com.mogo.och.common.module.utils.SoundPoolHelper import kotlinx.android.synthetic.main.charter_base_fragment.* import org.greenrobot.eventbus.EventBus -import java.util.* +import kotlin.math.abs /** * @author: wangmingjun @@ -162,7 +162,6 @@ abstract class CharterBaseFragment?>() : mSettingBtn = findViewById(R.id.module_mogo_och_setting_layout) mSettingBtn!!.setOnClickListener { v: View? -> - // TODO: 2021/12/9 showToolsView() } @@ -473,7 +472,7 @@ abstract class CharterBaseFragment?>() : * @param newSpeed */ open fun updateSpeedView(newSpeed: Float) { - val speed = (Math.abs(newSpeed) * 3.6f).toInt() // 倒车时工控机反馈定位信息中speed为负值 + val speed = (abs(newSpeed) * 3.6f).toInt() // 倒车时工控机反馈定位信息中speed为负值 if (mTrafficDataView != null) { mTrafficDataView!!.updateSpeedWithValue(speed) } @@ -481,7 +480,7 @@ abstract class CharterBaseFragment?>() : override fun onDestroy() { super.onDestroy() - smallMapView!!.onDestroy() + smallMapView?.onDestroy() mogoMapListenerHandler.unregisterHostMapListener(TAG) } diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java index 16b1713065..d864c3f82e 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java @@ -560,7 +560,9 @@ public abstract class BaseBusTabFragment @Override public void onDestroy() { super.onDestroy(); - smallMapView.onDestroy(); + if(smallMapView != null){ + smallMapView.onDestroy(); + } MogoMapListenerHandler.Companion.getMogoMapListenerHandler().unregisterHostMapListener(TAG); } diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java index 6953426b58..28c22f948a 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java @@ -320,8 +320,10 @@ public abstract class BaseTaxiTabFragment> : MvpFragment.*/gen/.* .*Dagger*.* + + @@ -33,6 +35,18 @@ + + + + + + + + + + + + diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/glide/utils/Util.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/glide/utils/Util.java index 895f7e0e1d..7742d85464 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/glide/utils/Util.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/glide/utils/Util.java @@ -21,11 +21,12 @@ import java.io.IOException; import java.io.Reader; import java.io.StringWriter; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; /** Junk drawer of utility methods. */ final class Util { - static final Charset US_ASCII = Charset.forName("US-ASCII"); - static final Charset UTF_8 = Charset.forName("UTF-8"); + static final Charset US_ASCII = StandardCharsets.US_ASCII; + static final Charset UTF_8 = StandardCharsets.UTF_8; private Util() { } diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/lrucache/CacheUtil.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/lrucache/CacheUtil.java index ff440780d9..594a112108 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/lrucache/CacheUtil.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/lrucache/CacheUtil.java @@ -22,11 +22,12 @@ import java.io.IOException; import java.io.Reader; import java.io.StringWriter; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; /** Junk drawer of utility methods. */ final class CacheUtil { - static final Charset US_ASCII = Charset.forName("US-ASCII"); - static final Charset UTF_8 = Charset.forName("UTF-8"); + static final Charset US_ASCII = StandardCharsets.US_ASCII; + static final Charset UTF_8 = StandardCharsets.UTF_8; private CacheUtil() { } diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/byteh/PayloadDecoder.java b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/byteh/PayloadDecoder.java index 245ce1c4f4..baba1f3061 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/byteh/PayloadDecoder.java +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/byteh/PayloadDecoder.java @@ -2,6 +2,7 @@ package com.zhidaoauto.map.sdk.inner.byteh; import java.lang.reflect.Field; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.List; import io.netty.buffer.ByteBuf; @@ -40,7 +41,7 @@ public class PayloadDecoder { case "java.lang.Character": case "char": - CharSequence charSequence = buffer.readCharSequence(fieldWrapper.getCodecProprety().length(), Charset.forName("UTF-8")); + CharSequence charSequence = buffer.readCharSequence(fieldWrapper.getCodecProprety().length(), StandardCharsets.UTF_8); field.set(instance, charSequence); break; case "java.lang.Byte": @@ -74,7 +75,7 @@ public class PayloadDecoder { field.set(instance, readDouble); break; case "java.lang.String": - String readString = buffer.readCharSequence(fieldWrapper.getCodecProprety().length(), Charset.forName("UTF-8")).toString(); + String readString = buffer.readCharSequence(fieldWrapper.getCodecProprety().length(), StandardCharsets.UTF_8).toString(); field.set(instance, readString); break; default: 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..bdc6ed5c2f 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 @@ -4,6 +4,7 @@ import com.autonavi.nge.map.LonLat; import java.lang.reflect.Field; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.List; import io.netty.buffer.ByteBuf; @@ -50,7 +51,7 @@ public class PayloadEncoder { case "java.lang.Character": case "kotlin.Character": case "char": - buffer.writeCharSequence((CharSequence) value, Charset.forName("UTF-8")); + buffer.writeCharSequence((CharSequence) value, StandardCharsets.UTF_8); break; case "java.lang.Byte": case "kotlin.Byte": @@ -84,7 +85,7 @@ public class PayloadEncoder { break; case "java.lang.String": case "kotlin.String": - buffer.writeCharSequence((CharSequence) value, Charset.forName("UTF-8")); + buffer.writeCharSequence((CharSequence) value, StandardCharsets.UTF_8); break; default: throw new RuntimeException(typeName + "不支持，bug"); diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/marker/MarkerNativeInterface.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/marker/MarkerNativeInterface.kt index f25fae6999..547a375661 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/marker/MarkerNativeInterface.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/marker/MarkerNativeInterface.kt @@ -15,6 +15,7 @@ import com.zhidaoauto.map.sdk.open.tools.MD5Utils import com.zhidaoauto.map.sdk.open.tools.MapTools import io.netty.buffer.Unpooled import java.nio.charset.Charset +import java.nio.charset.StandardCharsets import java.util.* import java.util.concurrent.ConcurrentHashMap @@ -82,11 +83,11 @@ class MarkerNativeInterface(private val mMapController: IMapController): IMarker } override fun addMarkerIconCache(id: Int, icon: String) { - markerIconResourceCacheMap.put(id,icon) + markerIconResourceCacheMap[id] = icon } override fun getMarkerIconCache(id:Int):String?{ - return markerIconResourceCacheMap.get(id) + return markerIconResourceCacheMap[id] } @Synchronized @@ -103,7 +104,7 @@ class MarkerNativeInterface(private val mMapController: IMapController): IMarker * * @return */ - fun clearAllMarkers(): Boolean? { + fun clearAllMarkers(): Boolean { if(DEBUG){ Log.i(TAG,"markerop--clearAllMarkers:") } @@ -121,9 +122,7 @@ class MarkerNativeInterface(private val mMapController: IMapController): IMarker * @param title */ fun setTitle(id: String?, title: String?) { - updateMarkerProperty(id!!, "title", title!!) - } /** @@ -133,7 +132,7 @@ class MarkerNativeInterface(private val mMapController: IMapController): IMarker * @return */ fun getTitle(id: String?): String { - return getMarkerProperty(id!!, "title")?:"" + return getMarkerProperty(id!!, "title") } /** @@ -153,11 +152,11 @@ class MarkerNativeInterface(private val mMapController: IMapController): IMarker * @return */ fun getSnippet(id: String?): String { - return getMarkerProperty(id!!, "snippet")?:"" + return getMarkerProperty(id!!, "snippet") } fun isAnchorDynamicMoving(id: String): Boolean { - return mMapController.isAnchorDynamicMoving(id)?:false + return mMapController.isAnchorDynamicMoving(id) } /** @@ -502,7 +501,7 @@ class MarkerNativeInterface(private val mMapController: IMapController): IMarker refreshMap() } - fun addDynamicAnchorPostion(id: String, points: List,angle:Float, isGps:Boolean,current:Long,duration: Int) { + fun addDynamicAnchorPosition(id: String, points: List,angle:Float, isGps:Boolean,current:Long,duration: Int) { val data = MapTools.listToArray(points,!isGps) if(DEBUG){ Log.i(TAG,"markerop--addDynamicAnchorPostion:${id},${points},isGps:${isGps},duration:${duration}") @@ -611,7 +610,7 @@ class MarkerNativeInterface(private val mMapController: IMapController): IMarker } - //设置infowindow的偏移量 + //设置infoWindow的偏移量 fun setInfoWindowOffset(id: String, offsetX: Int, offsetY: Int) { if(DEBUG){ Log.i(TAG,"markerop--setInfoWindowOffset:${id},${offsetX},${offsetY}") @@ -738,7 +737,7 @@ class MarkerNativeInterface(private val mMapController: IMapController): IMarker mMapController.setAnchorFlash(id, colorType, color, time, angle) } - val charset = Charset.forName("UTF-8") + val charset: Charset = StandardCharsets.UTF_8 private fun dealMarker(markerPtions: MarkerOptions):ByteArray?{ val buffer = Unpooled.buffer() diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/nav/NaviController.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/nav/NaviController.kt index c1594fe865..98fdea2cfb 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/nav/NaviController.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/nav/NaviController.kt @@ -211,7 +211,7 @@ // Log.i(TAG, "navop-msg-getTts") // } // val datas = msg.obj as ByteArray -// currentTts = String(datas, Charset.forName("utf-8")) +// currentTts = String(datas, StandardCharsets.UTF_8) // if (DEBUG) { // Log.i(TAG, "navop-msg-getTts:${currentTts}") // } diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/MapAutoApi.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/MapAutoApi.kt index df51669da0..a58df64a4c 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/MapAutoApi.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/MapAutoApi.kt @@ -31,6 +31,7 @@ import com.zhidaoauto.map.sdk.open.view.MapAutoView import io.netty.buffer.Unpooled import java.math.BigDecimal import java.nio.charset.Charset +import java.nio.charset.StandardCharsets import kotlin.math.abs import kotlin.math.pow @@ -520,13 +521,13 @@ object MapAutoApi { val byteBuffer = Unpooled.buffer() val str = "1111112345678sjkfdhdkb" byteBuffer.writeInt(str.length) - byteBuffer.writeCharSequence(str, Charset.forName("utf-8")) + byteBuffer.writeCharSequence(str, StandardCharsets.UTF_8) byteBuffer.writeBoolean(true) byteBuffer.writeInt(999) byteBuffer.writeInt(12) val length = byteBuffer.readInt() println("$length") - println("${byteBuffer.readCharSequence(length, Charset.forName("utf-8"))}") + println("${byteBuffer.readCharSequence(length, StandardCharsets.UTF_8)}") println("${byteBuffer.readBoolean()}") println("${byteBuffer.readInt()}") diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/NavAutoApi.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/NavAutoApi.kt index c0457b824d..50364bbdad 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/NavAutoApi.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/NavAutoApi.kt @@ -12,6 +12,7 @@ import com.zhidaoauto.map.sdk.inner.utils.Recorder import io.netty.buffer.Unpooled import java.math.BigDecimal import java.nio.charset.Charset +import java.nio.charset.StandardCharsets import kotlin.math.pow object NavAutoApi { @@ -167,13 +168,13 @@ object NavAutoApi { val byteBuffer = Unpooled.buffer() val str = "1111112345678sjkfdhdkb" byteBuffer.writeInt(str.length) - byteBuffer.writeCharSequence(str, Charset.forName("utf-8")) + byteBuffer.writeCharSequence(str, StandardCharsets.UTF_8) byteBuffer.writeBoolean(true) byteBuffer.writeInt(999) byteBuffer.writeInt(12) val length = byteBuffer.readInt() println("$length") - println("${byteBuffer.readCharSequence(length, Charset.forName("utf-8"))}") + println("${byteBuffer.readCharSequence(length, StandardCharsets.UTF_8)}") println("${byteBuffer.readBoolean()}") println("${byteBuffer.readInt()}") }