From 4721b031b30c44cd7e96a372c7f5a6a07b598551 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Wed, 23 Aug 2023 18:30:00 +0800 Subject: [PATCH 01/11] =?UTF-8?q?[6.0.0]=E6=B6=88=E6=81=AF=E7=9B=92?= =?UTF-8?q?=E5=AD=90M1=E4=B9=98=E5=AE=A2=E7=AB=AF=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=A9=BA=E7=99=BD=E7=AB=99=E4=BD=8D=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/hmi/ui/msgbox/MMsgBoxListView.kt | 10 ++++++++++ .../res/drawable-xhdpi/icon_m_msg_empty.png | Bin 0 -> 37746 bytes .../main/res/layout/layout_m_msg_box_list.xml | 11 +++++++++++ 3 files changed, 21 insertions(+) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_m_msg_empty.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxListView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxListView.kt index 9109c47a41..f6f930fba8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxListView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxListView.kt @@ -4,7 +4,9 @@ import android.app.Activity import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater +import android.view.View import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.view.isVisible import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager import com.mogo.eagle.core.data.msgbox.MsgBoxBean @@ -55,6 +57,11 @@ class MMsgBoxListView @JvmOverloads constructor( //获取通知消息列表 noticeList= CallerMsgBoxManager.getCachedNotifyData() as ArrayList? noticeList = noticeList?.let { ArrayList(it.reversed()) } + if(noticeList.isNullOrEmpty()){ + ivMsgEmpty.visibility = View.VISIBLE + }else{ + ivMsgEmpty.visibility = View.GONE + } noticeList?.let { mMsgBoxListAdapter?.setData(it) } @@ -68,6 +75,9 @@ class MMsgBoxListView @JvmOverloads constructor( || msgBoxList.type == MsgBoxType.OBU || msgBoxList.type == MsgBoxType.OPERATION){ noticeList?.add(0,msgBoxList) noticeList?.let { + if(it.isNotEmpty() && ivMsgEmpty.isVisible){ + ivMsgEmpty.visibility = View.GONE + } mMsgBoxListAdapter?.setData(it) } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_m_msg_empty.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_m_msg_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..1bfa26eea98efa04489b53168a89d024807f8bfb GIT binary patch literal 37746 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 + + From f31426e4834f639911e5396975d8285755a24d8a Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 23 Aug 2023 18:47:39 +0800 Subject: [PATCH 02/11] [6.0.0] add trace --- .../com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt | 2 +- .../com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt | 3 +++ .../eagle/core/function/hmi/ui/tools/ToBindingCarDialog.kt | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt index d43a8fa931..5e6608263c 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt @@ -114,7 +114,7 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback, V2XScenarioManager.getInstance().handlerMessage(v2XMessageEntity) V2XBizTrace.onAck("巡航处理 handlerMessage v2XMessageEntity", " $v2XMessageEntity") }else{ - V2XBizTrace.onAck("事件未触发", " $distance") + V2XBizTrace.onAck("事件未触发", mapOf("roadEvent" to v2XRoadEventEntity, "distance" to distance)) } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt index e63fc5346c..bd4506b7a4 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt @@ -38,6 +38,7 @@ import com.mogo.eagle.core.function.hmi.ui.tools.AdUpgradeDialog import com.mogo.eagle.core.function.hmi.ui.tools.ModifyBindingCarDialog import com.mogo.eagle.core.function.hmi.ui.tools.ToBindingCarDialog import com.mogo.eagle.core.function.hmi.ui.tools.UpgradeAppDialog +import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog import com.mogo.eagle.core.function.hmi.ui.vehicle.TurnLightViewStatus import com.mogo.eagle.core.function.hmi.ui.widget.StatusBarView import com.mogo.eagle.core.utilcode.floating.* @@ -284,12 +285,14 @@ class MoGoHmiProvider : IMoGoHmiProvider { override fun showToBindingCarDialog() { if (context != null) { + HmiActionLog.hmiAction(TAG, "showToBindingCarDialog") ToBindingCarDialog.show(context) } } override fun showModifyBindingCarDialog() { if (context != null) { + HmiActionLog.hmiAction(TAG, "showModifyBindingCarDialog") ModifyBindingCarDialog.show(context) } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/ToBindingCarDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/ToBindingCarDialog.kt index 9f0c04ae9b..fd6ff11f66 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/ToBindingCarDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/ToBindingCarDialog.kt @@ -9,6 +9,7 @@ import com.mogo.commons.module.status.StatusDescriptor import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog +import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog import com.mogo.eagle.core.utilcode.mogo.toast.TipToast @@ -56,10 +57,12 @@ class ToBindingCarDialog(context: Context) : BaseFloatDialog(context), Lifecycle cancelTv = findViewById(R.id.tv_to_bindingcar_cancel) confirmTv?.setOnClickListener { + HmiActionLog.hmiAction(TAG,"toBindingCar") toBindingCar() } cancelTv?.setOnClickListener { + HmiActionLog.hmiAction(TAG,"dismiss") dismiss() } From f2876772b170b28c1f0c65bb4baaf3a8b478f32d Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 23 Aug 2023 20:19:15 +0800 Subject: [PATCH 03/11] =?UTF-8?q?[6.0.0]=20[charter]=20[=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=8F=98=E6=9B=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../charter_p_only_unlocking.png | Bin 31469 -> 31220 bytes .../res/drawable-nodpi/open_lock_000_0.png | Bin 0 -> 314 bytes .../res/layout/m1_devices_lock_unlock.xml | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_000_0.png diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_only_unlocking.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_only_unlocking.png index acfec927885c49885af576adc51b4a27b45427da..57bd0db5d23eb2e434af92e0f204bd07f0ce1e5b 100644 GIT binary patch literal 31220 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 literal 31469 zcmV)iK%&2iP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91w4eh31ONa40RR91v;Y7A09MtOc>n-F07*naRCodGy$8T%Nm=Jx@B8J{ z-CyVK$vrs`hBVB8!;nQ*cXdVOs(@F;uzMBvdfhcH$X;FCMG-{>1Ll!|%Yp=*5g3OI z&H%$Of$52zbAMldIiCCbJ*VpJx0{i55ZZzylzn=4)sycO2I%CeXz?l{} z(*kE&;7kjgX@N5>aHa*$w7{7bIMV_hZh>m+oBOIG_pbSPwSV*8YVU^X$c{DD)(@`e za52tgM+-F0w8GWCE9bfUC2dC4k4$Y*eO)aMW z>7|q==2M!*URX{EXIiFJmzy}cu(2BW`QP6+ls-GsOdojis`SC9j5Z#999f@X{TH?X z?R>`k?^>X$_6&_rZ}`E3Q|UEhv*}U*oes~YG`$FbLF_`sMIvB2t^jm)i{vF+8Gtvt zxd3_BQrbV*m)^N?Mf%h4-PE{)U~zxOd>vZg44}VCBZAXrnw@>o&Z)j%IXIK9-93?# zV4hJL6K@HI05SGr2CiV%NUv}c6cSroaEC3p`|vKN`QhI5p0ih{|MBv5joW28WBzq5 zkemNsm&mCYdt$D-;!C^JFKj!KzW2Vvse8{9paqQrwi_wy)x$N=gN@|v5~LZh0b(0P zwF494*RXswayo`LdSOG~Mq>ZXIfLnqKd`BBPaW&b@7K}-H1QeJ-U5$S)#y7vkzTWR zGW`cYyk=r1C4_0}p{1GtP~h?aSW8;~-2lwpfV#gwrIiCI4JmmERu!2CxPn~cKoHRF zMt?|j>@MPWSLxvD-t?P4eO~&_Mx%jJbH+U07C5enA8+(ihrgtcf$`KnoB>m zxRkC)a{yUDDn&DZL*mk6KI9d5=*Wco5Gc@l0rb#dO6x{aLY+tx=q3~DAH*>kO#ycS zxDs7cF+jSw`n%Gn&Kgc{_|c7x_tqh2e*dK{a0bw{)L-9KZTQsI^jqW8>E+!#=yeM~ zfK>peTTq9;4bY)t;1|pReBAPcevRZF9Zu<-RVfVu>;p`HOl4pfU0NWw@-QxhWd{+` z8Z~5L{b2gtC!LdC_rgYF{9oFkr#m0bczT;Zysf(6i+j>Lrf1XB8-OlADtHyAv`$E4 z!G>Q@7k}u#(rrO`OPKB)kFk;F@vj8f7p_L)1M)pc{wYCgT*B3_O~P~pv__i#Zh$?o zoIZZpiu98|u(5Gh1fKc%sx4q!p0?(%K3!e>xkuAYN2b%0D}WYKI0Lc(v?ZAzgC3IB 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 diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_000_0.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_000_0.png new file mode 100644 index 0000000000000000000000000000000000000000..31da18b0737d6378f332128a0bb0675c764287b7 GIT binary patch literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^Q6S901|%(3I5Gh##^NA%Cx&(BWL^R}E~ycoX}-P; zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz0#TEL88gA{t!bZ-YzOFUg1Ln;{G zUT6df9$xS>SpG?CK;nT0MrJl134?@zXT&oz*S%t3ysy0h6c`Miu6{1-oD!M<_Xt1P literal 0 HcmV?d00001 diff --git a/OCH/charter/passenger/src/main/res/layout/m1_devices_lock_unlock.xml b/OCH/charter/passenger/src/main/res/layout/m1_devices_lock_unlock.xml index 6fcb95f3fe..29c141d990 100644 --- a/OCH/charter/passenger/src/main/res/layout/m1_devices_lock_unlock.xml +++ b/OCH/charter/passenger/src/main/res/layout/m1_devices_lock_unlock.xml @@ -32,7 +32,7 @@ android:id="@+id/aciv_screen_unlock_ani" android:layout_width="@dimen/dp_90" android:layout_height="@dimen/dp_90" - android:src="@drawable/open_lock_000" + android:src="@drawable/open_lock_000_0" app:layout_constraintTop_toTopOf="@+id/aciv_screen_lock_bg" app:layout_constraintBottom_toBottomOf="@+id/aciv_screen_lock_bg" app:layout_constraintStart_toStartOf="@+id/aciv_screen_lock_bg" From 4799aa128edb57dfe7820d54975f6486edf0805a Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 23 Aug 2023 20:26:29 +0800 Subject: [PATCH 04/11] =?UTF-8?q?[6.0.0]=20[charter]=20[=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=92=8C=E5=8F=B8=E6=9C=BA=E5=B1=8F=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/ui/statusbar/StatusBarView.kt | 21 ++++++++++++++++++- .../res/drawable/baseline_link_off_24.xml | 5 +++++ .../res/layout/m1_statusview_datetime.xml | 11 ++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 OCH/charter/passenger/src/main/res/drawable/baseline_link_off_24.xml diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/statusbar/StatusBarView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/statusbar/StatusBarView.kt index 633bbf8290..171dbad766 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/statusbar/StatusBarView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/statusbar/StatusBarView.kt @@ -5,11 +5,13 @@ import android.content.Context import android.os.SystemClock import android.util.AttributeSet import android.view.LayoutInflater +import android.view.View import android.view.ViewGroup import androidx.annotation.ColorRes import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat import chassis.ChassisStatesOuterClass +import com.mogo.eagle.core.data.app.AppConfigInfo import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.api.autopilot.IMoGoBatteryManagementSystemListener @@ -20,12 +22,15 @@ import com.mogo.eagle.core.function.call.autopilot.CallerBatteryManagementSystem import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager +import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager import com.mogo.eagle.core.function.hmi.ui.widget.DemoModeView +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.util.ClickUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.ui.debugview.DebugEvent -import com.mogo.och.bus.passenger.ui.debugview.DebugView +import com.mogo.och.common.module.manager.loopmanager.BizLoopManager +import com.mogo.och.common.module.manager.loopmanager.LoopInfo import kotlinx.android.synthetic.main.m1_statusview_datetime.view.* import me.jessyan.autosize.utils.AutoSizeUtils import org.greenrobot.eventbus.EventBus @@ -97,6 +102,19 @@ class StatusBarView @JvmOverloads constructor( val state = CallerAutoPilotStatusListenerManager.getState() setAutoPilotStatusInfo(state) + + BizLoopManager.setLoopFunction(TAG, LoopInfo(3, ::showConnectStatusWithDriver)) + } + + private fun showConnectStatusWithDriver(){ + UiThreadHandler.post { + CallerLogger.d(TAG,"司机屏连接状态：${CallerTelematicManager.getClientConnStatus()}") + if(CallerTelematicManager.getClientConnStatus()){ + aciv_connect_driver_status.visibility = View.GONE + }else{ + aciv_connect_driver_status.visibility = View.VISIBLE + } + } } private fun setAutoPilotStatusInfo(state: Int) { @@ -144,6 +162,7 @@ class StatusBarView @JvmOverloads constructor( CallerHmiViewControlListenerManager.removeListener(TAG) CallerSkinModeListenerManager.removeListener(TAG) CallerDevaToolsManager.hideStatusBar() + BizLoopManager.removeLoopFunction(TAG) } override fun onBatteryManagementSystemStates(states: ChassisStatesOuterClass.BMSSystemStates) { diff --git a/OCH/charter/passenger/src/main/res/drawable/baseline_link_off_24.xml b/OCH/charter/passenger/src/main/res/drawable/baseline_link_off_24.xml new file mode 100644 index 0000000000..a99311bb32 --- /dev/null +++ b/OCH/charter/passenger/src/main/res/drawable/baseline_link_off_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/OCH/charter/passenger/src/main/res/layout/m1_statusview_datetime.xml b/OCH/charter/passenger/src/main/res/layout/m1_statusview_datetime.xml index 6d5970ffdc..7e5aa9f2ea 100644 --- a/OCH/charter/passenger/src/main/res/layout/m1_statusview_datetime.xml +++ b/OCH/charter/passenger/src/main/res/layout/m1_statusview_datetime.xml @@ -40,6 +40,17 @@ app:layout_constraintEnd_toEndOf="parent" android:layout_width="@dimen/dp_90" android:layout_height="@dimen/dp_47"/> + + + Date: Thu, 24 Aug 2023 10:35:51 +0800 Subject: [PATCH 05/11] [6.0.0]add chain log --- .../autopilot/MoGoAutopilotControlProvider.kt | 24 +++++++++++++++---- .../core/data/deva/chain/ChainConstant.kt | 1 + 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt index 17a74f02dc..cc0a7dabf4 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt @@ -17,6 +17,7 @@ import com.mogo.eagle.core.data.constants.MoGoConfig import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.data.deva.badcase.BagManagerEntity import com.mogo.eagle.core.data.deva.chain.ChainConstant +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_SEND import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_MULTI_CONNECT import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_SOURCE_ADAS import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_TYPE_INIT_STATUS @@ -543,6 +544,12 @@ class MoGoAutopilotControlProvider : * isEnable = true 开启 * isEnable = false 关闭 */ + @ChainLog( + linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_SEND, + paramIndexes = [0] + ) override fun setIPCDemoMode(isEnable: Boolean) { if (isEnable) { AdasManager.getInstance().sendDemoModeReq(1) @@ -551,11 +558,12 @@ class MoGoAutopilotControlProvider : } } - /** - * 雨天模式 - * isEnable = true 开启 - * isEnable = false 关闭 - */ + @ChainLog( + linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_SEND, + paramIndexes = [0] + ) override fun setRainMode(isEnable: Boolean) { if (isEnable) { AdasManager.getInstance().sendRainModeReq(1) @@ -570,6 +578,12 @@ class MoGoAutopilotControlProvider : * isEnable = false 关闭 * @return boolean */ + @ChainLog( + linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_SEND, + paramIndexes = [0] + ) override fun sendDetouring(isEnable: Boolean): Boolean { return if (isEnable) { AdasManager.getInstance().sendDetouring(1) diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt index cb9c2c9c4d..c98482f3d9 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt @@ -55,6 +55,7 @@ class ChainConstant { const val CHAIN_CODE_ADAS_RECT_DATA = "CHAIN_CODE_ADAS_RECT_DATA" const val CHAIN_CODE_ADAS_CAR_LOC = "CHAIN_CODE_ADAS_CAR_LOC" const val CHAIN_CODE_ADAS_STATUS = "CHAIN_CODE_ADAS_STATUS" + const val CHAIN_CODE_ADAS_SEND = "CHAIN_CODE_ADAS_SEND" const val CHAIN_CODE_ADAS_ARRIVE = "CHAIN_CODE_ADAS_ARRIVE" const val CHAIN_CODE_ADAS_ROUTE = "CHAIN_CODE_ADAS_ROUTE" const val CHAIN_CODE_ADAS_ROUTE_REQ = "CHAIN_CODE_ADAS_ROUTE_REQ" From a3053f21ec5cbf07e071bf735f1358855912857b Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 24 Aug 2023 11:03:23 +0800 Subject: [PATCH 06/11] [6.0.0] add chain lgo --- .../autopilot/adapter/MoGoAdasListenerImpl.kt | 132 +++++++++++++++--- .../core/data/deva/chain/ChainConstant.kt | 1 + 2 files changed, 116 insertions(+), 17 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt index 4f7ff6105a..d990a5e4be 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -7,6 +7,7 @@ import com.mogo.eagle.core.data.app.AppConfigInfo import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.config.HdMapBuildConfig import com.mogo.eagle.core.data.deva.chain.ChainConstant +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_ABILITY import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_ARRIVE import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_GUARDIAN import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_RECORD @@ -327,7 +328,7 @@ class MoGoAdasListenerImpl : OnAdasListener { //todo 新增稳定设备类型需要添加，目的避免在nuc设备上使用此类功能 private val limit = DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model() override fun onPointCloud(header: MessagePad.Header, pointCloud: ByteArray?) { - if(limit){ + if (limit) { //点云数据透传 CallerAutopilotPointCloudListenerManager.invokeAutopilotPointCloudDataUpdate(pointCloud) } @@ -572,8 +573,19 @@ class MoGoAdasListenerImpl : OnAdasListener { * @param sysTime 当前时间戳 * @param taskInfo 数据 */ - override fun onSweeperFutianCloudTask(header: MessagePad.Header, messageType: SweeperCloudTask.MessageType, reqNo: String?, sysTime: Long, taskInfo: SweeperTask.TaskInfo?) { - CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudTask(messageType, reqNo, sysTime, taskInfo) + override fun onSweeperFutianCloudTask( + header: MessagePad.Header, + messageType: SweeperCloudTask.MessageType, + reqNo: String?, + sysTime: Long, + taskInfo: SweeperTask.TaskInfo? + ) { + CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudTask( + messageType, + reqNo, + sysTime, + taskInfo + ) } /** @@ -585,8 +597,19 @@ class MoGoAdasListenerImpl : OnAdasListener { * @param sysTime 当前时间戳 * @param taskConfirm 数据 */ - override fun onSweeperFutianCloudTaskConfirm(header: MessagePad.Header, messageType: SweeperCloudTask.MessageType, reqNo: String?, sysTime: Long, taskConfirm: SweeperTaskConfirm.TaskConfirm?) { - CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudTaskConfirm(messageType, reqNo, sysTime, taskConfirm) + override fun onSweeperFutianCloudTaskConfirm( + header: MessagePad.Header, + messageType: SweeperCloudTask.MessageType, + reqNo: String?, + sysTime: Long, + taskConfirm: SweeperTaskConfirm.TaskConfirm? + ) { + CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudTaskConfirm( + messageType, + reqNo, + sysTime, + taskConfirm + ) } /** @@ -598,8 +621,19 @@ class MoGoAdasListenerImpl : OnAdasListener { * @param sysTime 当前时间戳 * @param taskStatusPush 数据 */ - override fun onSweeperFutianCloudTaskStatus(header: MessagePad.Header, messageType: SweeperCloudTask.MessageType, reqNo: String?, sysTime: Long, taskStatusPush: SweeperTaskStatus.TaskStatusPush?) { - CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudTaskStatus(messageType, reqNo, sysTime, taskStatusPush) + override fun onSweeperFutianCloudTaskStatus( + header: MessagePad.Header, + messageType: SweeperCloudTask.MessageType, + reqNo: String?, + sysTime: Long, + taskStatusPush: SweeperTaskStatus.TaskStatusPush? + ) { + CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudTaskStatus( + messageType, + reqNo, + sysTime, + taskStatusPush + ) } /** @@ -611,8 +645,19 @@ class MoGoAdasListenerImpl : OnAdasListener { * @param sysTime 当前时间戳 * @param stopTaskReq 数据 */ - override fun onSweeperFutianCloudTaskStop(header: MessagePad.Header, messageType: SweeperCloudTask.MessageType, reqNo: String?, sysTime: Long, stopTaskReq: SweeperTaskStop.StopTaskReq?) { - CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudTaskStop(messageType, reqNo, sysTime, stopTaskReq) + override fun onSweeperFutianCloudTaskStop( + header: MessagePad.Header, + messageType: SweeperCloudTask.MessageType, + reqNo: String?, + sysTime: Long, + stopTaskReq: SweeperTaskStop.StopTaskReq? + ) { + CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudTaskStop( + messageType, + reqNo, + sysTime, + stopTaskReq + ) } /** @@ -625,8 +670,19 @@ class MoGoAdasListenerImpl : OnAdasListener { * @param sysTime 当前时间戳 * @param suspendResumeTaskResp 数据 */ - override fun onSweeperFutianCloudTaskSuspendResume(header: MessagePad.Header, messageType: SweeperCloudTask.MessageType, reqNo: String?, sysTime: Long, suspendResumeTaskResp: SweeperTaskSuspendResume.SuspendResumeTaskResp?) { - CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudTaskSuspendResume(messageType, reqNo, sysTime, suspendResumeTaskResp) + override fun onSweeperFutianCloudTaskSuspendResume( + header: MessagePad.Header, + messageType: SweeperCloudTask.MessageType, + reqNo: String?, + sysTime: Long, + suspendResumeTaskResp: SweeperTaskSuspendResume.SuspendResumeTaskResp? + ) { + CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudTaskSuspendResume( + messageType, + reqNo, + sysTime, + suspendResumeTaskResp + ) } /** @@ -638,8 +694,19 @@ class MoGoAdasListenerImpl : OnAdasListener { * @param sysTime 当前时间戳 * @param isBootableResp 数据 */ - override fun onSweeperFutianCloudBootable(header: MessagePad.Header, messageType: SweeperCloudTask.MessageType, reqNo: String?, sysTime: Long, isBootableResp: SweeperBootable.IsBootableResp?) { - CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudBootable(messageType, reqNo, sysTime, isBootableResp) + override fun onSweeperFutianCloudBootable( + header: MessagePad.Header, + messageType: SweeperCloudTask.MessageType, + reqNo: String?, + sysTime: Long, + isBootableResp: SweeperBootable.IsBootableResp? + ) { + CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudBootable( + messageType, + reqNo, + sysTime, + isBootableResp + ) } /** @@ -651,8 +718,19 @@ class MoGoAdasListenerImpl : OnAdasListener { * @param sysTime 当前时间戳 * @param bigTaskStatusPush 数据 */ - override fun onSweeperFutianCloudBigTaskStatus(header: MessagePad.Header, messageType: SweeperCloudTask.MessageType, reqNo: String?, sysTime: Long, bigTaskStatusPush: SweeperBigTaskStatus.BigTaskStatusPush?) { - CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudBigTaskStatus(messageType, reqNo, sysTime, bigTaskStatusPush) + override fun onSweeperFutianCloudBigTaskStatus( + header: MessagePad.Header, + messageType: SweeperCloudTask.MessageType, + reqNo: String?, + sysTime: Long, + bigTaskStatusPush: SweeperBigTaskStatus.BigTaskStatusPush? + ) { + CallerSweeperFutianCloudTaskListenerManager.invokeSweeperFutianCloudBigTaskStatus( + messageType, + reqNo, + sysTime, + bigTaskStatusPush + ) } /** @@ -739,7 +817,11 @@ class MoGoAdasListenerImpl : OnAdasListener { * @param getParamResp 配置参数 * @param adasParam 解析后的配置参数 */ - override fun onGetParamResp(header: MessagePad.Header, getParamResp: MessagePad.SetParamReq, adasParam: AdasParam) { + override fun onGetParamResp( + header: MessagePad.Header, + getParamResp: MessagePad.SetParamReq, + adasParam: AdasParam + ) { CallerAutopilotGetParamResponseDispatcher.dispatchResponse(header, getParamResp, adasParam) } @@ -761,10 +843,26 @@ class MoGoAdasListenerImpl : OnAdasListener { * 是否可以启动自动驾驶 * 使用方法查看：app_ipc_monitoring/uiMainActivity/onAutopilotAbility */ - override fun onAutopilotAbility(isAutopilotAbility: Boolean, unableAutopilotReasons: ArrayList?) { + override fun onAutopilotAbility( + isAutopilotAbility: Boolean, + unableAutopilotReasons: ArrayList? + ) { + if (unableAutopilotReasons != null && unableAutopilotReasons.size > 0) { + autopilotAbilityCheck(isAutopilotAbility, unableAutopilotReasons.toString()) + } invokeAutopilotAbility(isAutopilotAbility, unableAutopilotReasons) } + @ChainLog( + linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_ABILITY, + paramIndexes = [0, 1] + ) + private fun autopilotAbilityCheck(isAutopilotAbility: Boolean, reason: String) { + + } + /** * 启动自动驾驶失败回调 * 根据MAP 系统监控状态返回过滤 diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt index c98482f3d9..79c8ecba8e 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt @@ -54,6 +54,7 @@ class ChainConstant { const val CHAIN_CODE_ADAS_CAR_CONFIG = "CHAIN_CODE_ADAS_CAR_CONFIG" const val CHAIN_CODE_ADAS_RECT_DATA = "CHAIN_CODE_ADAS_RECT_DATA" const val CHAIN_CODE_ADAS_CAR_LOC = "CHAIN_CODE_ADAS_CAR_LOC" + const val CHAIN_CODE_ADAS_ABILITY = "CHAIN_CODE_ADAS_ABILITY" const val CHAIN_CODE_ADAS_STATUS = "CHAIN_CODE_ADAS_STATUS" const val CHAIN_CODE_ADAS_SEND = "CHAIN_CODE_ADAS_SEND" const val CHAIN_CODE_ADAS_ARRIVE = "CHAIN_CODE_ADAS_ARRIVE" From cfbf18d5fff560494a47b263c73b739a636874f5 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 24 Aug 2023 11:16:26 +0800 Subject: [PATCH 07/11] [6.0.0] log --- .../manager/CharterAnalyticsManager.java | 2 +- .../bus/passenger/MogoOCHBusPassenger.java | 6 +- .../network/BusPassengerModelLoopManager.java | 4 +- .../presenter/BaseBusPassengerPresenter.java | 2 +- .../com/mogo/och/bus/model/OrderModel.java | 96 +++++++++---------- .../java/com/mogo/och/bus/BusProvider.java | 8 +- .../mogo/och/bus/fragment/BusFragment.java | 16 ++-- .../bus/presenter/BusModelLoopManager.java | 8 +- .../mogo/och/bus/presenter/BusPresenter.java | 8 +- .../receiver/TestBusBroadcastReceiver.java | 2 +- .../och/bus/util/BusTrajectoryManager.java | 28 +++--- .../biz/model/OchCommonLoginStatusModel.java | 2 +- .../map/AmapNaviToDestinationModel.java | 10 +- .../java/com/mogo/och/bus/BusProvider.java | 8 +- .../mogo/och/bus/fragment/BusFragment.java | 16 ++-- .../com/mogo/och/bus/model/OrderModel.java | 96 +++++++++---------- .../bus/presenter/BusModelLoopManager.java | 8 +- .../mogo/och/bus/presenter/BusPresenter.java | 8 +- .../receiver/TestBusBroadcastReceiver.java | 2 +- .../och/bus/util/BusAnalyticsManager.java | 2 +- .../och/bus/util/BusTrajectoryManager.java | 28 +++--- .../bus/passenger/MogoOCHBusPassenger.java | 6 +- .../passenger/model/BusPassengerModel.java | 38 ++++---- .../network/BusPassengerModelLoopManager.java | 10 +- .../presenter/BaseBusPassengerPresenter.java | 4 +- .../ui/BusPassengerMapDirectionView.java | 12 +-- .../ui/BusPassengerRouteFragment.java | 2 +- .../och/sweepercloud/SweeperProvider.java | 6 +- .../fragment/SweeperAmapNaviFragment.java | 4 +- .../sweepercloud/model/SweeperTaskModel.java | 54 +++++------ .../TestSweeperBroadcastReceiver.java | 2 +- .../util/SweeperAnalyticsManager.java | 2 +- .../com/mogo/och/sweeper/SweeperProvider.java | 6 +- .../fragment/SweeperAmapNaviFragment.java | 4 +- .../och/sweeper/model/SweeperTaskModel.java | 66 ++++++------- .../sweeper/presenter/SweeperPresenter.java | 4 +- .../TestSweeperBroadcastReceiver.java | 2 +- .../sweeper/util/SweeperAnalyticsManager.java | 2 +- .../util/SweeperTrajectoryManager.java | 28 +++--- .../java/com/mogo/och/taxi/TaxiProvider.java | 8 +- .../com/mogo/och/taxi/model/TaxiModel.java | 80 ++++++++-------- .../och/taxi/model/TaxiModelLoopManager.java | 20 ++-- .../och/taxi/presenter/NaviPresenter.java | 2 +- .../och/taxi/presenter/TaxiPresenter.java | 4 +- .../mogo/och/taxi/ui/BaseTaxiTabFragment.java | 2 +- .../och/taxi/ui/TaxiAmapNaviFragment.java | 4 +- .../ui/TaxiBeingServerdOrdersFragment.java | 32 +++---- .../com/mogo/och/taxi/ui/TaxiFragment.java | 8 +- .../och/taxi/ui/TaxiOrderCancelDialog.java | 2 +- .../taxi/ui/TaxiPersonalDialogFragment.java | 8 +- .../och/taxi/ui/TaxiServerOrdersFragment.java | 10 +- .../och/taxi/utils/TaxiAnalyticsManager.kt | 2 +- .../och/taxi/utils/TaxiTrajectoryManager.java | 30 +++--- .../taxi/passenger/MogoOCHTaxiPassenger.java | 8 +- .../och/taxi/ui/TaxiOrderCancelDialog.java | 2 +- .../ui/navi/auto/RoutingNaviPresenter.java | 2 +- .../taxi/ui/task/TaxiCurrentTaskFragment.kt | 2 +- .../och/taxi/utils/TaxiAnalyticsManager.java | 4 +- .../och/taxi/utils/TaxiTrajectoryManager.java | 30 +++--- .../taxi/passenger/MogoOCHTaxiPassenger.java | 8 +- .../v2n/scenario/impl/V2XScenarioManager.java | 4 +- .../scene/road/V2XRoadEventMarker.java | 2 +- .../warning/V2XFrontWarningScenario.java | 10 +- .../scene/warning/V2XWarningMarker.java | 54 +++++------ .../badcase/biz/BadCaseManagerView.kt | 33 +++---- .../badcase/record/RecordHelper.java | 27 +++--- .../badcase/record/mp3/Mp3Utils.java | 6 +- .../function/hmi/dialog/BaseFloatDialog.java | 4 +- .../ui/notice/roundimage/RoundedDrawable.java | 2 +- .../notice/roundimage/RoundedImageView.java | 4 +- .../function/main/MainLauncherActivity.java | 6 +- .../function/main/MainMoGoApplication.java | 4 +- .../main/PassengerLauncherActivity.java | 6 +- .../main/modules/MogoModulesManager.java | 14 +-- .../main/windowview/FloatingViewHandler.java | 16 ++-- .../eagle/core/function/view/MapBizView.kt | 2 - .../mogo/eagle/core/network/HttpParamsEx.java | 2 +- .../eagle/core/network/SubscribeImpl.java | 4 +- .../core/widget/GestureTopCloseLayout.java | 4 +- .../eagle/core/widget/TextureVideoView.java | 4 +- .../core/utilcode/mogo/logger/CallerLogger.kt | 4 + .../MogoLocationInfoServices.java | 6 +- .../socket/MogoAiCloudSocketManager.java | 10 +- .../com/mogo/commons/AbsMogoApplication.java | 2 +- .../commons/crash/FinalizeCrashFixer.java | 4 +- .../com/mogo/commons/network/ParamsUtil.java | 6 +- .../java/com/mogo/commons/voice/AIAssist.java | 2 +- .../java/com/mogo/map/AMapViewWrapper.java | 82 ++++++++-------- .../main/java/com/mogo/map/AMapWrapper.java | 12 +-- .../com/mogo/map/MogoMapUIController.java | 4 +- .../main/java/com/mogo/map/MogoMapView.java | 10 +- .../mogo/map/utils/PointInterpolatorUtil.java | 4 +- .../apm/ApmCrashReportProvider.java | 2 +- .../main/java/com/mogo/tts/pad/PadTTS.java | 80 ++++++++-------- 94 files changed, 659 insertions(+), 657 deletions(-) diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterAnalyticsManager.java b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterAnalyticsManager.java index 0338c6f393..d8f40dd0c7 100644 --- a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterAnalyticsManager.java +++ b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterAnalyticsManager.java @@ -47,7 +47,7 @@ public class CharterAnalyticsManager { private void triggerStartAutopilotFailureEvent(String failCode, String failMsg){ if (mStartAutopilotParams.isEmpty()) return; - CallerLogger.INSTANCE.e( M_BUS + "triggerStartAutopilotFailureEvent", failMsg ); + CallerLogger.e( M_BUS + "triggerStartAutopilotFailureEvent", failMsg ); if (CallerAutoPilotStatusListenerManager.INSTANCE.getState() != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){ diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java index 3690ed62c9..5d1778ca79 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java @@ -75,14 +75,14 @@ public class MogoOCHBusPassenger implements IMogoOCH { * 进入鹰眼模式，设置手势缩放地图失效 */ private void stepIntoVrMode() { - CallerLogger.INSTANCE.d( M_BUS_P + TAG, "进入vr模式" ); + CallerLogger.d( M_BUS_P + TAG, "进入vr模式" ); CallerMoGoUiSettingManager.INSTANCE.stepInDayMode();//白天模式 状态栏字体颜色变黑 } private void showFragment() { FragmentManager supportFragmentManager = mActivity.getSupportFragmentManager(); if(mPassengerFragment == null){ - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "准备add fragment======"); + CallerLogger.d(M_BUS_P + TAG, "准备add fragment======"); Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(BusPassengerRouteFragment.TAG); if (fragmentByTag instanceof BusPassengerRouteFragment){ mPassengerFragment = (BusPassengerRouteFragment)fragmentByTag; @@ -95,7 +95,7 @@ public class MogoOCHBusPassenger implements IMogoOCH { return; } - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "准备show fragment"); + CallerLogger.d(M_BUS_P + TAG, "准备show fragment"); supportFragmentManager.beginTransaction().show(mPassengerFragment).commitAllowingStateLoss(); } diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java index 2c7963cf07..f10f9537c9 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java @@ -42,7 +42,7 @@ public class BusPassengerModelLoopManager { if (mQueryLineDisposable != null && !mQueryLineDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.i(M_BUS_P + TAG, "startQueryDriverLineLoop()"); + CallerLogger.i(M_BUS_P + TAG, "startQueryDriverLineLoop()"); mQueryLineDisposable = Observable.interval(LOOP_DELAY, LOOP_LINE_2S, TimeUnit.MILLISECONDS) .map((aLong -> aLong + 1)) @@ -53,7 +53,7 @@ public class BusPassengerModelLoopManager { public void stopQueryDriverLineLoop() { if (mQueryLineDisposable != null) { - CallerLogger.INSTANCE.i(M_BUS_P + TAG, "stopQueryDriverLineLoop()"); + CallerLogger.i(M_BUS_P + TAG, "stopQueryDriverLineLoop()"); mQueryLineDisposable.dispose(); mQueryLineDisposable = null; } diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java index a448c2cd36..491c55a46f 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java @@ -42,7 +42,7 @@ public class BaseBusPassengerPresenter extends Presenter90度 经过 @@ -431,11 +431,11 @@ public class OrderModel { startLat, (int) location.getHeading()); - CallerLogger.INSTANCE.d(M_BUS + TAG, "judgeArrivedStation() stationAngle = " + stationAngle); + CallerLogger.d(M_BUS + TAG, "judgeArrivedStation() stationAngle = " + stationAngle); //3、刚过站且过站距离在15m内， 提交到站 if (stationAngle > 90 && distance <= BusConst.ARRIVE_AT_END_STATION_DISTANCE){ - CallerLogger.INSTANCE.d(M_BUS + TAG, "judgeArrivedStation() = 刚过站且在15m内"); + CallerLogger.d(M_BUS + TAG, "judgeArrivedStation() = 刚过站且在15m内"); onArriveAt(null); //无自动驾驶到站信息传null } @@ -447,7 +447,7 @@ public class OrderModel { * 查询小巴路线 */ public void queryBusRoutes() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "查询小巴路线"); + CallerLogger.d(M_BUS + TAG, "查询小巴路线"); OrderServiceManager.queryBusRoutes(mContext, new OchCommonServiceCallback() { @Override public void onSuccess(BusRoutesResponse data) { @@ -456,7 +456,7 @@ public class OrderModel { || data.getResult().getSites() == null || data.getResult().getSites().isEmpty()) { //当为空时,显示无绑定路线图 - CallerLogger.INSTANCE.d(M_BUS + TAG, "获取到小巴路线数据:空 "); + CallerLogger.d(M_BUS + TAG, "获取到小巴路线数据:空 "); if (refreshBusStationsCallback != null) { refreshBusStationsCallback.updateEmptyUi(); } @@ -466,7 +466,7 @@ public class OrderModel { removeTipRunnables(); return; } - CallerLogger.INSTANCE.d(M_BUS + TAG, "获取到小巴路线数据: " + data); + CallerLogger.d(M_BUS + TAG, "获取到小巴路线数据: " + data); updateBusStatus(data.getResult()); } @@ -549,12 +549,12 @@ public class OrderModel { * 重置路线站点状态--结束路线，当前路线恢复到始发站 */ public void abortTask() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "结束当前路线abortTask"); + CallerLogger.d(M_BUS + TAG, "结束当前路线abortTask"); OrderServiceManager.abortTask(mContext, currentTaskId , new OchCommonServiceCallback() { @Override public void onSuccess(BaseData o) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "abortTask success: " + o); + CallerLogger.d(M_BUS + TAG, "abortTask success: " + o); if (o.code == 0) { // 重置成功 endOrAbortTaskSuccess(); clearBusStationDatas(); @@ -655,14 +655,14 @@ public class OrderModel { if (FunctionBuildConfig.isPassStartAutopilotCommand && TextUtils.isEmpty(busRoutesResult.csvFileUrl) && TextUtils.isEmpty(busRoutesResult.csvFileUrlDPQP)){ ToastUtils.showLong("无发布轨迹, 请发布后重试"); - CallerLogger.INSTANCE.e(M_BUS + TAG, "isPassStartAutopilotCommand = " + + CallerLogger.e(M_BUS + TAG, "isPassStartAutopilotCommand = " + FunctionBuildConfig.isPassStartAutopilotCommand + "busRoutesResult.csvFileUrl = "+ busRoutesResult.csvFileUrl + "busRoutesResult.csvFileUrlDPQP = "+busRoutesResult.csvFileUrlDPQP); return; } - CallerLogger.INSTANCE.e(M_BUS + TAG, "isPassStartAutopilotCommand = " + + CallerLogger.e(M_BUS + TAG, "isPassStartAutopilotCommand = " + FunctionBuildConfig.isPassStartAutopilotCommand); @@ -682,13 +682,13 @@ public class OrderModel { AutopilotControlParameters parameters = initAutopilotControlParameters(leaveIndex); if (null == parameters) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "行程日志-AutopilotControlParameters is empty."); + CallerLogger.e(M_BUS + TAG, "行程日志-AutopilotControlParameters is empty."); return; } CallerAutoPilotControlManager.INSTANCE.startAutoPilot(parameters); - CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-开启自动驾驶====" + GsonUtil.jsonFromObject(parameters) + CallerLogger.d(M_BUS + TAG, "行程日志-开启自动驾驶====" + GsonUtil.jsonFromObject(parameters) + " startLatLon=" + parameters.startName + "，endLatLon=" + parameters.endName + "isRestart = " + isRestart); @@ -702,14 +702,14 @@ public class OrderModel { */ private void arriveSiteStation() { if ( backgroundCurrentStationIndex +1 > stationList.size() - 1 ) { //到站短时间内调用多次 - CallerLogger.INSTANCE.e( M_BUS + TAG, "数组越界" ); + CallerLogger.e( M_BUS + TAG, "数组越界" ); return; } int arrivedStationIndex = backgroundCurrentStationIndex + 1; String arriveStation = stationList.get(arrivedStationIndex).getName(); String arriveStationKr = stationList.get(arrivedStationIndex).getNameKr(); String departureStopName = stationList.get(backgroundCurrentStationIndex).getName(); - CallerLogger.INSTANCE.d(M_BUS + TAG, "arriveSiteStation-currentStationIndex = " + arrivedStationIndex); + CallerLogger.d(M_BUS + TAG, "arriveSiteStation-currentStationIndex = " + arrivedStationIndex); OrderServiceManager.arriveSiteStation(mContext, stationList.get(arrivedStationIndex).getSeq(), @@ -718,7 +718,7 @@ public class OrderModel { new OchCommonServiceCallback() { @Override public void onSuccess(BaseData o) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-arriveSiteStation success"); + CallerLogger.d(M_BUS + TAG, "行程日志-arriveSiteStation success"); if (o != null && o.code == 0){ queryBusRoutes(); isArrivedStation = true; @@ -774,7 +774,7 @@ public class OrderModel { * 离站上报 */ public void leaveStation() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "leaveStation-backgroundCurrentStationIndex = " + backgroundCurrentStationIndex); + CallerLogger.d(M_BUS + TAG, "leaveStation-backgroundCurrentStationIndex = " + backgroundCurrentStationIndex); String nextStationName = ""; String nextStationNameKr = ""; MogoLocation nextStationPoint = new MogoLocation(); @@ -800,7 +800,7 @@ public class OrderModel { @Override public void onSuccess(BaseData o) { isArrivedStation = false; - CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-离站成功开往下一站===="); + CallerLogger.d(M_BUS + TAG, "行程日志-离站成功开往下一站===="); //需要更改当前站和下一站的状态 然后渲染 //startOrStopQueryPassengerWriteOff(false); queryBusRoutes(); @@ -849,7 +849,7 @@ public class OrderModel { FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false; //是否强制绘制引导线 CallerAutoPilotControlManager.INSTANCE.setIgnoreConditionDraw(false);// 同步给乘客屏 CallerAutoPilotControlManager.INSTANCE.setIPCDemoMode(false);//是否自动启动自驾 - CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：置为false"); + CallerLogger.d(M_BUS + TAG, "美化模式-ignore：置为false"); } } @@ -884,7 +884,7 @@ public class OrderModel { for (int i = 0; i < stationList.size(); i++) { BusStationBean s = stationList.get(i); - CallerLogger.INSTANCE.d(M_BUS + "updateBusStationsStatus--", + CallerLogger.d(M_BUS + "updateBusStationsStatus--", "Index=" + i + " ,name = " + s.getName() + " ," + s.isLeaving() + "," + s.getDrivingStatus()); // 是否正在开往下一站 @@ -917,7 +917,7 @@ public class OrderModel { BusStationBean currentStation = stationList.get(backgroundCurrentStationIndex); - CallerLogger.INSTANCE.d(M_BUS + TAG, + CallerLogger.d(M_BUS + TAG, "行程日志-STATION_STATUS_STOPPED-backgroundCurrentStationIndex=" + backgroundCurrentStationIndex + " isLeaving()=" + currentStation.isLeaving()); @@ -927,11 +927,11 @@ public class OrderModel { && backgroundCurrentStationIndex <= stationList.size() - 1)) {//行驶过程中设置美化 if (stationList.get(backgroundCurrentStationIndex).isLeaving()) { startBeautificationMode(); - CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：置为true（每次滑动出发）"); + CallerLogger.d(M_BUS + TAG, "美化模式-ignore：置为true（每次滑动出发）"); } else if (backgroundCurrentStationIndex > 0 && backgroundCurrentStationIndex < stationList.size() - 1) { //美化模式下 中间站点到站 引导线要一直绘制，所以此处不出强制绘制不传false CallerAutoPilotControlManager.INSTANCE.setIPCDemoMode(false); - CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：false（到达中间站）"); + CallerLogger.d(M_BUS + TAG, "美化模式-ignore：false（到达中间站）"); clearStartAutopilotTag(); } else { closeBeautificationMode(); @@ -1042,7 +1042,7 @@ public class OrderModel { * 在踩刹车、控制方向盘等操作后，会停止自动驾驶，重启自动驾驶的话相当于重新设置自动驾驶目的地 */ public void restartAutopilot() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-重启自动驾驶===" + isGoingToNextStation); + CallerLogger.d(M_BUS + TAG, "行程日志-重启自动驾驶===" + isGoingToNextStation); //只去启动自动驾驶，不再去上报离站 startAutopilot(firstStartAutopilot >= 1, -1); } @@ -1057,10 +1057,10 @@ public class OrderModel { private void travelOver() { if (backgroundCurrentStationIndex >= stationList.size()) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "travel over index out of station list"); + CallerLogger.e(M_BUS + TAG, "travel over index out of station list"); return; } - CallerLogger.INSTANCE.d(M_BUS + TAG, "单程结束===="); + CallerLogger.d(M_BUS + TAG, "单程结束===="); CallerAutoPilotControlManager.INSTANCE.cancelAutoPilot(); setTrajectoryStation(null,null,-1L); endTask(); @@ -1070,12 +1070,12 @@ public class OrderModel { * task正常结束 */ private void endTask() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "任务正常走完endTask()"); + CallerLogger.d(M_BUS + TAG, "任务正常走完endTask()"); OrderServiceManager.endTask(mContext, currentTaskId , new OchCommonServiceCallback() { @Override public void onSuccess(BaseData o) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "endTask success: " + o); + CallerLogger.d(M_BUS + TAG, "endTask success: " + o); if (o.code == 0) { endOrAbortTaskSuccess(); clearBusStationDatas(); @@ -1117,7 +1117,7 @@ public class OrderModel { */ public void onArriveAt(MessagePad.ArrivalNotification data) { if (backgroundCurrentStationIndex + 1 > stationList.size() - 1) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "行程日志-到站异常，取消后续操作结束"); + CallerLogger.e(M_BUS + TAG, "行程日志-到站异常，取消后续操作结束"); return; } @@ -1133,19 +1133,19 @@ public class OrderModel { String arriveLat = NumberFormatUtil.cutOutNumber(arriveStation.getLat(), 5); String arriveLon = NumberFormatUtil.cutOutNumber(arriveStation.getLon(), 5); - CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-dataLatitude = "+ latitude+ + CallerLogger.d(M_BUS + TAG, "行程日志-dataLatitude = "+ latitude+ ", dataLongitude = " + longitude + "; arriveLat = " + arriveLat + ", arriveLon = " +arriveLon); if (!latitude.equals(arriveLat) || !longitude.equals(arriveLon)) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "行程日志-到站拦截,到站坐标不一致"); + CallerLogger.e(M_BUS + TAG, "行程日志-到站拦截,到站坐标不一致"); return; } } if (isArrivedStation) return; - CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-当前==backgroundCurrentStationIndex=" + CallerLogger.d(M_BUS + TAG, "行程日志-当前==backgroundCurrentStationIndex=" + backgroundCurrentStationIndex); arriveSiteStation(); @@ -1177,7 +1177,7 @@ public class OrderModel { } public void startOrStopOrderLoop(boolean start) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "startOrStopOrderLoop() " + start); + CallerLogger.d(M_BUS + TAG, "startOrStopOrderLoop() " + start); if (start) { BusModelLoopManager.getInstance().startHeartbeatLoop(); } else { @@ -1228,15 +1228,15 @@ public class OrderModel { AutopilotControlParameters parameters = initAutopilotControlParameters(-1); if (null == parameters) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "AutopilotControlParameters is empty."); + CallerLogger.e(M_BUS + TAG, "AutopilotControlParameters is empty."); return; } - CallerLogger.INSTANCE.d(M_BUS + TAG, "AutopilotControlParameters is update."); + CallerLogger.d(M_BUS + TAG, "AutopilotControlParameters is update."); CallerAutoPilotStatusListenerManager.INSTANCE.updateAutopilotControlParameters(parameters); } private void clearAutopilotControlParameters() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "AutopilotControlParameters is clear."); + CallerLogger.d(M_BUS + TAG, "AutopilotControlParameters is clear."); CallerAutoPilotStatusListenerManager.INSTANCE.updateAutopilotControlParameters(null); } @@ -1246,14 +1246,14 @@ public class OrderModel { if (leaveIndex < 0) { if (backgroundCurrentStationIndex + 1 > stationList.size() - 1 || !isGoingToNextStation) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "行程日志-mismatch condition1."); + CallerLogger.e(M_BUS + TAG, "行程日志-mismatch condition1."); return null; } currentStation = stationList.get(backgroundCurrentStationIndex); nextStation = stationList.get(backgroundCurrentStationIndex + 1); } else { if (leaveIndex + 1 > stationList.size() - 1 || !isGoingToNextStation) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "行程日志-mismatch condition2."); + CallerLogger.e(M_BUS + TAG, "行程日志-mismatch condition2."); return null; } currentStation = stationList.get(leaveIndex); diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java index e8f3e0f280..3aa7c64360 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java @@ -37,7 +37,7 @@ public class BusProvider implements IMogoOCH { * 进入鹰眼模式，设置手势缩放地图失效 */ private void stepIntoVrMode() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "进入vr模式"); + CallerLogger.d(M_BUS + TAG, "进入vr模式"); CallerMoGoUiSettingManager.INSTANCE.stepInNightMode();//夜间模式 状态栏字体颜色变黑 } @@ -48,7 +48,7 @@ public class BusProvider implements IMogoOCH { private void showFragment() { FragmentManager supportFragmentManager = activity.getSupportFragmentManager(); if (busFragment == null) { - CallerLogger.INSTANCE.d(TAG, "准备add fragment======"); + CallerLogger.d(TAG, "准备add fragment======"); Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(BusFragment.TAG); if (fragmentByTag instanceof BusFragment) { busFragment = (BusFragment) fragmentByTag; @@ -60,13 +60,13 @@ public class BusProvider implements IMogoOCH { } return; } - CallerLogger.INSTANCE.d(TAG, "准备show fragment"); + CallerLogger.d(TAG, "准备show fragment"); supportFragmentManager.beginTransaction().show(busFragment).commitAllowingStateLoss(); } private void hideFragment() { if (busFragment != null) { - CallerLogger.INSTANCE.d(TAG, "准备hide fragment"); + CallerLogger.d(TAG, "准备hide fragment"); activity.getSupportFragmentManager().beginTransaction().hide(busFragment).commitAllowingStateLoss(); } diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java index cd80f7b6e0..48ba4e86b4 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java @@ -107,7 +107,7 @@ public class BusFragment extends BaseBusTabFragment groupStationsPanel = findViewById(R.id.group_stations_panel); noDataView = findViewById(R.id.no_line_data_view); - CallerLogger.INSTANCE.d(M_BUS + TAG, "initView: " + CallerAutoPilotStatusListenerManager.INSTANCE.getState()); + CallerLogger.d(M_BUS + TAG, "initView: " + CallerAutoPilotStatusListenerManager.INSTANCE.getState()); // 初始化的时候设置 UI 按钮状态 showAutopilotBiz(); @@ -125,10 +125,10 @@ public class BusFragment extends BaseBusTabFragment @Subscribe(threadMode = ThreadMode.MAIN) public void changeOverview(EventLogout eventLogout){ if (eventLogout.getMessgae() == EventLogout.LOGOUT_TYPE){ - CallerLogger.INSTANCE.d(M_BUS + TAG,"changeOverview Event消息去登出"); + CallerLogger.d(M_BUS + TAG,"changeOverview Event消息去登出"); mPresenter.logout(); }else if (eventLogout.getMessgae() == EventLogout.SHOW_QR_TYPE){ //显示二维码 - CallerLogger.INSTANCE.d(M_BUS + TAG,"changeOverview Event qrcode"); + CallerLogger.d(M_BUS + TAG,"changeOverview Event qrcode"); String qrUrl = String.format(FunctionBuildConfig.urlJson.getBindDriverQRUrl(), MoGoAiCloudClientConfig.getInstance().getSn()); Bitmap bmQr = QRUtilsKt.createQRCodeWithPicture( @@ -141,7 +141,7 @@ public class BusFragment extends BaseBusTabFragment .cancelStr(getString(R.string.qr_cancel)) .qrBm(bmQr).build(getContext()).show(); }else { - CallerLogger.INSTANCE.d(M_BUS + TAG,"bmQr = null "); + CallerLogger.d(M_BUS + TAG,"bmQr = null "); } } } @@ -443,7 +443,7 @@ public class BusFragment extends BaseBusTabFragment } public void clearBusStationsMarkers(){ - CallerLogger.INSTANCE.d(M_BUS + TAG,"clearBusStationsMarkers()"); + CallerLogger.d(M_BUS + TAG,"clearBusStationsMarkers()"); if (null != startStation) { setOrRemoveMapMaker(false, BusConst.BUS_START_MAP_MAKER, startStation.getLat() , startStation.getLon(),R.raw.star_marker); @@ -454,7 +454,7 @@ public class BusFragment extends BaseBusTabFragment } //清除鹰眼右下角小地图轨迹 - CallerLogger.INSTANCE.d(SceneConstant.M_BUS, "clearBusStationsMarkers --------->"); + CallerLogger.d(SceneConstant.M_BUS, "clearBusStationsMarkers --------->"); smallMapView.clearPolyline(); } @@ -478,7 +478,7 @@ public class BusFragment extends BaseBusTabFragment private void setOrRemoveMapMaker(boolean isAdd, String uuid, double lat, double longi,int resourceId) { if (isAdd) { Runnable setMapMarkerRunnable = () -> { - CallerLogger.INSTANCE.d(M_BUS + "setMapMaker= "+Thread.currentThread().getName(), + CallerLogger.d(M_BUS + "setMapMaker= "+Thread.currentThread().getName(), uuid + "=latitude=" + lat + ",longitude=" + longi); Point.Options.Builder builder = new Point.Options.Builder(BusConst.TYPE_MARKER_BUS_ORDER, Level.MAP_MARKER) @@ -511,7 +511,7 @@ public class BusFragment extends BaseBusTabFragment }else { Runnable removeMapMarkerRunnable = () -> { - CallerLogger.INSTANCE.d(M_BUS + "RemoveMapMaker="+Thread.currentThread().getName(), + CallerLogger.d(M_BUS + "RemoveMapMaker="+Thread.currentThread().getName(), uuid+"=latitude="+lat+",longitude="+longi); IMoGoOverlayManager overlayManager = CallerMapUIServiceManager.INSTANCE.getOverlayManager(); if (overlayManager != null) { diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java index 3c8415d86c..d85b685282 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java @@ -37,7 +37,7 @@ public class BusModelLoopManager { // if (mQueryPassengerDisposable != null && !mQueryPassengerDisposable.isDisposed()) { // return; // } -// CallerLogger.INSTANCE.i(M_BUS + TAG, "startQueryPassengerWriteOffLoop()"); +// CallerLogger.i(M_BUS + TAG, "startQueryPassengerWriteOffLoop()"); // mQueryPassengerDisposable = Observable.interval(LOOP_DELAY_500, // LOOP_PASSENGER_5S, TimeUnit.MILLISECONDS) // .map((aLong -> aLong + 1)) @@ -48,7 +48,7 @@ public class BusModelLoopManager { // public void stopQueryPassengerWriteOffLoop() { // if (mQueryPassengerDisposable != null) { -// CallerLogger.INSTANCE.i(M_BUS + TAG, "stopQueryPassengerWriteOffLoop()"); +// CallerLogger.i(M_BUS + TAG, "stopQueryPassengerWriteOffLoop()"); // mQueryPassengerDisposable.dispose(); // mQueryPassengerDisposable = null; // } @@ -58,7 +58,7 @@ public class BusModelLoopManager { if (mHeartbeatDisposable != null && !mHeartbeatDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.i(M_BUS + TAG, "startHeartbeatLoop()"); + CallerLogger.i(M_BUS + TAG, "startHeartbeatLoop()"); mHeartbeatDisposable = Observable.interval(BusConst.LOOP_DELAY, BusConst.LOOP_PERIOD_60S, TimeUnit.MILLISECONDS) .map((aLong -> aLong + 1)) @@ -69,7 +69,7 @@ public class BusModelLoopManager { public void stopHeartbeatLoop() { if (mHeartbeatDisposable != null) { - CallerLogger.INSTANCE.i(M_BUS + TAG, "stopHeartbeatLoop()"); + CallerLogger.i(M_BUS + TAG, "stopHeartbeatLoop()"); mHeartbeatDisposable.dispose(); mHeartbeatDisposable = null; } diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java index 998ae0d68b..a500888d16 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java @@ -123,7 +123,7 @@ public class BusPresenter extends Presenter }else { mCurrentStation = arrivingOrArrivedIndex -1; } - CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel =", " mCurrentStation =" + mCurrentStation); + CallerLogger.d(M_BUS + "BusOrderModel =", " mCurrentStation =" + mCurrentStation); if (mView != null) { runOnUIThread(() -> mView.updateBusTaskStatus(lineName,lineTime, stationList, arrivingOrArrivedIndex, isArrived)); @@ -150,7 +150,7 @@ public class BusPresenter extends Presenter @Override public void onAutopilotArriveAtStation(MessagePad.ArrivalNotification arrivalNotification) { - CallerLogger.INSTANCE.e( M_BUS + TAG, "行程日志-onAutopilotArriveAtStation arrive"); + CallerLogger.e( M_BUS + TAG, "行程日志-onAutopilotArriveAtStation arrive"); OrderModel.getInstance().onArriveAt(arrivalNotification); } @@ -171,7 +171,7 @@ public class BusPresenter extends Presenter && OrderModel.getInstance().isGoingToNextStation() ) ) { - CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel=", "有美化功能"); + CallerLogger.d(M_BUS + "BusOrderModel=", "有美化功能"); return; } // 改变UI自动驾驶状态 @@ -256,7 +256,7 @@ public class BusPresenter extends Presenter @Override public void loginSuccess(DriverStatusQueryRespBean data) { - CallerLogger.INSTANCE.d(M_BUS + TAG, " loginStatus =" + LoginStatusManager.isLogin()); + CallerLogger.d(M_BUS + TAG, " loginStatus =" + LoginStatusManager.isLogin()); if(LoginStatusManager.isLogin()){ OrderModel.getInstance().startOrStopOrderLoop(true); OrderModel.getInstance().queryBusRoutes(); diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java index b9ffc6d492..3884897d04 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java @@ -25,7 +25,7 @@ public class TestBusBroadcastReceiver extends BroadcastReceiver { try { this.mContext = context; int sceneType = intent.getIntExtra(BusConst.BROADCAST_TEST_BUS_CONTROL_TYPE_EXTRA_KEY, 0); - CallerLogger.INSTANCE.d(M_BUS + TAG, "sceneType:" + sceneType); + CallerLogger.d(M_BUS + TAG, "sceneType:" + sceneType); // 分发场景 dispatchSceneTest(sceneType); diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java index 51814cbd37..6c9165e94e 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java @@ -54,11 +54,11 @@ public class BusTrajectoryManager { if (LoginStatusManager.isLogin() && routesResult != null && OrderModel.getInstance().getCurrentStationIndex() == 0 && !OrderModel.getInstance().isGoingToNextStation()) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "syncTrajectoryInfo() start."); + CallerLogger.d(M_BUS + TAG, "syncTrajectoryInfo() start."); startTrajReqLoop(); } else { // 无路线信息or当前未在始发站 - CallerLogger.INSTANCE.d(M_BUS + TAG, "syncTrajectoryInfo() stop."); + CallerLogger.d(M_BUS + TAG, "syncTrajectoryInfo() stop."); stopTrajReqLoop(); } } @@ -71,31 +71,31 @@ public class BusTrajectoryManager { if (guardianInfo == null || !guardianInfo.hasCode()) return; if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) { // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发） - CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹开始下载"); + CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹开始下载"); // ToastUtils.showShort("轨迹开始下载"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) { // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发） - CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载成功"); + CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载成功"); // ToastUtils.showShort("轨迹下载成功"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) { // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹 - CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() " + + CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地无对应轨迹"); // ToastUtils.showShort("轨迹下载失败，本地无对应轨迹"); } else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) { // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功 - CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() " + + CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地有对应轨迹，认为成功"); // ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功"); } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) { // 5. 轨迹管理_轨迹下载超时 - CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载超时"); + CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载超时"); // ToastUtils.showShort("轨迹下载超时"); } else if ("ISSM_FUNC_AUTO_PILOT_READY".equals(guardianInfo.getCode())) { // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。 - CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() ssm ready，再次发起下载"); + CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() ssm ready，再次发起下载"); syncTrajectoryInfo(); } } @@ -103,7 +103,7 @@ public class BusTrajectoryManager { private void setupAutoPilotLine() { BusRoutesResult routesResult = OrderModel.getInstance().getBusRoutesResult(); if (routesResult == null) { - CallerLogger.INSTANCE.e(M_BUS + TAG, + CallerLogger.e(M_BUS + TAG, "setupAutoPilotLine(): routesResult is null."); return; } else { @@ -155,7 +155,7 @@ public class BusTrajectoryManager { if (mSendReqDisposable != null && !mSendReqDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.d(M_BUS + TAG, "startTrajReqLoop()"); + CallerLogger.d(M_BUS + TAG, "startTrajReqLoop()"); setupAutoPilotLine(); mSendReqDisposable = Observable.interval(BusConst.LOOP_DELAY, BusConst.LOOP_PERIOD_10S, TimeUnit.MILLISECONDS) @@ -167,14 +167,14 @@ public class BusTrajectoryManager { stopTrajReqLoop(); return; } - CallerLogger.INSTANCE.d(M_BUS + TAG, "loop sendTrajectoryReq: " + aLong); + CallerLogger.d(M_BUS + TAG, "loop sendTrajectoryReq: " + aLong); sendTrajectoryReq(); }); } public void stopTrajReqLoop() { if (mSendReqDisposable != null) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "stopTrajReqLoop()"); + CallerLogger.d(M_BUS + TAG, "stopTrajReqLoop()"); mSendReqDisposable.dispose(); mSendReqDisposable = null; clearAutoPilotLine(); @@ -183,12 +183,12 @@ public class BusTrajectoryManager { private void sendTrajectoryReq() { if (mAutoPilotLine == null) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!"); + CallerLogger.e(M_BUS + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!"); return; } CallerAutoPilotControlManager.INSTANCE.sendTrajectoryDownloadReq(mAutoPilotLine); - CallerLogger.INSTANCE.d(M_BUS + TAG, "sendTrajectoryReq(): " + CallerLogger.d(M_BUS + TAG, "sendTrajectoryReq(): " + GsonUtils.toJson(mAutoPilotLine)); } } diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusModel.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusModel.java index a2951bfbde..3fa8c57873 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusModel.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusModel.java @@ -59,7 +59,7 @@ public abstract class OchCommonLoginStatusModel { public void onSuccess(DriverStatusQueryRespBean data) { if (null != data && 0 == data.code) { LoginStatusManager.setLoginStatus(data.data.driverStatus); - CallerLogger.INSTANCE.d(M_TAXI + TAG, "changeCarStatus:" + LoginStatusManager.getLoginStatus()); + CallerLogger.d(M_TAXI + TAG, "changeCarStatus:" + LoginStatusManager.getLoginStatus()); loginSuccess(data); } } 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 3bb41f5c9b..c730bdd54a 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 @@ -136,7 +136,7 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { public void onNaviInfoUpdate(NaviInfo naviinfo) { //导航过程中的信息更新，请看NaviInfo的具体说明 if (null != mNaviChangedCallback){ - CallerLogger.INSTANCE.i(M_TAXI + TAG, "距离=" + naviinfo.getPathRetainDistance() + ", 剩余时间 " + naviinfo.getPathRetainTime()); + CallerLogger.i(M_TAXI + TAG, "距离=" + naviinfo.getPathRetainDistance() + ", 剩余时间 " + naviinfo.getPathRetainTime()); mNaviChangedCallback.onCurrentNaviDistAndTimeChanged(naviinfo.getPathRetainDistance(),naviinfo.getPathRetainTime());// 米、秒 } } @@ -171,8 +171,8 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { return; } - CallerLogger.INSTANCE.i(M_TAXI + TAG, "路线计算失败：错误码=" + result.getErrorCode() + ",Error Message= " + result.getErrorDetail()); - CallerLogger.INSTANCE.i(M_TAXI + TAG, "错误码详细链接见：http://lbs.amap.com/api/android-navi-sdk/guide/tools/errorcode/"); + CallerLogger.i(M_TAXI + TAG, "路线计算失败：错误码=" + result.getErrorCode() + ",Error Message= " + result.getErrorDetail()); + CallerLogger.i(M_TAXI + TAG, "错误码详细链接见：http://lbs.amap.com/api/android-navi-sdk/guide/tools/errorcode/"); } @Override public void onStartNavi(int type) { @@ -258,7 +258,7 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { // //当前用户要执行的动作 // int recommend = aMapLaneInfo.frontLane[i]; // -// CallerLogger.INSTANCE.e(M_TAXI + "ggb", "---->>> background is " + background + " ; recommend is " + recommend); +// CallerLogger.e(M_TAXI + "ggb", "---->>> background is " + background + " ; recommend is " + recommend); // //根据文档中每个动作对应的枚举类型，显示对应的图片 // try { // sb.append("，第" + (i + 1) + "车道为" + array[background]); @@ -270,7 +270,7 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { // e.printStackTrace(); // } // } -// CallerLogger.INSTANCE.e(M_TAXI + "showLaneInfo", sb.toString()); +// CallerLogger.e(M_TAXI + "showLaneInfo", sb.toString()); } @Override diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/BusProvider.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/BusProvider.java index e8f3e0f280..3aa7c64360 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/BusProvider.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/BusProvider.java @@ -37,7 +37,7 @@ public class BusProvider implements IMogoOCH { * 进入鹰眼模式，设置手势缩放地图失效 */ private void stepIntoVrMode() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "进入vr模式"); + CallerLogger.d(M_BUS + TAG, "进入vr模式"); CallerMoGoUiSettingManager.INSTANCE.stepInNightMode();//夜间模式 状态栏字体颜色变黑 } @@ -48,7 +48,7 @@ public class BusProvider implements IMogoOCH { private void showFragment() { FragmentManager supportFragmentManager = activity.getSupportFragmentManager(); if (busFragment == null) { - CallerLogger.INSTANCE.d(TAG, "准备add fragment======"); + CallerLogger.d(TAG, "准备add fragment======"); Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(BusFragment.TAG); if (fragmentByTag instanceof BusFragment) { busFragment = (BusFragment) fragmentByTag; @@ -60,13 +60,13 @@ public class BusProvider implements IMogoOCH { } return; } - CallerLogger.INSTANCE.d(TAG, "准备show fragment"); + CallerLogger.d(TAG, "准备show fragment"); supportFragmentManager.beginTransaction().show(busFragment).commitAllowingStateLoss(); } private void hideFragment() { if (busFragment != null) { - CallerLogger.INSTANCE.d(TAG, "准备hide fragment"); + CallerLogger.d(TAG, "准备hide fragment"); activity.getSupportFragmentManager().beginTransaction().hide(busFragment).commitAllowingStateLoss(); } diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java index 2ee9511215..c82b96f50c 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java @@ -113,7 +113,7 @@ public class BusFragment extends BaseBusTabFragment groupStationsPanel = findViewById(R.id.group_stations_panel); noDataView = findViewById(R.id.no_line_data_view); - CallerLogger.INSTANCE.d(M_BUS + TAG, "initView: " + CallerAutoPilotStatusListenerManager.INSTANCE.getState()); + CallerLogger.d(M_BUS + TAG, "initView: " + CallerAutoPilotStatusListenerManager.INSTANCE.getState()); // 初始化的时候设置 UI 按钮状态 showAutopilotBiz(); @@ -131,10 +131,10 @@ public class BusFragment extends BaseBusTabFragment @Subscribe(threadMode = ThreadMode.MAIN) public void changeOverview(EventLogout eventLogout){ if (eventLogout.getMessgae() == EventLogout.LOGOUT_TYPE){ - CallerLogger.INSTANCE.d(M_BUS + TAG,"changeOverview Event消息去登出"); + CallerLogger.d(M_BUS + TAG,"changeOverview Event消息去登出"); mPresenter.logout(); }else if (eventLogout.getMessgae() == EventLogout.SHOW_QR_TYPE){ //显示二维码 - CallerLogger.INSTANCE.d(M_BUS + TAG,"changeOverview Event qrcode，sn = " + CallerLogger.d(M_BUS + TAG,"changeOverview Event qrcode，sn = " + MoGoAiCloudClientConfig.getInstance().getSn()); String qrUrl = String.format(FunctionBuildConfig.urlJson.getBindDriverQRUrl(), MoGoAiCloudClientConfig.getInstance().getSn()); @@ -148,7 +148,7 @@ public class BusFragment extends BaseBusTabFragment .cancelStr(getString(R.string.qr_cancel)) .qrBm(bmQr).build(getContext()).show(); }else { - CallerLogger.INSTANCE.d(M_BUS + TAG,"bmQr = null "); + CallerLogger.d(M_BUS + TAG,"bmQr = null "); } } } @@ -450,7 +450,7 @@ public class BusFragment extends BaseBusTabFragment } public void clearBusStationsMarkers(){ - CallerLogger.INSTANCE.d(M_BUS + TAG,"clearBusStationsMarkers()"); + CallerLogger.d(M_BUS + TAG,"clearBusStationsMarkers()"); if (null != startStation) { setOrRemoveMapMaker(false, BusConst.BUS_START_MAP_MAKER, startStation.getLat() , startStation.getLon(),R.raw.star_marker); @@ -461,7 +461,7 @@ public class BusFragment extends BaseBusTabFragment } //清除鹰眼右下角小地图轨迹 - CallerLogger.INSTANCE.d(SceneConstant.M_BUS, "clearBusStationsMarkers --------->"); + CallerLogger.d(SceneConstant.M_BUS, "clearBusStationsMarkers --------->"); smallMapView.clearPolyline(); } @@ -485,7 +485,7 @@ public class BusFragment extends BaseBusTabFragment private void setOrRemoveMapMaker(boolean isAdd, String uuid, double lat, double longi,int resourceId) { if (isAdd) { Runnable setMapMarkerRunnable = () -> { - CallerLogger.INSTANCE.d(M_BUS + "setMapMaker= "+Thread.currentThread().getName(), + CallerLogger.d(M_BUS + "setMapMaker= "+Thread.currentThread().getName(), uuid + "=latitude=" + lat + ",longitude=" + longi); Point.Options.Builder builder = new Point.Options.Builder(BusConst.TYPE_MARKER_BUS_ORDER, Level.MAP_MARKER) @@ -518,7 +518,7 @@ public class BusFragment extends BaseBusTabFragment }else { Runnable removeMapMarkerRunnable = () -> { - CallerLogger.INSTANCE.d(M_BUS + "RemoveMapMaker="+Thread.currentThread().getName(), + CallerLogger.d(M_BUS + "RemoveMapMaker="+Thread.currentThread().getName(), uuid+"=latitude="+lat+",longitude="+longi); Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getOverlayManager()).removePoint(uuid); }; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java index 50ab8f5bb7..58bf85296e 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java @@ -195,31 +195,31 @@ public class OrderModel { public void accept(Throwable e) { if (e instanceof UndeliverableException) { e = e.getCause(); - CallerLogger.INSTANCE.d(M_BUS + TAG, "UndeliverableException"); + CallerLogger.d(M_BUS + TAG, "UndeliverableException"); } if ((e instanceof IOException)) {// // fine, irrelevant network problem or API that throws on cancellation - CallerLogger.INSTANCE.d(M_BUS + TAG, "IOException"); + CallerLogger.d(M_BUS + TAG, "IOException"); return; } if (e instanceof InterruptedException) { // fine, some blocking code was interrupted by a dispose call - CallerLogger.INSTANCE.d(M_BUS + TAG, "InterruptedException"); + CallerLogger.d(M_BUS + TAG, "InterruptedException"); return; } if ((e instanceof NullPointerException) || (e instanceof IllegalArgumentException)) { // that's likely a bug in the application - CallerLogger.INSTANCE.d(M_BUS + TAG, "NullPointerException or IllegalArgumentException"); + CallerLogger.d(M_BUS + TAG, "NullPointerException or IllegalArgumentException"); Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e); return; } if (e instanceof IllegalStateException) { // that's a bug in RxJava or in a custom operator - CallerLogger.INSTANCE.d(M_BUS + TAG, "IllegalStateException"); + CallerLogger.d(M_BUS + TAG, "IllegalStateException"); Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e); return; } - CallerLogger.INSTANCE.d(M_BUS + TAG, "Undeliverable exception"); + CallerLogger.d(M_BUS + TAG, "Undeliverable exception"); } }); } @@ -234,7 +234,7 @@ public class OrderModel { @Override public void onReceivedMsg(int type, @NonNull byte[] byteArray) { if (OchCommonConst.BUSINESS_STRING == type){ - CallerLogger.INSTANCE.d(M_BUS + BaseDPMsg.TAG,new String(byteArray)); + CallerLogger.d(M_BUS + BaseDPMsg.TAG,new String(byteArray)); BaseDPMsg msg = GsonUtils.fromJson(new String(byteArray),BaseDPMsg.class); if (msg!=null && msg.getType() == DPMsgType.TYPE_TASK_DETAILS.getType()){ sendTaskDetailsToClients(); @@ -253,12 +253,12 @@ public class OrderModel { @Override public void onMsgReceived(SystemMsg obj) { if (obj == null){ - CallerLogger.INSTANCE.d(M_BUS + TAG, "onMsgReceived = null"); + CallerLogger.d(M_BUS + TAG, "onMsgReceived = null"); return; } - CallerLogger.INSTANCE.i(M_BUS + TAG,"onMsgReceived = "+obj.getContext()); + CallerLogger.i(M_BUS + TAG,"onMsgReceived = "+obj.getContext()); List list = obj.getScreenList(); - CallerLogger.INSTANCE.i(M_BUS + TAG,"onMsgReceived = "+GsonUtils.toJson(list)); + CallerLogger.i(M_BUS + TAG,"onMsgReceived = "+GsonUtils.toJson(list)); if (list != null && list.contains(1)){ // 1司机端 OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(DateTimeUtil.getCurrentTimeStamp(), @@ -284,7 +284,7 @@ public class OrderModel { @Override public void onMsgReceived(WriteOffPassenger passenger) { //进行播报 - CallerLogger.INSTANCE.i(M_BUS + TAG,"passenger = "+ GsonUtil.jsonFromObject(passenger)); + CallerLogger.i(M_BUS + TAG,"passenger = "+ GsonUtil.jsonFromObject(passenger)); if (passenger != null && passenger.passengerSize == 0) return; if (mPassengerCallback != null){ mPassengerCallback.playPassenger(passenger); @@ -386,7 +386,7 @@ public class OrderModel { public void onStartAutopilotFailure(@NotNull String startFailedCode, @NonNull String startFailedMessage) { BusAnalyticsManager.getInstance().triggerStartAutopilotFailureEventByAdas(startFailedCode, startFailedMessage); if (mADASStatusCallback != null && !FunctionBuildConfig.isDemoMode){ - CallerLogger.INSTANCE.e( M_BUS + TAG, "mAdasStartFailureListener = "+startFailedMessage ); + CallerLogger.e( M_BUS + TAG, "mAdasStartFailureListener = "+startFailedMessage ); mADASStatusCallback.onStartAdasFailure(); } } @@ -415,7 +415,7 @@ public class OrderModel { private void judgeArrivedStation(MogoLocation location) { if (backgroundCurrentStationIndex + 1 > stationList.size() - 1) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "到站数组越界"); + CallerLogger.e(M_BUS + TAG, "到站数组越界"); return; } BusStationBean upcomingStation = stationList.get(backgroundCurrentStationIndex + 1); @@ -427,7 +427,7 @@ public class OrderModel { location.getLongitude(), location.getLatitude()); if (distance <= BusConst.ARRIVE_AT_END_STATION_DISTANCE) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-judgeArrivedStation() distance = " + distance + CallerLogger.d(M_BUS + TAG, "行程日志-judgeArrivedStation() distance = " + distance + " to " + upcomingStation.getName()); onArriveAt(null); //无自动驾驶到站信息传null return; @@ -469,7 +469,7 @@ public class OrderModel { CacheDataManager.Companion.getInstance().clearCacheData(mContext, BusCacheKey.BUS_LINE_CACHE); return; } - CallerLogger.INSTANCE.d(M_BUS + TAG, "获取到小巴路线数据: " + GsonUtils.toJson(data)); + CallerLogger.d(M_BUS + TAG, "获取到小巴路线数据: " + GsonUtils.toJson(data)); updateBusStatus(data); } @@ -477,7 +477,7 @@ public class OrderModel { * 查询小巴路线 */ public void queryBusRoutes() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "查询小巴路线"); + CallerLogger.d(M_BUS + TAG, "查询小巴路线"); OrderServiceManager.queryBusRoutes(mContext, new OchCommonServiceCallback() { @Override public void onSuccess(BusRoutesResponse data) { @@ -486,7 +486,7 @@ public class OrderModel { || data.getResult().getSites() == null || data.getResult().getSites().isEmpty()) { // //当为空时,显示无绑定路线图 - CallerLogger.INSTANCE.d(M_BUS + TAG, "获取到小巴路线数据:空 "); + CallerLogger.d(M_BUS + TAG, "获取到小巴路线数据:空 "); if (refreshBusStationsCallback != null) { refreshBusStationsCallback.updateEmptyUi(); } @@ -499,7 +499,7 @@ public class OrderModel { } if (busRoutesResult == null || busRoutesResult.getWriteVersion() < data.getResult().getWriteVersion()){ - CallerLogger.INSTANCE.d(M_BUS + TAG, "更新小巴路线数据: " + data); + CallerLogger.d(M_BUS + TAG, "更新小巴路线数据: " + data); updateBusStatus(data.getResult()); pushCacheTransferData(data.getResult()); } @@ -584,12 +584,12 @@ public class OrderModel { * 重置路线站点状态--结束路线，当前路线恢复到始发站 */ public void abortTask() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "结束当前路线abortTask"); + CallerLogger.d(M_BUS + TAG, "结束当前路线abortTask"); OrderServiceManager.abortTask(mContext, currentTaskId , new OchCommonServiceCallback() { @Override public void onSuccess(BaseData o) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "abortTask success: " + o); + CallerLogger.d(M_BUS + TAG, "abortTask success: " + o); if (o.code == 0) { // 重置成功 endOrAbortTaskSuccess(); clearBusStationDatas(); @@ -727,13 +727,13 @@ public class OrderModel { AutopilotControlParameters parameters = initAutopilotControlParameters(leaveIndex); if (null == parameters) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "行程日志-AutopilotControlParameters is empty."); + CallerLogger.e(M_BUS + TAG, "行程日志-AutopilotControlParameters is empty."); return; } CallerAutoPilotControlManager.INSTANCE.startAutoPilot(parameters); - CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-开启自动驾驶====" + GsonUtil.jsonFromObject(parameters) + CallerLogger.d(M_BUS + TAG, "行程日志-开启自动驾驶====" + GsonUtil.jsonFromObject(parameters) + " startLatLon=" + parameters.startName + "，endLatLon=" + parameters.endName + "isRestart = " + isRestart); @@ -747,14 +747,14 @@ public class OrderModel { */ private void arriveSiteStation() { if ( backgroundCurrentStationIndex +1 > stationList.size() - 1 ) { //到站短时间内调用多次 - CallerLogger.INSTANCE.e( M_BUS + TAG, "数组越界" ); + CallerLogger.e( M_BUS + TAG, "数组越界" ); return; } int arrivedStationIndex = backgroundCurrentStationIndex + 1; String arriveStation = stationList.get(arrivedStationIndex).getName(); String arriveStationKr = stationList.get(arrivedStationIndex).getNameKr(); String departureStopName = stationList.get(backgroundCurrentStationIndex).getName(); - CallerLogger.INSTANCE.d(M_BUS + TAG, "arriveSiteStation-currentStationIndex = " + arrivedStationIndex); + CallerLogger.d(M_BUS + TAG, "arriveSiteStation-currentStationIndex = " + arrivedStationIndex); isArrivedStation = true; isGoingToNextStation = false; @@ -770,7 +770,7 @@ public class OrderModel { new OchCommonServiceCallback() { @Override public void onSuccess(BaseData o) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-arriveSiteStation success"); + CallerLogger.d(M_BUS + TAG, "行程日志-arriveSiteStation success"); // if (o != null && o.code == 0){ // queryBusRoutes(); // isArrivedStation = true; @@ -832,14 +832,14 @@ public class OrderModel { BusTransferData data = new BusTransferData(LoginStatusManager.isLogin() ? 1:0,busRoutesResult); TaskDetailsMsg msg = new TaskDetailsMsg(GsonUtils.toJson(data)); - CallerLogger.INSTANCE.d(M_BUS + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg)); + CallerLogger.d(M_BUS + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg)); CallerTelematicManager.INSTANCE.sendMsgToAllClients(OchCommonConst.BUSINESS_STRING, GsonUtils.toJson(msg).getBytes()); } private void pushCacheTransferData(BusRoutesResult result) { BusTransferData data = new BusTransferData(LoginStatusManager.isLogin() ? 1:0,result); - CallerLogger.INSTANCE.d(M_BUS + TAG, "pushCacheTransferData = " + GsonUtils.toJson(data)); + CallerLogger.d(M_BUS + TAG, "pushCacheTransferData = " + GsonUtils.toJson(data)); CacheDataManager.Companion.getInstance().putCacheData(mContext, BusCacheKey.BUS_LINE_CACHE, GsonUtils.toJson(data)); @@ -882,7 +882,7 @@ public class OrderModel { * 离站上报 */ public void leaveStation() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "leaveStation-backgroundCurrentStationIndex = " + backgroundCurrentStationIndex); + CallerLogger.d(M_BUS + TAG, "leaveStation-backgroundCurrentStationIndex = " + backgroundCurrentStationIndex); String nextStationName = ""; String nextStationNameKr = ""; if (backgroundCurrentStationIndex < stationList.size() - 1) { @@ -894,7 +894,7 @@ public class OrderModel { String finalNextStationNameKr = nextStationNameKr; isArrivedStation = false; - CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-离站成功开往下一站===="); + CallerLogger.d(M_BUS + TAG, "行程日志-离站成功开往下一站===="); long writeVersion = DateTimeUtil.getCurrentTimeStamp(); leaveStationSuccess(backgroundCurrentStationIndex, currentStationName, @@ -908,7 +908,7 @@ public class OrderModel { @Override public void onSuccess(BaseData o) { // isArrivedStation = false; -// CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-离站成功开往下一站===="); +// CallerLogger.d(M_BUS + TAG, "行程日志-离站成功开往下一站===="); // //需要更改当前站和下一站的状态 然后渲染 // //startOrStopQueryPassengerWriteOff(false); // queryBusRoutes(); @@ -956,7 +956,7 @@ public class OrderModel { FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false; //是否强制绘制引导线 CallerAutoPilotControlManager.INSTANCE.setIgnoreConditionDraw(false);// 同步给乘客屏 CallerAutoPilotControlManager.INSTANCE.setIPCDemoMode(false);//是否自动启动自驾 - CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：置为false"); + CallerLogger.d(M_BUS + TAG, "美化模式-ignore：置为false"); } } @@ -991,7 +991,7 @@ public class OrderModel { for (int i = 0; i < stationList.size(); i++) { BusStationBean s = stationList.get(i); - CallerLogger.INSTANCE.d(M_BUS + "updateBusStationsStatus--", + CallerLogger.d(M_BUS + "updateBusStationsStatus--", "Index=" + i + " ,name = " + s.getName() + " ," + s.isLeaving() + "," + s.getDrivingStatus()); // 是否正在开往下一站 @@ -1024,7 +1024,7 @@ public class OrderModel { BusStationBean currentStation = stationList.get(backgroundCurrentStationIndex); - CallerLogger.INSTANCE.d(M_BUS + TAG, + CallerLogger.d(M_BUS + TAG, "行程日志-STATION_STATUS_STOPPED-backgroundCurrentStationIndex=" + backgroundCurrentStationIndex + " isLeaving()=" + currentStation.isLeaving()); @@ -1034,11 +1034,11 @@ public class OrderModel { && backgroundCurrentStationIndex <= stationList.size() - 1)) {//行驶过程中设置美化 if (stationList.get(backgroundCurrentStationIndex).isLeaving()) { startBeautificationMode(); - CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：置为true（每次滑动出发）"); + CallerLogger.d(M_BUS + TAG, "美化模式-ignore：置为true（每次滑动出发）"); } else if (backgroundCurrentStationIndex > 0 && backgroundCurrentStationIndex < stationList.size() - 1) { //美化模式下 中间站点到站 引导线要一直绘制，所以此处不出强制绘制不传false CallerAutoPilotControlManager.INSTANCE.setIPCDemoMode(false); - CallerLogger.INSTANCE.d(M_BUS + TAG, "美化模式-ignore：false（到达中间站）"); + CallerLogger.d(M_BUS + TAG, "美化模式-ignore：false（到达中间站）"); clearStartAutopilotTag(); } else { closeBeautificationMode(); @@ -1151,7 +1151,7 @@ public class OrderModel { * 在踩刹车、控制方向盘等操作后，会停止自动驾驶，重启自动驾驶的话相当于重新设置自动驾驶目的地 */ public void restartAutopilot() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-重启自动驾驶===" + isGoingToNextStation); + CallerLogger.d(M_BUS + TAG, "行程日志-重启自动驾驶===" + isGoingToNextStation); //只去启动自动驾驶，不再去上报离站 startAutopilot(firstStartAutopilot >= 1, -1); } @@ -1166,10 +1166,10 @@ public class OrderModel { private void travelOver() { if (backgroundCurrentStationIndex >= stationList.size()) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "travel over index out of station list"); + CallerLogger.e(M_BUS + TAG, "travel over index out of station list"); return; } - CallerLogger.INSTANCE.d(M_BUS + TAG, "单程结束===="); + CallerLogger.d(M_BUS + TAG, "单程结束===="); CallerAutoPilotControlManager.INSTANCE.cancelAutoPilot(); endTask(); @@ -1179,12 +1179,12 @@ public class OrderModel { * task正常结束 */ private void endTask() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "任务正常走完endTask()"); + CallerLogger.d(M_BUS + TAG, "任务正常走完endTask()"); OrderServiceManager.endTask(mContext, currentTaskId , new OchCommonServiceCallback() { @Override public void onSuccess(BaseData o) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "endTask success: " + o); + CallerLogger.d(M_BUS + TAG, "endTask success: " + o); if (o.code == 0) { endOrAbortTaskSuccess(); clearBusStationDatas(); @@ -1223,7 +1223,7 @@ public class OrderModel { */ public void onArriveAt(MessagePad.ArrivalNotification data) { if (backgroundCurrentStationIndex + 1 > stationList.size() - 1) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "行程日志-到站异常，取消后续操作结束"); + CallerLogger.e(M_BUS + TAG, "行程日志-到站异常，取消后续操作结束"); return; } @@ -1240,14 +1240,14 @@ public class OrderModel { String arriveLon = NumberFormatUtil.cutOutNumber(arriveStation.getLon(), 5); if (!latitude.equals(arriveLat) || !longitude.equals(arriveLon)) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "行程日志-到站拦截,到站坐标不一致"); + CallerLogger.e(M_BUS + TAG, "行程日志-到站拦截,到站坐标不一致"); return; } } if (isArrivedStation) return; - CallerLogger.INSTANCE.d(M_BUS + TAG, "行程日志-当前==backgroundCurrentStationIndex=" + CallerLogger.d(M_BUS + TAG, "行程日志-当前==backgroundCurrentStationIndex=" + backgroundCurrentStationIndex); arriveSiteStation(); @@ -1298,15 +1298,15 @@ public class OrderModel { AutopilotControlParameters parameters = initAutopilotControlParameters(-1); if (null == parameters) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "AutopilotControlParameters is empty."); + CallerLogger.e(M_BUS + TAG, "AutopilotControlParameters is empty."); return; } - CallerLogger.INSTANCE.d(M_BUS + TAG, "AutopilotControlParameters is update."); + CallerLogger.d(M_BUS + TAG, "AutopilotControlParameters is update."); CallerAutoPilotStatusListenerManager.INSTANCE.updateAutopilotControlParameters(parameters); } private void clearAutopilotControlParameters() { - CallerLogger.INSTANCE.d(M_BUS + TAG, "AutopilotControlParameters is clear."); + CallerLogger.d(M_BUS + TAG, "AutopilotControlParameters is clear."); CallerAutoPilotStatusListenerManager.INSTANCE.updateAutopilotControlParameters(null); } @@ -1316,14 +1316,14 @@ public class OrderModel { if (leaveIndex < 0) { if (backgroundCurrentStationIndex + 1 > stationList.size() - 1 || !isGoingToNextStation) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "行程日志-mismatch condition1."); + CallerLogger.e(M_BUS + TAG, "行程日志-mismatch condition1."); return null; } currentStation = stationList.get(backgroundCurrentStationIndex); nextStation = stationList.get(backgroundCurrentStationIndex + 1); } else { if (leaveIndex + 1 > stationList.size() - 1 || !isGoingToNextStation) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "行程日志-mismatch condition2."); + CallerLogger.e(M_BUS + TAG, "行程日志-mismatch condition2."); return null; } currentStation = stationList.get(leaveIndex); diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java index 3c8415d86c..d85b685282 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java @@ -37,7 +37,7 @@ public class BusModelLoopManager { // if (mQueryPassengerDisposable != null && !mQueryPassengerDisposable.isDisposed()) { // return; // } -// CallerLogger.INSTANCE.i(M_BUS + TAG, "startQueryPassengerWriteOffLoop()"); +// CallerLogger.i(M_BUS + TAG, "startQueryPassengerWriteOffLoop()"); // mQueryPassengerDisposable = Observable.interval(LOOP_DELAY_500, // LOOP_PASSENGER_5S, TimeUnit.MILLISECONDS) // .map((aLong -> aLong + 1)) @@ -48,7 +48,7 @@ public class BusModelLoopManager { // public void stopQueryPassengerWriteOffLoop() { // if (mQueryPassengerDisposable != null) { -// CallerLogger.INSTANCE.i(M_BUS + TAG, "stopQueryPassengerWriteOffLoop()"); +// CallerLogger.i(M_BUS + TAG, "stopQueryPassengerWriteOffLoop()"); // mQueryPassengerDisposable.dispose(); // mQueryPassengerDisposable = null; // } @@ -58,7 +58,7 @@ public class BusModelLoopManager { if (mHeartbeatDisposable != null && !mHeartbeatDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.i(M_BUS + TAG, "startHeartbeatLoop()"); + CallerLogger.i(M_BUS + TAG, "startHeartbeatLoop()"); mHeartbeatDisposable = Observable.interval(BusConst.LOOP_DELAY, BusConst.LOOP_PERIOD_60S, TimeUnit.MILLISECONDS) .map((aLong -> aLong + 1)) @@ -69,7 +69,7 @@ public class BusModelLoopManager { public void stopHeartbeatLoop() { if (mHeartbeatDisposable != null) { - CallerLogger.INSTANCE.i(M_BUS + TAG, "stopHeartbeatLoop()"); + CallerLogger.i(M_BUS + TAG, "stopHeartbeatLoop()"); mHeartbeatDisposable.dispose(); mHeartbeatDisposable = null; } diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java index de2a58d256..d7e93dd771 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java @@ -130,7 +130,7 @@ public class BusPresenter extends Presenter }else { mCurrentStation = arrivingOrArrivedIndex -1; } - CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel =", " mCurrentStation =" + mCurrentStation); + CallerLogger.d(M_BUS + "BusOrderModel =", " mCurrentStation =" + mCurrentStation); if (mView != null) { runOnUIThread(() -> mView.updateBusTaskStatus(lineName,lineTime, stationList, arrivingOrArrivedIndex, isArrived)); @@ -157,7 +157,7 @@ public class BusPresenter extends Presenter @Override public void onAutopilotArriveAtStation(MessagePad.ArrivalNotification arrivalNotification) { - CallerLogger.INSTANCE.e( M_BUS + TAG, "行程日志-onAutopilotArriveAtStation arrive"); + CallerLogger.e( M_BUS + TAG, "行程日志-onAutopilotArriveAtStation arrive"); OrderModel.getInstance().onArriveAt(arrivalNotification); } @@ -181,7 +181,7 @@ public class BusPresenter extends Presenter && OrderModel.getInstance().isGoingToNextStation() ) ) { - CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel=", "有美化功能"); + CallerLogger.d(M_BUS + "BusOrderModel=", "有美化功能"); return; } // 改变UI自动驾驶状态 @@ -268,7 +268,7 @@ public class BusPresenter extends Presenter @Override public void loginSuccess(DriverStatusQueryRespBean data) { - CallerLogger.INSTANCE.d(M_BUS + TAG, " loginStatus =" + LoginStatusManager.isLogin()); + CallerLogger.d(M_BUS + TAG, " loginStatus =" + LoginStatusManager.isLogin()); if(LoginStatusManager.isLogin()){ OrderModel.getInstance().startOrStopOrderLoop(true); // OrderModel.getInstance().queryBusRoutes(); diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java index b9ffc6d492..3884897d04 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java @@ -25,7 +25,7 @@ public class TestBusBroadcastReceiver extends BroadcastReceiver { try { this.mContext = context; int sceneType = intent.getIntExtra(BusConst.BROADCAST_TEST_BUS_CONTROL_TYPE_EXTRA_KEY, 0); - CallerLogger.INSTANCE.d(M_BUS + TAG, "sceneType:" + sceneType); + CallerLogger.d(M_BUS + TAG, "sceneType:" + sceneType); // 分发场景 dispatchSceneTest(sceneType); diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java index 947adbfc0c..3bbb0f8154 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java @@ -48,7 +48,7 @@ public class BusAnalyticsManager { private void triggerStartAutopilotFailureEvent(String failCode, String failMsg){ if (mStartAutopilotParams.isEmpty()) return; - CallerLogger.INSTANCE.e( M_BUS + "triggerStartAutopilotFailureEvent", failMsg ); + CallerLogger.e( M_BUS + "triggerStartAutopilotFailureEvent", failMsg ); if (CallerAutoPilotStatusListenerManager.INSTANCE.getState() != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){ diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java index 8e009220fb..13bf62b158 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java @@ -53,11 +53,11 @@ public class BusTrajectoryManager { if (LoginStatusManager.isLogin() && routesResult != null && OrderModel.getInstance().getCurrentStationIndex() == 0 && !OrderModel.getInstance().isGoingToNextStation()) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "syncTrajectoryInfo() start."); + CallerLogger.d(M_BUS + TAG, "syncTrajectoryInfo() start."); startTrajReqLoop(); } else { // 无路线信息or当前未在始发站 - CallerLogger.INSTANCE.d(M_BUS + TAG, "syncTrajectoryInfo() stop."); + CallerLogger.d(M_BUS + TAG, "syncTrajectoryInfo() stop."); stopTrajReqLoop(); } } @@ -70,31 +70,31 @@ public class BusTrajectoryManager { if (guardianInfo == null || !guardianInfo.hasCode()) return; if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) { // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发） - CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹开始下载"); + CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹开始下载"); // ToastUtils.showShort("轨迹开始下载"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) { // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发） - CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载成功"); + CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载成功"); // ToastUtils.showShort("轨迹下载成功"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) { // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹 - CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() " + + CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地无对应轨迹"); // ToastUtils.showShort("轨迹下载失败，本地无对应轨迹"); } else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) { // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功 - CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() " + + CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地有对应轨迹，认为成功"); // ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功"); } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) { // 5. 轨迹管理_轨迹下载超时 - CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载超时"); + CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载超时"); // ToastUtils.showShort("轨迹下载超时"); } else if ("ISSM_FUNC_AUTO_PILOT_READY".equals(guardianInfo.getCode())) { // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。 - CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() ssm ready，再次发起下载"); + CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() ssm ready，再次发起下载"); syncTrajectoryInfo(); } } @@ -102,7 +102,7 @@ public class BusTrajectoryManager { private void setupAutoPilotLine() { BusRoutesResult routesResult = OrderModel.getInstance().getBusRoutesResult(); if (routesResult == null) { - CallerLogger.INSTANCE.e(M_BUS + TAG, + CallerLogger.e(M_BUS + TAG, "setupAutoPilotLine(): routesResult is null."); return; } else { @@ -154,7 +154,7 @@ public class BusTrajectoryManager { if (mSendReqDisposable != null && !mSendReqDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.d(M_BUS + TAG, "startTrajReqLoop()"); + CallerLogger.d(M_BUS + TAG, "startTrajReqLoop()"); setupAutoPilotLine(); mSendReqDisposable = Observable.interval(BusConst.LOOP_DELAY, BusConst.LOOP_PERIOD_10S, TimeUnit.MILLISECONDS) @@ -166,14 +166,14 @@ public class BusTrajectoryManager { stopTrajReqLoop(); return; } - CallerLogger.INSTANCE.d(M_BUS + TAG, "loop sendTrajectoryReq: " + aLong); + CallerLogger.d(M_BUS + TAG, "loop sendTrajectoryReq: " + aLong); sendTrajectoryReq(); }); } public void stopTrajReqLoop() { if (mSendReqDisposable != null) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "stopTrajReqLoop()"); + CallerLogger.d(M_BUS + TAG, "stopTrajReqLoop()"); mSendReqDisposable.dispose(); mSendReqDisposable = null; clearAutoPilotLine(); @@ -182,12 +182,12 @@ public class BusTrajectoryManager { private void sendTrajectoryReq() { if (mAutoPilotLine == null) { - CallerLogger.INSTANCE.e(M_BUS + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!"); + CallerLogger.e(M_BUS + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!"); return; } CallerAutoPilotControlManager.INSTANCE.sendTrajectoryDownloadReq(mAutoPilotLine); - CallerLogger.INSTANCE.d(M_BUS + TAG, "sendTrajectoryReq(): " + CallerLogger.d(M_BUS + TAG, "sendTrajectoryReq(): " + GsonUtils.toJson(mAutoPilotLine)); } } diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java index e846a8cc76..6848df9720 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java +++ b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java @@ -73,14 +73,14 @@ public class MogoOCHBusPassenger implements IMogoOCH { * 进入鹰眼模式，设置手势缩放地图失效 */ private void stepIntoVrMode() { - CallerLogger.INSTANCE.d( M_TAXI_P + TAG, "进入vr模式" ); + CallerLogger.d( M_TAXI_P + TAG, "进入vr模式" ); CallerMoGoUiSettingManager.INSTANCE.stepInDayMode();//白天模式 状态栏字体颜色变黑 } private void showFragment() { FragmentManager supportFragmentManager = mActivity.getSupportFragmentManager(); if(mPassengerFragment == null){ - CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "准备add fragment======"); + CallerLogger.d(M_TAXI_P + TAG, "准备add fragment======"); Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(BusPassengerRouteFragment.TAG); if (fragmentByTag instanceof BusPassengerRouteFragment){ mPassengerFragment = (BusPassengerRouteFragment)fragmentByTag; @@ -94,7 +94,7 @@ public class MogoOCHBusPassenger implements IMogoOCH { return; } - CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "准备show fragment"); + CallerLogger.d(M_TAXI_P + TAG, "准备show fragment"); supportFragmentManager.beginTransaction().show(mPassengerFragment).commitAllowingStateLoss(); } 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 f61f7a836b..518254c5a6 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 @@ -183,7 +183,7 @@ public class BusPassengerModel { public void onSuccess(BusPassengerOperationStatusResponse data) { if (data == null || data.data == null) return; if (mDriverStatusCallback != null) { - CallerLogger.INSTANCE.d( M_BUS_P + TAG, "queryDriverOperationStatus = %s", data.data.plateNumber ); + CallerLogger.d( M_BUS_P + TAG, "queryDriverOperationStatus = %s", data.data.plateNumber ); mDriverStatusCallback.changeOperationStatus(data.data.driverStatus == 1); mDriverStatusCallback.updatePlateNumber(data.data.plateNumber); } @@ -212,12 +212,12 @@ public class BusPassengerModel { @Override public void onSuccess(BusPassengerRoutesResponse data) { if ( data == null || data.getResult() == null) { - CallerLogger.INSTANCE.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = null"); + CallerLogger.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = null"); clearLocalRouteResult(); return; } if (routesResult != null && data.getResult().equals(routesResult)){ - CallerLogger.INSTANCE.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = not update"); + CallerLogger.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = not update"); return; } @@ -235,14 +235,14 @@ public class BusPassengerModel { @Override public void onError() { - CallerLogger.INSTANCE.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = onError =" + CallerLogger.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = onError =" + ", sn = " +BusPassengerServiceManager.INSTANCE.getDriverAppSn()); queryDriverByLocalDriver(); } @Override public void onFail(int code, String msg) { - CallerLogger.INSTANCE.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = %s", msg + CallerLogger.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = %s", msg + ", sn = " +BusPassengerServiceManager.INSTANCE.getDriverAppSn()); if (code == 1003){ queryDriverOperationDelay(); @@ -278,7 +278,7 @@ public class BusPassengerModel { clearLocalRouteResult(); return; } - CallerLogger.INSTANCE.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = update"); + CallerLogger.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = update"); routesResult = result; if (mRouteLineInfoCallback != null){ @@ -421,7 +421,7 @@ public class BusPassengerModel { private final IMogoIntentListener mNetWorkIntentListener = new IMogoIntentListener() { @Override public void onIntentReceived( String intentStr, Intent intent ) { - CallerLogger.INSTANCE.d( M_BUS_P + TAG, "onIntentReceived = %s", intentStr ); + CallerLogger.d( M_BUS_P + TAG, "onIntentReceived = %s", intentStr ); if ( ConnectivityManager.CONNECTIVITY_ACTION.equals( intentStr ) ) { if ( NetworkUtils.isConnected( mContext ) ) { queryDriverOperationStatus(); @@ -546,20 +546,20 @@ public class BusPassengerModel { @Override public synchronized void onAutopilotRotting(@Nullable MessagePad.GlobalPathResp routeList) { - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "onAutopilotRotting = " + CallerLogger.d(M_BUS_P + TAG, "onAutopilotRotting = " + GsonUtil.jsonFromObject(routeList)); List routePoints = routeList.getWayPointsList(); if(globalPathTruncation!=null&&!globalPathTruncation.isDisposed()){ - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "1s内不可以接受轨迹"); + CallerLogger.d(M_BUS_P + TAG, "1s内不可以接受轨迹"); return; } globalPathTruncation = RxUtils.INSTANCE.createSubscribe(1_000, () -> { - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "可以接受轨迹"); + CallerLogger.d(M_BUS_P + TAG, "可以接受轨迹"); return null; }); - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "接受轨迹中"); + CallerLogger.d(M_BUS_P + TAG, "接受轨迹中"); if (null != routePoints && routePoints.size() > 0){ updateRoutePoints(routePoints); startToRouteAndWipe(); @@ -577,7 +577,7 @@ public class BusPassengerModel { private void calculateTwoStationsRoute(){ //找出前往站对应的轨迹点，拿出两站点的集合 - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "mRoutePoints.size() = " + mRoutePoints.size()); + CallerLogger.d(M_BUS_P + TAG, "mRoutePoints.size() = " + mRoutePoints.size()); if (mRoutePoints.size() > 0) { if (mStations.size() > 1){ //两个站点及以上要计算两个站点间的轨迹路线 if (mNextStationIndex <= mStations.size()-1 && mNextStationIndex - 1 >=0){ @@ -592,7 +592,7 @@ public class BusPassengerModel { int nextRouteIndex = CoordinateCalculateRouteUtil.getArrivedPointIndexNew(currentRouteIndex ,mRoutePoints ,stationNext.getGcjLon(),stationNext.getGcjLat()); - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "轨迹排查==currentRouteIndex = " + currentRouteIndex + CallerLogger.d(M_BUS_P + TAG, "轨迹排查==currentRouteIndex = " + currentRouteIndex + "， nextRouteIndex = " + nextRouteIndex); if (currentRouteIndex < nextRouteIndex){ //如果找到的next在起点的轨迹前面，直接舍弃这个轨迹，不显示 mTwoStationsRouts.addAll(mRoutePoints.subList(currentRouteIndex,nextRouteIndex + 1)); @@ -616,7 +616,7 @@ public class BusPassengerModel { public void dynamicCalculateRouteInfo() { //计算当前位置和下一站的剩余点集合 //计算剩余点总里程和时间 - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "轨迹排查==mTwoStationsRouts.size() = " + mTwoStationsRouts.size()); + CallerLogger.d(M_BUS_P + TAG, "轨迹排查==mTwoStationsRouts.size() = " + mTwoStationsRouts.size()); if (mTwoStationsRouts.size() == 0){ calculateTwoStationsRoute(); } @@ -632,7 +632,7 @@ public class BusPassengerModel { } for (List lastPoints: lastPointsMap.values()){ - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "轨迹排查==lastPoints.size() = " + lastPoints.size()); + CallerLogger.d(M_BUS_P + TAG, "轨迹排查==lastPoints.size() = " + lastPoints.size()); float lastSumLength = 0; if (lastPoints.size() == 1){ //只是最后一个点，计算当前位置和最后一个点的距离 if (mNextStationIndex <= mStations.size()-1 && mNextStationIndex >= 0){ @@ -651,7 +651,7 @@ public class BusPassengerModel { } double lastTime = lastSumLength / getAverageSpeed() * 3.6 ; //秒 - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "轨迹排查==lastSumLength = " + lastSumLength); + CallerLogger.d(M_BUS_P + TAG, "轨迹排查==lastSumLength = " + lastSumLength); if (mAutopilotPlanningCallback != null){ mAutopilotPlanningCallback.routePlanningToNextStationChanged((long)lastSumLength,(long) lastTime); } @@ -694,7 +694,7 @@ public class BusPassengerModel { mWipePreIndex = haveArrivedIndex; - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "thread = "+ Thread.currentThread().getName()+" haveArrivedIndex== " + haveArrivedIndex); + CallerLogger.d(M_BUS_P + TAG, "thread = "+ Thread.currentThread().getName()+" haveArrivedIndex== " + haveArrivedIndex); if (mAutopilotPlanningCallback != null){ List routePoints = CoordinateCalculateRouteUtil .coordinateConverterLocationToLatLng(mContext,mRoutePoints); @@ -708,7 +708,7 @@ public class BusPassengerModel { * @param isStart */ public void startOrStopCalculateRouteInfo(boolean isStart) { - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "startOrStopCalculateRouteInfo() " + isStart); + CallerLogger.d(M_BUS_P + TAG, "startOrStopCalculateRouteInfo() " + isStart); if (isStart) { BusPassengerModelLoopManager.getInstance().startCalculateRouteInfoLoop(); } else { @@ -718,7 +718,7 @@ public class BusPassengerModel { } private void startOrStopOrderLoop(boolean start) { - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "startOrStopOrderLoop() " + start); + CallerLogger.d(M_BUS_P + TAG, "startOrStopOrderLoop() " + start); if (start) { BusPassengerModelLoopManager.getInstance().startQueryDriverLineLoop(); } else { diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java index c0d1db411d..3c3db7fd66 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java +++ b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java @@ -41,7 +41,7 @@ public class BusPassengerModelLoopManager { private CompositeDisposable mCalculateRouteDisposable; //每隔2s计算一次剩余里程和时间 public void startOrStopRouteAndWipe() { - CallerLogger.INSTANCE.i(M_BUS_P + TAG, "startOrStopRouteWipe()"); + CallerLogger.i(M_BUS_P + TAG, "startOrStopRouteWipe()"); if (mRouteWipeDisposable != null) return; if (mRouteWipeDisposable == null){ mRouteWipeDisposable = new CompositeDisposable(); @@ -81,7 +81,7 @@ public class BusPassengerModelLoopManager { if (mQueryLineDisposable != null && !mQueryLineDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.i(M_BUS_P + TAG, "startQueryDriverLineLoop()"); + CallerLogger.i(M_BUS_P + TAG, "startQueryDriverLineLoop()"); mQueryLineDisposable = Observable.interval(LOOP_DELAY, LOOP_LINE_2S, TimeUnit.MILLISECONDS) .map((aLong -> aLong + 1)) @@ -92,14 +92,14 @@ public class BusPassengerModelLoopManager { public void stopQueryDriverLineLoop() { if (mQueryLineDisposable != null) { - CallerLogger.INSTANCE.i(M_BUS_P + TAG, "stopQueryDriverLineLoop()"); + CallerLogger.i(M_BUS_P + TAG, "stopQueryDriverLineLoop()"); mQueryLineDisposable.dispose(); mQueryLineDisposable = null; } } public void startCalculateRouteInfoLoop() { - CallerLogger.INSTANCE.i(M_BUS_P + TAG, "startCalculateRouteInfoLoop()"); + CallerLogger.i(M_BUS_P + TAG, "startCalculateRouteInfoLoop()"); if (mCalculateRouteDisposable != null) return; if (mCalculateRouteDisposable == null){ mCalculateRouteDisposable = new CompositeDisposable(); @@ -130,7 +130,7 @@ public class BusPassengerModelLoopManager { public void stopCalculateRouteInfLoop() { if (mCalculateRouteDisposable != null) { - CallerLogger.INSTANCE.i(M_BUS_P + TAG, "stopCalculateRouteInfLoop()"); + CallerLogger.i(M_BUS_P + TAG, "stopCalculateRouteInfLoop()"); mCalculateRouteDisposable.dispose(); mCalculateRouteDisposable = null; } diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java index c32e05fe05..b6510fe011 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java +++ b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java @@ -42,7 +42,7 @@ public class BaseBusPassengerPresenter extends Presenter models, int haveArrivedIndex) { - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "routeResult:" + models.size() + CallerLogger.d(M_BUS_P + TAG, "routeResult:" + models.size() + " haveArrivedIndex = "+haveArrivedIndex); runOnUIThread(() ->mView.routeResult(models,haveArrivedIndex)); } diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java index e52815db6e..49c38699ba 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java +++ b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java @@ -92,7 +92,7 @@ public class BusPassengerMapDirectionView // } private void initView(Context context) { - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "initView"); + CallerLogger.d(M_BUS_P + TAG, "initView"); mContext = context; @@ -151,7 +151,7 @@ public class BusPassengerMapDirectionView mAMap.setOnMapLoadedListener(new AMap.OnMapLoadedListener() { @Override public void onMapLoaded() { - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "smp---onMapLoaded"); + CallerLogger.d(M_BUS_P + TAG, "smp---onMapLoaded"); // 加载自定义样式 CustomMapStyleOptions customMapStyleOptions = new CustomMapStyleOptions() .setEnable(true) @@ -178,12 +178,12 @@ public class BusPassengerMapDirectionView if (gnssInfo == null) { return; } -// CallerLogger.INSTANCE.d(M_BUS_P + TAG, "onCarLocationChanged2 :" + location.getLatitude() + ":" + location.getLongitude()); +// CallerLogger.d(M_BUS_P + TAG, "onCarLocationChanged2 :" + location.getLatitude() + ":" + location.getLongitude()); LatLng currentLatLng = new LatLng(gnssInfo.getLatitude(), gnssInfo.getLongitude()); //更新车辆位置 if (mCarMarker != null) { -// CallerLogger.INSTANCE.d(M_BUS_P + TAG, "location.getBearing() = " + location.getBearing()); +// CallerLogger.d(M_BUS_P + TAG, "location.getBearing() = " + location.getBearing()); mCarMarker.setRotateAngle((float) (360 - gnssInfo.getHeading())); mCarMarker.setPosition(currentLatLng); mCarMarker.setToTop(); @@ -221,7 +221,7 @@ public class BusPassengerMapDirectionView if (mAMap != null) { addRouteColorList(); - CallerLogger.INSTANCE.d(M_BUS_P + TAG, "mLinePointsLatLng.size() = " +mLineStationLatLng.size() + CallerLogger.d(M_BUS_P + TAG, "mLinePointsLatLng.size() = " +mLineStationLatLng.size() +" mCoordinatesLatLng.size()= " + mCoordinatesLatLng.size()); if (mLineStationLatLng.size() >= 2 && mCoordinatesLatLng.size() >= 2) { //设置线段纹理 @@ -275,7 +275,7 @@ public class BusPassengerMapDirectionView texIndexList.clear(); mCoordinatesLatLng.clear(); mLineStationLatLng.clear(); - CallerLogger.INSTANCE.d(M_BUS_P + TAG, " mCoordinatesLatLng.clear " ); + CallerLogger.d(M_BUS_P + TAG, " mCoordinatesLatLng.clear " ); } public void onCreateView(Bundle savedInstanceState) { diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java index cbd98e6ba9..91e2192546 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java +++ b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java @@ -291,7 +291,7 @@ public class BusPassengerRouteFragment extends // */ // private void startIvCompass(float bearing) { // bearing = 360 - bearing; -// CallerLogger.INSTANCE.d(M_BUS_P + TAG, "startIvCompass: " + bearing); +// CallerLogger.d(M_BUS_P + TAG, "startIvCompass: " + bearing); // rotateAnimation = new RotateAnimation(lastBearing, bearing, Animation.RELATIVE_TO_SELF // , 0.5f, Animation.RELATIVE_TO_SELF, 0.5f); // rotateAnimation.setFillAfter(true); 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 476d872e83..503ee93ce0 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 @@ -35,7 +35,7 @@ public class SweeperProvider implements IMogoOCH { private void showFragment() { FragmentManager supportFragmentManager = activity.getSupportFragmentManager(); if (sweeperFragment == null) { - CallerLogger.INSTANCE.d(TAG, "准备add fragment======"); + CallerLogger.d(TAG, "准备add fragment======"); Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(sweeperFragment.TAG); if (fragmentByTag instanceof SweeperFragment) { sweeperFragment = (SweeperFragment) fragmentByTag; @@ -47,12 +47,12 @@ public class SweeperProvider implements IMogoOCH { } return; } - CallerLogger.INSTANCE.d(TAG, "准备show fragment"); + CallerLogger.d(TAG, "准备show fragment"); supportFragmentManager.beginTransaction().show(sweeperFragment).commitAllowingStateLoss(); } private void hideFragment() { if (sweeperFragment != null) { - CallerLogger.INSTANCE.d(TAG, "准备hide fragment"); + CallerLogger.d(TAG, "准备hide fragment"); activity.getSupportFragmentManager().beginTransaction().hide(sweeperFragment).commitAllowingStateLoss(); } diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperAmapNaviFragment.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperAmapNaviFragment.java index e05d396e95..17213ac1d1 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperAmapNaviFragment.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperAmapNaviFragment.java @@ -125,8 +125,8 @@ public class SweeperAmapNaviFragment extends BaseSweeperUIFragment implements AM @Override public void onNaviViewLoaded() { - CallerLogger.INSTANCE.d(M_TAXI + "wlx", "导航页面加载成功"); - CallerLogger.INSTANCE.d(M_TAXI + "wlx", "请不要使用AMapNaviView.getMap().setOnMapLoadedListener();会overwrite导航SDK内部画线逻辑"); + CallerLogger.d(M_TAXI + "wlx", "导航页面加载成功"); + CallerLogger.d(M_TAXI + "wlx", "请不要使用AMapNaviView.getMap().setOnMapLoadedListener();会overwrite导航SDK内部画线逻辑"); } @Override diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java index 49e6b7b34e..33d42c9a6d 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java @@ -154,31 +154,31 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM public void accept(Throwable e) { if (e instanceof UndeliverableException) { e = e.getCause(); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "UndeliverableException"); + CallerLogger.d(M_SWEEPER + TAG, "UndeliverableException"); } if ((e instanceof IOException)) {// // fine, irrelevant network problem or API that throws on cancellation - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "IOException"); + CallerLogger.d(M_SWEEPER + TAG, "IOException"); return; } if (e instanceof InterruptedException) { // fine, some blocking code was interrupted by a dispose call - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "InterruptedException"); + CallerLogger.d(M_SWEEPER + TAG, "InterruptedException"); return; } if ((e instanceof NullPointerException) || (e instanceof IllegalArgumentException)) { // that's likely a bug in the application - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "NullPointerException or IllegalArgumentException"); + CallerLogger.d(M_SWEEPER + TAG, "NullPointerException or IllegalArgumentException"); Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e); return; } if (e instanceof IllegalStateException) { // that's a bug in RxJava or in a custom operator - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "IllegalStateException"); + CallerLogger.d(M_SWEEPER + TAG, "IllegalStateException"); Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e); return; } - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "Undeliverable exception"); + CallerLogger.d(M_SWEEPER + TAG, "Undeliverable exception"); } }); } @@ -197,18 +197,18 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onAutopilotRotting(MessagePad.GlobalPathResp routeList) { if (null != routeList && routeList.getWayPointsList() != null && routeList.getWayPointsList().size() > 0) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotRotting: " + printMessage(routeList)); + CallerLogger.d(M_SWEEPER + TAG, "onAutopilotRotting: " + printMessage(routeList)); // MAP返回路线信息，在1秒内返回了2次，这里加上数据过滤 long current = System.currentTimeMillis(); if (current - mRouteDataCurrentTimeMillis <= ROUTE_DATA_INTERVAL_MILLIS) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotRotting: interval <=" + ROUTE_DATA_INTERVAL_MILLIS + " data is abandon"); + CallerLogger.d(M_SWEEPER + TAG, "onAutopilotRotting: interval <=" + ROUTE_DATA_INTERVAL_MILLIS + " data is abandon"); return; } mRouteDataCurrentTimeMillis = current; if (mCurrentLineId != mPreLineId) {//判断是否同一条路线 - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotRotting: mCurrentLineId" + mCurrentLineId + "mPreLineId：" + mPreLineId); + CallerLogger.d(M_SWEEPER + TAG, "onAutopilotRotting: mCurrentLineId" + mCurrentLineId + "mPreLineId：" + mPreLineId); mPreLineId = mCurrentLineId; points.addAll(coordinateConverterWgsToGcjList(mContext, routeList.getWayPointsList())); if (mSweeperTaskCallback != null) { @@ -336,7 +336,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM public void onSweeperFutianCloudTask(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime, SweeperTask.TaskInfo taskInfo) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, + CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " onSweeperFutianCloudTask：" + (taskInfo == null ? "null" : printMessage(taskInfo)) + " mSweeperTaskCallback：" + mSweeperTaskCallback); if (mSweeperTaskCallback != null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); @@ -348,7 +348,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM public void onSweeperFutianCloudTaskConfirm(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime, SweeperTaskConfirm.TaskConfirm taskConfirm) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + + CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + "onSweeperFutianCloudTaskConfirm：" + printMessage(taskConfirm)); if (mSweeperTaskCallback != null && taskConfirm != null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); @@ -359,7 +359,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onSweeperFutianCloudTaskStatus(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime, SweeperTaskStatus.TaskStatusPush taskStatusPush) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + + CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + "onSweeperFutianCloudTaskStatus：" + printMessage(taskStatusPush)); if (mSweeperTaskCallback != null && taskStatusPush != null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); @@ -370,7 +370,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onSweeperFutianCloudTaskStop(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime, SweeperTaskStop.StopTaskReq stopTaskReq) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + + CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + "onSweeperFutianCloudTaskStop：" + printMessage(stopTaskReq)); if (mSweeperTaskCallback != null && stopTaskReq != null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); @@ -381,7 +381,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onSweeperFutianCloudTaskSuspendResume(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime, SweeperTaskSuspendResume.SuspendResumeTaskResp suspendResumeTaskResp) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + + CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + "onSweeperFutianCloudTaskSuspendResume：" + printMessage(suspendResumeTaskResp)); if (mSweeperTaskCallback != null && suspendResumeTaskResp != null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); @@ -393,7 +393,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onSweeperFutianCloudBootable(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime, SweeperBootable.IsBootableResp isBootableResp) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + + CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + "onSweeperFutianCloudBootable：" + printMessage(isBootableResp)); if (mSweeperTaskCallback != null && isBootableResp != null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); @@ -404,7 +404,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onSweeperFutianCloudBigTaskStatus(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime, SweeperBigTaskStatus.BigTaskStatusPush bigTaskStatusPush) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + + CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + "onSweeperFutianCloudBigTaskStatus：" + printMessage(bigTaskStatusPush)); if (mSweeperTaskCallback != null && bigTaskStatusPush != null) { msgTypeAndReqNo.put(messageType.getNumber(), reqNo); @@ -422,7 +422,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM return; } mVehicleStateCurrentTimeMillis = current; - // CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onSweeperFutianCleanSystemState：" + printMessage(cleanSystemState)); + // CallerLogger.d(M_SWEEPER + TAG, "onSweeperFutianCleanSystemState：" + printMessage(cleanSystemState)); if (mSweeperTaskCallback != null) { mSweeperTaskCallback.onSweeperFutianCleanSystemState(cleanSystemState); } @@ -445,7 +445,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM return; } - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, + CallerLogger.d(M_SWEEPER + TAG, "mSubTaskType：" + mSubTaskType + "+ onSweeperFutianTaskIndexData：" + printMessage(roboSweeperTaskIndex)); handleWeltData(roboSweeperTaskIndex); } @@ -508,7 +508,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM builder.setSn(getDriverSn()); String reqNo = SweeperCloudTaskUtils.getRequestId(); SweeperTask.GetTaskReq getTaskReq = builder.build(); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, + CallerLogger.d(M_SWEEPER + TAG, "getCurrentTask:" + printMessage(getTaskReq) + " reqNo:" + reqNo + " messageType:" + SweeperCloudTask.MessageType.PadSendGetTaskReq.getNumber()); getAutoPilotControlManager().sendSweeperGetTaskReq(reqNo, getTaskReq); } @@ -524,7 +524,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM SweeperTask.StartTaskResp startTaskResp = builder.build(); String reqNo = msgTypeAndReqNo.get(SweeperCloudTask.MessageType.CloudPushTask.getNumber()); getAutoPilotControlManager().sendSweeperStartTaskResp(reqNo, startTaskResp); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, + CallerLogger.d(M_SWEEPER + TAG, "sendSweeperStartTaskResp:" + printMessage(startTaskResp) + " reqNo:" + reqNo + " messageType:" + SweeperCloudTask.MessageType.CloudPushTask.getNumber()); } @@ -539,7 +539,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM builder.setCode(code); SweeperTaskConfirm.TaskConfirmResp taskConfirmResp = builder.build(); String reqNo = msgTypeAndReqNo.get(SweeperCloudTask.MessageType.CloudPushTaskConfirm.getNumber()); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, + CallerLogger.d(M_SWEEPER + TAG, "sendSweeperTaskConfirmResp" + printMessage(taskConfirmResp) + " reqNo:" + reqNo + " messageType:" + SweeperCloudTask.MessageType.CloudPushTaskConfirm.getNumber()); getAutoPilotControlManager().sendSweeperTaskConfirmResp(reqNo, taskConfirmResp); } @@ -557,7 +557,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM builder.setCode(code); SweeperTaskStop.StopTaskResp stopTaskResp = builder.build(); String reqNo = msgTypeAndReqNo.get(SweeperCloudTask.MessageType.CloudPushTaskStop.getNumber()); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, + CallerLogger.d(M_SWEEPER + TAG, "sendSweeperStopTaskResp" + printMessage(stopTaskResp) + " reqNo:" + reqNo + " messageType:" + SweeperCloudTask.MessageType.CloudPushTaskStop.getNumber()); getAutoPilotControlManager().sendSweeperStopTaskResp(reqNo, stopTaskResp); } @@ -577,7 +577,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM builder.setLineId(lineId); SweeperBootable.IsBootable isBootable = builder.build(); String reqNo = SweeperCloudTaskUtils.getRequestId(); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, + CallerLogger.d(M_SWEEPER + TAG, "sendSweeperAutopilotBootable" + printMessage(isBootable) + " reqNo:" + reqNo + " messageType:" + SweeperCloudTask.MessageType.PadSendBootable.getNumber()); getAutoPilotControlManager().sendSweeperAutopilotBootable(reqNo, isBootable); // TODO: 2023/5/16 @@ -594,7 +594,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onAutopilotStatusResponse(@NonNull AutopilotStatusInfo autoPilotStatusInfo) { - //CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotStatusResponse state:" + autoPilotStatusInfo.getState()); + //CallerLogger.d(M_SWEEPER + TAG, "onAutopilotStatusResponse state:" + autoPilotStatusInfo.getState()); this.mAutopilotState = autoPilotStatusInfo.getState(); if (mControllerStatusCallback != null) { mControllerStatusCallback.onAutopilotState(autoPilotStatusInfo.getState()); @@ -635,12 +635,12 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM getCurrentTask(); }, 10000); } - //CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotIpcConnectStatusChanged status:" + status + " reason：" + reason); + //CallerLogger.d(M_SWEEPER + TAG, "onAutopilotIpcConnectStatusChanged status:" + status + " reason：" + reason); } @Override public void onAutopilotStatusRespByQuery(@NonNull SystemStatusInfo.StatusInfo status) { - // CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotStatusRespByQuery status:" + status.getSysState().getNumber()); + // CallerLogger.d(M_SWEEPER + TAG, "onAutopilotStatusRespByQuery status:" + status.getSysState().getNumber()); } @Override @@ -661,7 +661,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM @Override public void onSweeperFutianCloudTaskUnknown(@NonNull byte[] bytes) { String string = new String(bytes, StandardCharsets.UTF_8); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onSweeperFutianCloudTaskUnknown:" + string); + CallerLogger.d(M_SWEEPER + TAG, "onSweeperFutianCloudTaskUnknown:" + string); } @Override diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/receiver/TestSweeperBroadcastReceiver.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/receiver/TestSweeperBroadcastReceiver.java index 29a82c69ab..c18cc6ada5 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/receiver/TestSweeperBroadcastReceiver.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/receiver/TestSweeperBroadcastReceiver.java @@ -25,7 +25,7 @@ public class TestSweeperBroadcastReceiver extends BroadcastReceiver { try { this.mContext = context; int sceneType = intent.getIntExtra(SweeperConst.BROADCAST_TEST_SWEEPER_CONTROL_TYPE_EXTRA_KEY, 0); - CallerLogger.INSTANCE.d(M_BUS + TAG, "sceneType:" + sceneType); + CallerLogger.d(M_BUS + TAG, "sceneType:" + sceneType); // 分发场景 dispatchSceneTest(sceneType); diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperAnalyticsManager.java b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperAnalyticsManager.java index 91b5820710..dbee10c544 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperAnalyticsManager.java +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperAnalyticsManager.java @@ -49,7 +49,7 @@ public class SweeperAnalyticsManager { private void triggerStartAutopilotFailureEvent(String failCode, String failMsg){ if (mStartAutopilotParams.isEmpty()) return; - CallerLogger.INSTANCE.e( M_SWEEPER + "triggerStartAutopilotFailureEvent", failMsg ); + CallerLogger.e( M_SWEEPER + "triggerStartAutopilotFailureEvent", failMsg ); if (CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState() != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){ diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java index 4691f4f95b..ac2436d4f6 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java @@ -35,7 +35,7 @@ public class SweeperProvider implements IMogoOCH { private void showFragment() { FragmentManager supportFragmentManager = activity.getSupportFragmentManager(); if (sweeperFragment == null) { - CallerLogger.INSTANCE.d(TAG, "准备add fragment======"); + CallerLogger.d(TAG, "准备add fragment======"); Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(sweeperFragment.TAG); if (fragmentByTag instanceof SweeperFragment) { sweeperFragment = (SweeperFragment) fragmentByTag; @@ -47,12 +47,12 @@ public class SweeperProvider implements IMogoOCH { } return; } - CallerLogger.INSTANCE.d(TAG, "准备show fragment"); + CallerLogger.d(TAG, "准备show fragment"); supportFragmentManager.beginTransaction().show(sweeperFragment).commitAllowingStateLoss(); } private void hideFragment() { if (sweeperFragment != null) { - CallerLogger.INSTANCE.d(TAG, "准备hide fragment"); + CallerLogger.d(TAG, "准备hide fragment"); activity.getSupportFragmentManager().beginTransaction().hide(sweeperFragment).commitAllowingStateLoss(); } diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperAmapNaviFragment.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperAmapNaviFragment.java index a1460e31c7..b6439c35bd 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperAmapNaviFragment.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperAmapNaviFragment.java @@ -125,8 +125,8 @@ public class SweeperAmapNaviFragment extends BaseSweeperUIFragment implements AM @Override public void onNaviViewLoaded() { - CallerLogger.INSTANCE.d(M_TAXI + "wlx", "导航页面加载成功"); - CallerLogger.INSTANCE.d(M_TAXI + "wlx", "请不要使用AMapNaviView.getMap().setOnMapLoadedListener();会overwrite导航SDK内部画线逻辑"); + CallerLogger.d(M_TAXI + "wlx", "导航页面加载成功"); + CallerLogger.d(M_TAXI + "wlx", "请不要使用AMapNaviView.getMap().setOnMapLoadedListener();会overwrite导航SDK内部画线逻辑"); } @Override diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java index b95e988d3c..1811d9923c 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java @@ -146,31 +146,31 @@ public class SweeperTaskModel { public void accept(Throwable e) { if (e instanceof UndeliverableException) { e = e.getCause(); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "UndeliverableException"); + CallerLogger.d(M_SWEEPER + TAG, "UndeliverableException"); } if ((e instanceof IOException)) {// // fine, irrelevant network problem or API that throws on cancellation - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "IOException"); + CallerLogger.d(M_SWEEPER + TAG, "IOException"); return; } if (e instanceof InterruptedException) { // fine, some blocking code was interrupted by a dispose call - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "InterruptedException"); + CallerLogger.d(M_SWEEPER + TAG, "InterruptedException"); return; } if ((e instanceof NullPointerException) || (e instanceof IllegalArgumentException)) { // that's likely a bug in the application - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "NullPointerException or IllegalArgumentException"); + CallerLogger.d(M_SWEEPER + TAG, "NullPointerException or IllegalArgumentException"); Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e); return; } if (e instanceof IllegalStateException) { // that's a bug in RxJava or in a custom operator - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "IllegalStateException"); + CallerLogger.d(M_SWEEPER + TAG, "IllegalStateException"); Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e); return; } - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "Undeliverable exception"); + CallerLogger.d(M_SWEEPER + TAG, "Undeliverable exception"); } }); } @@ -265,10 +265,10 @@ public class SweeperTaskModel { @Override public void onMsgReceived(OCHOperationalMessage obj) { if (obj == null) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onMsgReceived = null"); + CallerLogger.d(M_SWEEPER + TAG, "onMsgReceived = null"); return; } - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onMsgReceived = " + obj.getMessage()); + CallerLogger.d(M_SWEEPER + TAG, "onMsgReceived = " + obj.getMessage()); OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(obj.getPushTimeStamp(), obj.getMessage(),OCHSocketMessageManager.OPERATION_SYSTEM); } @@ -291,7 +291,7 @@ public class SweeperTaskModel { public void onStartAutopilotFailure(@NotNull String startFailedCode, @NonNull String startFailedMessage) { SweeperAnalyticsManager.getInstance().triggerStartAutopilotFailureEventByAdas(startFailedCode, startFailedMessage); if (mADASStatusCallback != null && !FunctionBuildConfig.isDemoMode) { - CallerLogger.INSTANCE.e(M_SWEEPER + TAG, "mAdasStartFailureListener = " + startFailedMessage); + CallerLogger.e(M_SWEEPER + TAG, "mAdasStartFailureListener = " + startFailedMessage); mADASStatusCallback.onStartAdasFailure(); } } @@ -302,7 +302,7 @@ public class SweeperTaskModel { @Override public void onChassisLocationGCJ02(@Nullable MogoLocation gnssInfo) { if (null == gnssInfo) return; - CallerLogger.INSTANCE.e(M_SWEEPER + TAG, "高德定位到站：mLongitude = " + gnssInfo.getLongitude() + CallerLogger.e(M_SWEEPER + TAG, "高德定位到站：mLongitude = " + gnssInfo.getLongitude() + ", mLatitude=" + gnssInfo.getLatitude() + ", mSubTaskType=" + mSubTaskType +", mIsSubTaskWorking=" + mIsSubTaskWorking + ", isAutopilotSubTaskArriveEndSite=" + isAutopilotSubTaskArriveEndSite ); @@ -346,7 +346,7 @@ public class SweeperTaskModel { //根据围栏判断，是否到达子任务终点 private void judgeArrivedStation(MogoLocation location) { if (mCurrentSubTaskDetail == null) { - CallerLogger.INSTANCE.d(TAG, "行程日志-judgeArrivedStation() mCurrentSubTaskDetail is null"); + CallerLogger.d(TAG, "行程日志-judgeArrivedStation() mCurrentSubTaskDetail is null"); return; } double endSiteLon = mCurrentSubTaskDetail.getEndSiteLon(); @@ -355,7 +355,7 @@ public class SweeperTaskModel { endSiteLon, endSiteLat, location.getLongitude(), location.getLatitude()); if (distance <= SweeperConst.ARRIVE_AT_END_STATION_DISTANCE) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "行程日志-judgeArrivedStation() distance = " + distance + CallerLogger.d(M_SWEEPER + TAG, "行程日志-judgeArrivedStation() distance = " + distance + " to " + mCurrentSubTaskDetail.getEndSiteName()); isAutopilotSubTaskArriveEndSite = true; //到达子任务终点 结束子任务 @@ -368,7 +368,7 @@ public class SweeperTaskModel { * 在踩刹车、控制方向盘等操作后，会停止自动驾驶，重启自动驾驶的话相当于重新设置自动驾驶目的地 */ public void startAutopilot() { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "行程日志-重启自动驾驶===" + mIsSubTaskWorking); + CallerLogger.d(M_SWEEPER + TAG, "行程日志-重启自动驾驶===" + mIsSubTaskWorking); //只去启动自动驾驶 startAutopilot(firstStartAutopilot >= 1); } @@ -389,11 +389,11 @@ public class SweeperTaskModel { triggerStartServiceEvent(isRestart, false); AutopilotControlParameters parameters = initAutopilotControlParameters(); if (null == parameters) { - CallerLogger.INSTANCE.e(M_SWEEPER + TAG, "行程日志-AutopilotControlParameters is empty."); + CallerLogger.e(M_SWEEPER + TAG, "行程日志-AutopilotControlParameters is empty."); return; } CallerAutoPilotControlManager.INSTANCE.startAutoPilot(parameters); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "行程日志-开启自动驾驶====" + GsonUtil.jsonFromObject(parameters) + CallerLogger.d(M_SWEEPER + TAG, "行程日志-开启自动驾驶====" + GsonUtil.jsonFromObject(parameters) + " startLatLon=" + parameters.startName + "，endLatLon=" + parameters.endName + "isRestart = " + isRestart); @@ -420,7 +420,7 @@ public class SweeperTaskModel { if (FunctionBuildConfig.isDemoMode) { FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false; //是否强制绘制引导线 CallerAutoPilotControlManager.INSTANCE.setIPCDemoMode(false);//是否自动启动自驾 - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "美化模式-ignore：置为false"); + CallerLogger.d(M_SWEEPER + TAG, "美化模式-ignore：置为false"); } } @@ -430,7 +430,7 @@ public class SweeperTaskModel { public void startBeautificationMode() { FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true;//是否强制绘制引导线 CallerAutoPilotControlManager.INSTANCE.setIPCDemoMode(true);//是否自动启动自驾 - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "美化模式-ignore：置为true"); + CallerLogger.d(M_SWEEPER + TAG, "美化模式-ignore：置为true"); } /** @@ -440,18 +440,18 @@ public class SweeperTaskModel { //MAP 280 每隔100ms左右返回一次到站， 导致在到达中间站后再次滑动出发后会有时间差，收到一次到站，出现问题 //此处比对 自驾告诉的子任务终点坐标和本地应到子任务终点坐标， 一致时才表示子任务完成 if (data != null && data.getEndLocation() != null && mCurrentSubTaskDetail != null) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "MAP到站通知：" + mCurrentSubTaskDetail.getEndSiteName() + " 经度：" + CallerLogger.d(M_SWEEPER + TAG, "MAP到站通知：" + mCurrentSubTaskDetail.getEndSiteName() + " 经度：" + data.getEndLocation().getLongitude() + " 纬度：" + data.getEndLocation().getLatitude()); String latitude = NumberFormatUtil.cutOutNumber(data.getEndLocation().getLatitude(), 5); //wgs String longitude = NumberFormatUtil.cutOutNumber(data.getEndLocation().getLongitude(), 5); String arriveLat = NumberFormatUtil.cutOutNumber(mCurrentSubTaskDetail.getEndSiteWgs64Lat(), 5); String arriveLon = NumberFormatUtil.cutOutNumber(mCurrentSubTaskDetail.getEndSiteWgs64Lon(), 5); if (!latitude.equals(arriveLat) || !longitude.equals(arriveLon)) { - CallerLogger.INSTANCE.e(M_SWEEPER + TAG, "行程日志-子任务终点拦截,自动子任务终点与本地子任务终点不一致"); + CallerLogger.e(M_SWEEPER + TAG, "行程日志-子任务终点拦截,自动子任务终点与本地子任务终点不一致"); return; } } - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "MAP到站通知：mSubTaskType=" + mSubTaskType + " isAutopilotSubTaskArriveEndSite=" + CallerLogger.d(M_SWEEPER + TAG, "MAP到站通知：mSubTaskType=" + mSubTaskType + " isAutopilotSubTaskArriveEndSite=" + isAutopilotSubTaskArriveEndSite + " mSubTaskId=" + mSubTaskId); if (SubTaskTypeEnum.MANUAL_DRIVING_SUBTYPE.getCode() == mSubTaskType) {//人工驾驶子任务需要手动跳过，不能自动结束 return; @@ -492,16 +492,16 @@ public class SweeperTaskModel { AutopilotControlParameters parameters = initAutopilotControlParameters(); if (null == parameters) { - CallerLogger.INSTANCE.e(M_SWEEPER + TAG, "AutopilotControlParameters is empty."); + CallerLogger.e(M_SWEEPER + TAG, "AutopilotControlParameters is empty."); return; } - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "AutopilotControlParameters" + GsonUtil.jsonFromObject(parameters)); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "AutopilotControlParameters is update."); + CallerLogger.d(M_SWEEPER + TAG, "AutopilotControlParameters" + GsonUtil.jsonFromObject(parameters)); + CallerLogger.d(M_SWEEPER + TAG, "AutopilotControlParameters is update."); CallerAutoPilotStatusListenerManager.INSTANCE.updateAutopilotControlParameters(parameters); } private void clearAutopilotControlParameters() { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "AutopilotControlParameters is clear."); + CallerLogger.d(M_SWEEPER + TAG, "AutopilotControlParameters is clear."); CallerAutoPilotStatusListenerManager.INSTANCE.updateAutopilotControlParameters(null); } @@ -536,7 +536,7 @@ public class SweeperTaskModel { SweeperServiceManager.getCurrentTask(mContext, new OchCommonServiceCallback>() { @Override public void onSuccess(BaseResponse data) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "getCurrentTask：" + GsonUtil.jsonFromObject(data)); + CallerLogger.d(M_SWEEPER + TAG, "getCurrentTask：" + GsonUtil.jsonFromObject(data)); if (mSweeperTaskCallback != null && data != null) { SweeperSubTaskBean sweeperSubTaskBean = data.getData(); if (sweeperSubTaskBean != null && sweeperSubTaskBean.getSubList() != null && sweeperSubTaskBean.getSubList().size() > 0) { @@ -576,7 +576,7 @@ public class SweeperTaskModel { SweeperServiceManager.getMainTaskList(mContext, new OchCommonServiceCallback>>() { @Override public void onSuccess(BaseResponse> data) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "getMainTaskList：" + GsonUtil.jsonFromObject(data)); + CallerLogger.d(M_SWEEPER + TAG, "getMainTaskList：" + GsonUtil.jsonFromObject(data)); if (mSweeperTaskCallback != null && data != null && data.getCode() == 0) { List list = data.getData(); mSweeperTaskCallback.setMainTaskList(list, refresh); @@ -612,7 +612,7 @@ public class SweeperTaskModel { SweeperServiceManager.getSubTaskList(taskId, mContext, new OchCommonServiceCallback>>() { @Override public void onSuccess(BaseResponse> data) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "getSubTaskList：" + GsonUtil.jsonFromObject(data)); + CallerLogger.d(M_SWEEPER + TAG, "getSubTaskList：" + GsonUtil.jsonFromObject(data)); if (mSweeperTaskCallback != null && data != null && data.getCode() == 0) { List list = data.getData(); if (list != null && list.size() > 0) { @@ -653,12 +653,12 @@ public class SweeperTaskModel { SweeperServiceManager.getSubTaskDetail(subTaskId, mContext, new OchCommonServiceCallback>() { @Override public void onSuccess(BaseResponse data) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "getSubTaskDetail：" + GsonUtil.jsonFromObject(data)); + CallerLogger.d(M_SWEEPER + TAG, "getSubTaskDetail：" + GsonUtil.jsonFromObject(data)); if (data != null) { mCurrentSubTaskDetail = data.getData(); if (mCurrentSubTaskDetail != null) { mSweeperTaskCallback.setSubTakDetail(mCurrentSubTaskDetail, subTaskType); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "getSubTaskDetail：subTaskType=" + subTaskType + CallerLogger.d(M_SWEEPER + TAG, "getSubTaskDetail：subTaskType=" + subTaskType + ", isStartSubtask=" + isStartSubtask + ", mAutopilotState=" + mAutopilotState); Log.d(M_SWEEPER + TAG, "getSubTaskDetail：subTaskType=" + subTaskType + ", isStartSubtask=" + isStartSubtask + ", mAutopilotState=" + mAutopilotState); @@ -712,7 +712,7 @@ public class SweeperTaskModel { SweeperServiceManager.subTaskStart(isFirst, isEnd, subTaskId, mContext, new OchCommonServiceCallback>() { @Override public void onSuccess(BaseResponse data) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "subTaskStart：" + GsonUtil.jsonFromObject(data)); + CallerLogger.d(M_SWEEPER + TAG, "subTaskStart：" + GsonUtil.jsonFromObject(data)); if (mSweeperTaskCallback != null && data != null) { if (data.getData()) { mIsSubTaskWorking = true; @@ -762,7 +762,7 @@ public class SweeperTaskModel { SweeperServiceManager.subTaskEnd(isFirst, isEnd, subTaskId, mContext, new OchCommonServiceCallback>() { @Override public void onSuccess(BaseResponse data) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "subTaskEnd：" + + CallerLogger.d(M_SWEEPER + TAG, "subTaskEnd：" + String.format("isFirst=%b; isEnd=%b; ", isFirst, isEnd) + GsonUtil.jsonFromObject(data)); if (data != null) { if (data.getData()) { @@ -813,7 +813,7 @@ public class SweeperTaskModel { SweeperServiceManager.subTaskSkip(isFirst, isEnd, subTaskId, mContext, new OchCommonServiceCallback>() { @Override public void onSuccess(BaseResponse data) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "subTaskSkip：" + + CallerLogger.d(M_SWEEPER + TAG, "subTaskSkip：" + String.format("isFirst=%b; isEnd=%b; ", isFirst, isEnd)+ GsonUtil.jsonFromObject(data)); if (mSweeperTaskCallback != null && data != null) { if (data.getData()) { @@ -854,7 +854,7 @@ public class SweeperTaskModel { SweeperServiceManager.mainTaskReset(taskId, mContext, new OchCommonServiceCallback>() { @Override public void onSuccess(BaseResponse data) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "mainTaskReset：" + GsonUtil.jsonFromObject(data)); + CallerLogger.d(M_SWEEPER + TAG, "mainTaskReset：" + GsonUtil.jsonFromObject(data)); // 主任务重置 当前子任务也需重置 mIsSubTaskWorking = false; isAutopilotSubTaskArriveEndSite = false; 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 288a79755b..723f8619b6 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 @@ -302,7 +302,7 @@ public class SweeperPresenter extends Presenter "强力：" + clean_intensity_strong; - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onSweeperFutianCleanSystemState：" + stringBuilder); + CallerLogger.d(M_SWEEPER + TAG, "onSweeperFutianCleanSystemState：" + stringBuilder); mView.onSweeperFutianCleanSystemState(cleanSystemState); } @@ -325,7 +325,7 @@ public class SweeperPresenter extends Presenter roboSweeperTaskIndex.getLocLon() + "纬度：" + roboSweeperTaskIndex.getLocLat(); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onSweeperFutianTaskIndexData：" + stringBuilder); + CallerLogger.d(M_SWEEPER + TAG, "onSweeperFutianTaskIndexData：" + stringBuilder); String tempLongitude=NumberFormatUtil.cutOutNumber(roboSweeperTaskIndex.getLocLon(), 6); String tempLatitude=NumberFormatUtil.cutOutNumber(roboSweeperTaskIndex.getLocLat(), 6); //用于过滤车是否停在原地，经纬度相同的情况 diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/receiver/TestSweeperBroadcastReceiver.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/receiver/TestSweeperBroadcastReceiver.java index b2ef6bcadd..2c990d55ea 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/receiver/TestSweeperBroadcastReceiver.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/receiver/TestSweeperBroadcastReceiver.java @@ -25,7 +25,7 @@ public class TestSweeperBroadcastReceiver extends BroadcastReceiver { try { this.mContext = context; int sceneType = intent.getIntExtra(SweeperConst.BROADCAST_TEST_SWEEPER_CONTROL_TYPE_EXTRA_KEY, 0); - CallerLogger.INSTANCE.d(M_BUS + TAG, "sceneType:" + sceneType); + CallerLogger.d(M_BUS + TAG, "sceneType:" + sceneType); // 分发场景 dispatchSceneTest(sceneType); diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java index 5977e000fb..36d48211ad 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java @@ -49,7 +49,7 @@ public class SweeperAnalyticsManager { private void triggerStartAutopilotFailureEvent(String failCode, String failMsg){ if (mStartAutopilotParams.isEmpty()) return; - CallerLogger.INSTANCE.e( M_SWEEPER + "triggerStartAutopilotFailureEvent", failMsg ); + CallerLogger.e( M_SWEEPER + "triggerStartAutopilotFailureEvent", failMsg ); if (CallerAutoPilotStatusListenerManager.INSTANCE.getState() != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){ diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java index 43b81e2828..3c072d77bd 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java @@ -47,11 +47,11 @@ public class SweeperTrajectoryManager { */ public void syncTrajectoryInfo(SweeperSubTaskDetailBean sweeperSubTaskDetailBean) { if (sweeperSubTaskDetailBean != null) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "syncTrajectoryInfo() start."); + CallerLogger.d(M_SWEEPER + TAG, "syncTrajectoryInfo() start."); startTrajReqLoop(sweeperSubTaskDetailBean); } else { // 无路线信息or当前未在始发站 - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "syncTrajectoryInfo() stop."); + CallerLogger.d(M_SWEEPER + TAG, "syncTrajectoryInfo() stop."); stopTrajReqLoop(); } } @@ -65,38 +65,38 @@ public class SweeperTrajectoryManager { if (guardianInfo == null || !guardianInfo.hasCode()) return; if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) { // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发） - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotGuardian() 轨迹开始下载"); + CallerLogger.d(M_SWEEPER + TAG, "onAutopilotGuardian() 轨迹开始下载"); // ToastUtils.showShort("轨迹开始下载"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) { // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发） - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotGuardian() 轨迹下载成功"); + CallerLogger.d(M_SWEEPER + TAG, "onAutopilotGuardian() 轨迹下载成功"); // ToastUtils.showShort("轨迹下载成功"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) { // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹 - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotGuardian() " + + CallerLogger.d(M_SWEEPER + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地无对应轨迹"); // ToastUtils.showShort("轨迹下载失败，本地无对应轨迹"); } else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) { // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功 - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotGuardian() " + + CallerLogger.d(M_SWEEPER + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地有对应轨迹，认为成功"); // ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功"); } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) { // 5. 轨迹管理_轨迹下载超时 - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotGuardian() 轨迹下载超时"); + CallerLogger.d(M_SWEEPER + TAG, "onAutopilotGuardian() 轨迹下载超时"); // ToastUtils.showShort("轨迹下载超时"); } else if ("ISSM_FUNC_AUTO_PILOT_READY".equals(guardianInfo.getCode())) { // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。 - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotGuardian() ssm ready，再次发起下载"); + CallerLogger.d(M_SWEEPER + TAG, "onAutopilotGuardian() ssm ready，再次发起下载"); // TODO: 2023/7/25 } } private void setupAutoPilotLine(SweeperSubTaskDetailBean subTaskDetail) { if (subTaskDetail == null) { - CallerLogger.INSTANCE.e(M_SWEEPER + TAG, "setupAutoPilotLine(): routesResult is null."); + CallerLogger.e(M_SWEEPER + TAG, "setupAutoPilotLine(): routesResult is null."); return; } else { mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine( @@ -131,7 +131,7 @@ public class SweeperTrajectoryManager { if (mSendReqDisposable != null && !mSendReqDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "startTrajReqLoop()"); + CallerLogger.d(M_SWEEPER + TAG, "startTrajReqLoop()"); setupAutoPilotLine(sweeperSubTaskDetailBean); mSendReqDisposable = Observable.interval(SweeperConst.LOOP_DELAY, SweeperConst.LOOP_PERIOD_10S, TimeUnit.MILLISECONDS) @@ -143,14 +143,14 @@ public class SweeperTrajectoryManager { stopTrajReqLoop(); return; } - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "loop sendTrajectoryReq: " + aLong); + CallerLogger.d(M_SWEEPER + TAG, "loop sendTrajectoryReq: " + aLong); sendTrajectoryReq(); }); } public void stopTrajReqLoop() { if (mSendReqDisposable != null) { - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "stopTrajReqLoop()"); + CallerLogger.d(M_SWEEPER + TAG, "stopTrajReqLoop()"); mSendReqDisposable.dispose(); mSendReqDisposable = null; clearAutoPilotLine(); @@ -159,12 +159,12 @@ public class SweeperTrajectoryManager { private void sendTrajectoryReq() { if (mAutoPilotLine == null) { - CallerLogger.INSTANCE.e(M_SWEEPER + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!"); + CallerLogger.e(M_SWEEPER + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!"); return; } CallerAutoPilotControlManager.INSTANCE.sendTrajectoryDownloadReq(mAutoPilotLine); - CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "sendTrajectoryReq(): " + CallerLogger.d(M_SWEEPER + TAG, "sendTrajectoryReq(): " + GsonUtils.toJson(mAutoPilotLine)); } } diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/TaxiProvider.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/TaxiProvider.java index 76a54882a1..793ef8c8e1 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/TaxiProvider.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/TaxiProvider.java @@ -33,21 +33,21 @@ class TaxiProvider implements IMogoOCH { private int mContainerId; @Override public void init( Context context ) { - CallerLogger.INSTANCE.d( M_TAXI + TAG, "init" ); + CallerLogger.d( M_TAXI + TAG, "init" ); } /** * 进入鹰眼模式，设置手势缩放地图失效 */ private void stepIntoVrMode() { - CallerLogger.INSTANCE.d( M_TAXI + TAG, "进入vr模式" ); + CallerLogger.d( M_TAXI + TAG, "进入vr模式" ); CallerMoGoUiSettingManager.INSTANCE.stepInNightMode();//夜间模式 状态栏字体颜色变黑 } private void showFragment() { FragmentManager supportFragmentManager = mActivity.getSupportFragmentManager(); if (ochTaxiFragment == null) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "准备add fragment======"); + CallerLogger.d(M_TAXI + TAG, "准备add fragment======"); Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(TaxiFragment.TAG); if (fragmentByTag instanceof TaxiFragment){ ochTaxiFragment = (TaxiFragment) fragmentByTag; @@ -61,7 +61,7 @@ class TaxiProvider implements IMogoOCH { } return; } - CallerLogger.INSTANCE.d(M_TAXI + TAG, "准备show fragment"); + CallerLogger.d(M_TAXI + TAG, "准备show fragment"); supportFragmentManager.beginTransaction().show(ochTaxiFragment).commitAllowingStateLoss(); } diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index 9ff5f901d8..b47e691371 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -184,31 +184,31 @@ public class TaxiModel { public void accept(Throwable e) { if (e instanceof UndeliverableException) { e = e.getCause(); - CallerLogger.INSTANCE.d(M_TAXI + TAG, "UndeliverableException"); + CallerLogger.d(M_TAXI + TAG, "UndeliverableException"); } if ((e instanceof IOException)) {// // fine, irrelevant network problem or API that throws on cancellation - CallerLogger.INSTANCE.d(M_TAXI + TAG, "IOException"); + CallerLogger.d(M_TAXI + TAG, "IOException"); return; } if (e instanceof InterruptedException) { // fine, some blocking code was interrupted by a dispose call - CallerLogger.INSTANCE.d(M_TAXI + TAG, "InterruptedException"); + CallerLogger.d(M_TAXI + TAG, "InterruptedException"); return; } if ((e instanceof NullPointerException) || (e instanceof IllegalArgumentException)) { // that's likely a bug in the application - CallerLogger.INSTANCE.d(M_TAXI + TAG, "NullPointerException or IllegalArgumentException"); + CallerLogger.d(M_TAXI + TAG, "NullPointerException or IllegalArgumentException"); Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e); return; } if (e instanceof IllegalStateException) { // that's a bug in RxJava or in a custom operator - CallerLogger.INSTANCE.d(M_TAXI + TAG, "IllegalStateException"); + CallerLogger.d(M_TAXI + TAG, "IllegalStateException"); Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e); return; } - CallerLogger.INSTANCE.d(M_TAXI + TAG, "Undeliverable exception"); + CallerLogger.d(M_TAXI + TAG, "Undeliverable exception"); } }); } @@ -256,10 +256,10 @@ public class TaxiModel { @Override public void onMsgReceived(OCHOperationalMessage obj) { if (obj == null) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onMsgReceived = null"); + CallerLogger.d(M_TAXI + TAG, "onMsgReceived = null"); return; } - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onMsgReceived = " + obj.getMessage()); + CallerLogger.d(M_TAXI + TAG, "onMsgReceived = " + obj.getMessage()); OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(obj.getPushTimeStamp(), obj.getMessage(), OCHSocketMessageManager.OPERATION_SYSTEM); } @@ -281,7 +281,7 @@ public class TaxiModel { } public void startOrStopOrderLoop(boolean start) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "startOrStopOrderLoop() " + start); + CallerLogger.d(M_TAXI + TAG, "startOrStopOrderLoop() " + start); if (start) { TaxiModelLoopManager.getInstance().startInAndWaitOrdersLoop(); TaxiModelLoopManager.getInstance().startNewBookingOrderLoop(); @@ -362,7 +362,7 @@ public class TaxiModel { //1.1.2. 当本地有currentOrder： //orderId不一致时：通过currentOrder.orderId查询订单状态，并通知ui更新 //orderId一致且orderStatus不一致时：则更新currentOrder，并通知ui更新 - CallerLogger.INSTANCE.d(M_TAXI + TAG, "AutopilotControl-mCurrentOCHOrder = " + mCurrentOCHOrder.orderStatus + CallerLogger.d(M_TAXI + TAG, "AutopilotControl-mCurrentOCHOrder = " + mCurrentOCHOrder.orderStatus + ", orderStatus = " + data.data.servicing.get(0).orderStatus); if (!mCurrentOCHOrder.orderNo.equals(data.data.servicing.get(0).orderNo)) { queryCurOrderStatus(); @@ -840,14 +840,14 @@ public class TaxiModel { FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true; CallerAutoPilotControlManager.INSTANCE.setIgnoreConditionDraw(true); CallerAutoPilotControlManager.INSTANCE.setIPCDemoMode(true); - CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为true（更新本地order信息）"); + CallerLogger.d(M_TAXI + TAG, "美化模式-ignore：置为true（更新本地order信息）"); } updateAutopilotControlParameters(); } if (mCurrentOCHOrder.orderStatus == TaxiOrderStatusEnum.ArriveAtEnd.getCode()) { if (FunctionBuildConfig.isDemoMode) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "setIPCDemoMode：false"); + CallerLogger.d(M_TAXI + TAG, "setIPCDemoMode：false"); CallerAutoPilotControlManager.INSTANCE.setIPCDemoMode(false); } @@ -862,15 +862,15 @@ public class TaxiModel { AutopilotControlParameters parameters = initAutopilotControlParameters(); if (null == parameters) { - CallerLogger.INSTANCE.e(M_TAXI + TAG, "AutopilotControlParameters is empty."); + CallerLogger.e(M_TAXI + TAG, "AutopilotControlParameters is empty."); return; } - CallerLogger.INSTANCE.d(M_TAXI + TAG, "AutopilotControlParameters is update."); + CallerLogger.d(M_TAXI + TAG, "AutopilotControlParameters is update."); CallerAutoPilotStatusListenerManager.INSTANCE.updateAutopilotControlParameters(parameters); } private void clearAutopilotControlParameters() { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "AutopilotControlParameters is clear."); + CallerLogger.d(M_TAXI + TAG, "AutopilotControlParameters is clear."); CallerAutoPilotStatusListenerManager.INSTANCE.updateAutopilotControlParameters(null); } @@ -887,7 +887,7 @@ public class TaxiModel { FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false; CallerAutoPilotControlManager.INSTANCE.setIgnoreConditionDraw(false); CallerAutoPilotControlManager.INSTANCE.setIPCDemoMode(false); - CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为false（已完成or清除当前订单）"); + CallerLogger.d(M_TAXI + TAG, "美化模式-ignore：置为false（已完成or清除当前订单）"); } } @@ -913,7 +913,7 @@ public class TaxiModel { public void startAutoPilot() { if (!checkCurrentOCHOrder()) { - CallerLogger.INSTANCE.e(M_TAXI + TAG, "no order or order is empty."); + CallerLogger.e(M_TAXI + TAG, "no order or order is empty."); ToastUtils.showShort("当前订单不存在或异常！"); return; } @@ -922,7 +922,7 @@ public class TaxiModel { if (FunctionBuildConfig.isPassStartAutopilotCommand && TextUtils.isEmpty(mCurrentOCHOrder.csvFileUrl) && TextUtils.isEmpty(mCurrentOCHOrder.csvFileUrlDPQP)) { ToastUtils.showLong("无发布轨迹, 请发布后重试"); - CallerLogger.INSTANCE.e(M_TAXI + TAG, "isPassStartAutopilotCommand = " + + CallerLogger.e(M_TAXI + TAG, "isPassStartAutopilotCommand = " + FunctionBuildConfig.isPassStartAutopilotCommand + "busRoutesResult.csvFileUrl = " + mCurrentOCHOrder.csvFileUrl + "busRoutesResult.csvFileUrlDPQP = " + mCurrentOCHOrder.csvFileUrlDPQP); @@ -935,7 +935,7 @@ public class TaxiModel { return; } - CallerLogger.INSTANCE.e(M_TAXI + TAG, "isPassStartAutopilotCommand = " + + CallerLogger.e(M_TAXI + TAG, "isPassStartAutopilotCommand = " + FunctionBuildConfig.isPassStartAutopilotCommand); if (!FunctionBuildConfig.isDemoMode && !OCHAdasAbilityManager.getInstance().getAutopilotAbilityStatus()) { @@ -958,12 +958,12 @@ public class TaxiModel { AutopilotControlParameters parameters = initAutopilotControlParameters(); if (null == parameters) { - CallerLogger.INSTANCE.e(M_TAXI + TAG, "AutopilotControlParameters is empty."); + CallerLogger.e(M_TAXI + TAG, "AutopilotControlParameters is empty."); return; } CallerAutoPilotControlManager.INSTANCE.startAutoPilot(parameters); - CallerLogger.INSTANCE.d(M_TAXI + TAG, "start autopilot with parameter: %s", + CallerLogger.d(M_TAXI + TAG, "start autopilot with parameter: %s", GsonUtil.jsonFromObject(parameters) + " ,startSiteName=" + mCurrentOCHOrder.startSiteAddr + " ,endSiteName=" + mCurrentOCHOrder.endSiteAddr @@ -983,7 +983,7 @@ public class TaxiModel { private AutopilotControlParameters initAutopilotControlParameters() { if (!checkCurrentOCHOrder()) { - CallerLogger.INSTANCE.e(M_TAXI + TAG, "no order or order is empty."); + CallerLogger.e(M_TAXI + TAG, "no order or order is empty."); return null; } @@ -1016,7 +1016,7 @@ public class TaxiModel { public void cancelAutopilot() { try { CallerAutoPilotControlManager.INSTANCE.cancelAutoPilot(); - CallerLogger.INSTANCE.d(M_TAXI + TAG, "结束自动驾驶"); + CallerLogger.d(M_TAXI + TAG, "结束自动驾驶"); } catch (Exception e) { e.printStackTrace(); } @@ -1034,7 +1034,7 @@ public class TaxiModel { startLon, startLat, location.getLongitude(), location.getLatitude()); - CallerLogger.INSTANCE.i(M_TAXI + TAG, "judgeStartStation() distance = " + distance); + CallerLogger.i(M_TAXI + TAG, "judgeStartStation() distance = " + distance); if (distance <= TaxiConst.ARRIVE_AT_START_STATION_DISTANCE) { arrivedStartPoint(); @@ -1045,7 +1045,7 @@ public class TaxiModel { private final IMogoIntentListener mNetWorkIntentListener = new IMogoIntentListener() { @Override public void onIntentReceived(String intentStr, Intent intent) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onIntentReceived = %s", intentStr); + CallerLogger.d(M_TAXI + TAG, "onIntentReceived = %s", intentStr); if (ConnectivityManager.CONNECTIVITY_ACTION.equals(intentStr)) { if (NetworkUtils.isConnected(mContext)) { startOrStopOrderLoop(LoginStatusManager.isLogin() && TaxtServingStatusManager.isOpeningOrderStatus()); @@ -1060,7 +1060,7 @@ public class TaxiModel { public void onStartAutopilotFailure(@NotNull String startFailedCode, @NonNull String startFailedMessage) { TaxiAnalyticsManager.INSTANCE.triggerStartAutopilotFailureEventByAdas(startFailedCode, startFailedMessage); if (mADASStatusCallback != null && !FunctionBuildConfig.isDemoMode) { - CallerLogger.INSTANCE.e(M_TAXI + TAG, "mAdasStartFailureListener = " + startFailedMessage); + CallerLogger.e(M_TAXI + TAG, "mAdasStartFailureListener = " + startFailedMessage); mADASStatusCallback.onStartAdasFailure(); } } @@ -1114,13 +1114,13 @@ public class TaxiModel { endLon, endLat, currentLocation.getLongitude(), currentLocation.getLatitude()); - CallerLogger.INSTANCE.i(M_TAXI + TAG, "judgeEndStation() distance = " + distance); + CallerLogger.i(M_TAXI + TAG, "judgeEndStation() distance = " + distance); if (distance <= TaxiConst.ARRIVE_AT_START_STATION_DISTANCE) { //1、当前位置和站点围栏15m内 if (!checkCurrentOCHOrder() || (getCurOrderStatus() == TaxiOrderStatusEnum.ArriveAtEnd)) { - CallerLogger.INSTANCE.i(M_TAXI + TAG, "order exception or order ArriveAtEnd"); + CallerLogger.i(M_TAXI + TAG, "order exception or order ArriveAtEnd"); return; } @@ -1132,16 +1132,16 @@ public class TaxiModel { endLat, (int) currentLocation.getHeading()); - CallerLogger.INSTANCE.i(M_TAXI + TAG, "judgeEndStation() stationAngle = " + stationAngle); + CallerLogger.i(M_TAXI + TAG, "judgeEndStation() stationAngle = " + stationAngle); //3、刚过站且过站距离在15m内， 提交到站 if (stationAngle > 90 && distance <= TaxiConst.ARRIVE_AT_START_STATION_DISTANCE){ if (!checkCurrentOCHOrder() || (getCurOrderStatus() == TaxiOrderStatusEnum.ArriveAtEnd)) { - CallerLogger.INSTANCE.i(M_TAXI + TAG, "order exception or order ArriveAtEnd"); + CallerLogger.i(M_TAXI + TAG, "order exception or order ArriveAtEnd"); return; } - CallerLogger.INSTANCE.i(M_TAXI + TAG, "judgeEndStation() = 刚过站且在15m内"); + CallerLogger.i(M_TAXI + TAG, "judgeEndStation() = 刚过站且在15m内"); arriveTerminal(); } } @@ -1227,7 +1227,7 @@ public class TaxiModel { FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true; CallerAutoPilotControlManager.INSTANCE.setIgnoreConditionDraw(true); CallerAutoPilotControlManager.INSTANCE.setIPCDemoMode(true); - CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为true（到达出发点且已开启自动驾驶）"); + CallerLogger.d(M_TAXI + TAG, "美化模式-ignore：置为true（到达出发点且已开启自动驾驶）"); } } } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) { @@ -1277,7 +1277,7 @@ public class TaxiModel { @Override public void onAutopilotArriveAtStation(MessagePad.ArrivalNotification data) { - CallerLogger.INSTANCE.i(M_TAXI + TAG, "onAutopilotArriveAtStation = " + data.toString()); + CallerLogger.i(M_TAXI + TAG, "onAutopilotArriveAtStation = " + data.toString()); if (data == null || !checkCurrentOCHOrder() || (getCurOrderStatus() == TaxiOrderStatusEnum.ArriveAtEnd)) { @@ -1291,7 +1291,7 @@ public class TaxiModel { // FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false; // CallerAutoPilotManager.INSTANCE.setIgnoreConditionDraw(false); CallerAutoPilotControlManager.INSTANCE.setIPCDemoMode(false); - CallerLogger.INSTANCE.d(M_TAXI + TAG, "美化模式-ignore：置为false（到达目的地）"); + CallerLogger.d(M_TAXI + TAG, "美化模式-ignore：置为false（到达目的地）"); } } @@ -1308,7 +1308,7 @@ public class TaxiModel { @Override public void onAutopilotRotting(MessagePad.GlobalPathResp routeList) { if (null != routeList && routeList.getWayPointsList() != null) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "getWayPointsList = " + CallerLogger.d(M_TAXI + TAG, "getWayPointsList = " + routeList.getWayPointsList().size()); } if (null != routeList && routeList.getWayPointsList().size() > 0) { @@ -1391,7 +1391,7 @@ public class TaxiModel { public void updateOrderRouteInfo(List models) { if (null == models || models.size() == 0) return; if (mCurrentOCHOrder == null) return; - CallerLogger.INSTANCE.d(M_TAXI + TAG, "--------计算出sumLength开始---------- "); + CallerLogger.d(M_TAXI + TAG, "--------计算出sumLength开始---------- "); //转换成高德坐标系 if (mRoutePoints.size() > 0) { @@ -1403,12 +1403,12 @@ public class TaxiModel { } public void startDynamicCalculateRouteInfo() { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "--------mCurrentOCHOrder---------- " + mCurrentOCHOrder); + CallerLogger.d(M_TAXI + TAG, "--------mCurrentOCHOrder---------- " + mCurrentOCHOrder); if (mCurrentOCHOrder != null && mRoutePoints.size() == 0) {//根据orderNo去查询 queryOrderRouteList(mCurrentOCHOrder.orderNo); } - CallerLogger.INSTANCE.d(M_TAXI + TAG, "--------mRoutePoints.size---------- " + mRoutePoints.size()); + CallerLogger.d(M_TAXI + TAG, "--------mRoutePoints.size---------- " + mRoutePoints.size()); if (mRoutePoints.size() > 0) { reportTotalDisAndTime(); @@ -1461,7 +1461,7 @@ public class TaxiModel { private void updateDistance(float lastSumLength){ double lastTime = lastSumLength / TaxiConst.TAXI_AVERAGE_SPEED * 3.6; //秒 - CallerLogger.INSTANCE.d(M_TAXI + "dynamicCalculateRouteInfo" + CallerLogger.d(M_TAXI + "dynamicCalculateRouteInfo" , "---lastSumLength: " + lastSumLength + "----lastTime : " + lastTime + " thread = " + Thread.currentThread().getName()); @@ -1566,7 +1566,7 @@ public class TaxiModel { * @param isStart */ public void startOrStopCalculateRouteInfo(boolean isStart) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "startOrStopOrderLoop() " + isStart); + CallerLogger.d(M_TAXI + TAG, "startOrStopOrderLoop() " + isStart); if (isStart) { TaxiModelLoopManager.getInstance().startCalculateRouteInfoLoop(); } else { diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModelLoopManager.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModelLoopManager.java index 6574a6ca89..83bfe4b59f 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModelLoopManager.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModelLoopManager.java @@ -44,7 +44,7 @@ public class TaxiModelLoopManager { if (mInAndWaitServiceDisposable != null && !mInAndWaitServiceDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.i(M_TAXI + TAG, "startInAndWaitOrdersLoop()"); + CallerLogger.i(M_TAXI + TAG, "startInAndWaitOrdersLoop()"); mInAndWaitServiceDisposable = Observable.interval(TaxiConst.LOOP_DELAY, TaxiConst.LOOP_PERIOD_2S, TimeUnit.MILLISECONDS) .map((aLong -> aLong + 1)) @@ -55,7 +55,7 @@ public class TaxiModelLoopManager { public void stopInAndWaitOrdersLoop() { if (mInAndWaitServiceDisposable != null) { - CallerLogger.INSTANCE.i(M_TAXI + TAG, "stopInAndWaitOrdersLoop()"); + CallerLogger.i(M_TAXI + TAG, "stopInAndWaitOrdersLoop()"); mInAndWaitServiceDisposable.dispose(); mInAndWaitServiceDisposable = null; } @@ -65,7 +65,7 @@ public class TaxiModelLoopManager { if (mNewBookingOrderDisposable != null && !mNewBookingOrderDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.i(M_TAXI + TAG, "startNewBookingOrderLoop()"); + CallerLogger.i(M_TAXI + TAG, "startNewBookingOrderLoop()"); mNewBookingOrderDisposable = Observable.interval(TaxiConst.LOOP_DELAY, TaxiConst.LOOP_PERIOD_1S, TimeUnit.MILLISECONDS) .map((aLong -> aLong + 1)) @@ -76,7 +76,7 @@ public class TaxiModelLoopManager { public void stopNewBookingOrderLoop() { if (mNewBookingOrderDisposable != null) { - CallerLogger.INSTANCE.i(M_TAXI + TAG, "stopNewBookingOrderLoop()"); + CallerLogger.i(M_TAXI + TAG, "stopNewBookingOrderLoop()"); mNewBookingOrderDisposable.dispose(); mNewBookingOrderDisposable = null; } @@ -86,7 +86,7 @@ public class TaxiModelLoopManager { if (mGrabResultDisposable != null && !mGrabResultDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.i(M_TAXI + TAG, "startGrabResultLoop()"); + CallerLogger.i(M_TAXI + TAG, "startGrabResultLoop()"); mGrabResultDisposable = Observable.interval(TaxiConst.LOOP_DELAY, TaxiConst.LOOP_PERIOD_1S, TimeUnit.MILLISECONDS) .map((aLong -> aLong + 1)) @@ -97,7 +97,7 @@ public class TaxiModelLoopManager { public void stopGrabResultLoop() { if (mGrabResultDisposable != null) { - CallerLogger.INSTANCE.i(M_TAXI + TAG, "stopGrabResultLoop()"); + CallerLogger.i(M_TAXI + TAG, "stopGrabResultLoop()"); mGrabResultDisposable.dispose(); mGrabResultDisposable = null; } @@ -107,7 +107,7 @@ public class TaxiModelLoopManager { if (mHeartbeatDisposable != null && !mHeartbeatDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.i(M_TAXI + TAG, "startHeartbeatLoop()"); + CallerLogger.i(M_TAXI + TAG, "startHeartbeatLoop()"); mHeartbeatDisposable = Observable.interval(TaxiConst.LOOP_DELAY, TaxiConst.LOOP_PERIOD_60S, TimeUnit.MILLISECONDS) .map((aLong -> aLong + 1)) @@ -118,7 +118,7 @@ public class TaxiModelLoopManager { public void stopHeartbeatLoop() { if (mHeartbeatDisposable != null) { - CallerLogger.INSTANCE.i(M_TAXI + TAG, "stopHeartbeatLoop()"); + CallerLogger.i(M_TAXI + TAG, "stopHeartbeatLoop()"); mHeartbeatDisposable.dispose(); mHeartbeatDisposable = null; } @@ -126,7 +126,7 @@ public class TaxiModelLoopManager { public void startCalculateRouteInfoLoop() { - CallerLogger.INSTANCE.i(M_TAXI + TAG, "startCalculateRouteInfoLoop()"); + CallerLogger.i(M_TAXI + TAG, "startCalculateRouteInfoLoop()"); if (mCalculateRouteDisposable != null) return; mCalculateRouteDisposable = new CompositeDisposable(); @@ -168,7 +168,7 @@ public class TaxiModelLoopManager { public void stopCalculateRouteInfoLoop() { if (mCalculateRouteDisposable != null) { - CallerLogger.INSTANCE.i(M_TAXI + TAG, "stopCalculateRouteInfoLoop()"); + CallerLogger.i(M_TAXI + TAG, "stopCalculateRouteInfoLoop()"); mCalculateRouteDisposable.dispose(); mCalculateRouteDisposable = null; } diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/NaviPresenter.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/NaviPresenter.java index 112ed99f50..3eefaf7863 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/NaviPresenter.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/NaviPresenter.java @@ -38,7 +38,7 @@ public class NaviPresenter extends Presenter implements @Override public void onCreate( @NonNull LifecycleOwner owner ) { super.onCreate( owner ); - CallerLogger.INSTANCE.d( M_TAXI + TAG, " onCreate" ); + CallerLogger.d( M_TAXI + TAG, " onCreate" ); } @Override diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java index a989268905..18db1efb9f 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java @@ -62,7 +62,7 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS @Override public void onCreate( @NonNull LifecycleOwner owner ) { super.onCreate( owner ); - CallerLogger.INSTANCE.d( M_TAXI + TAG, "网约车-出租车拿到订单" ); + CallerLogger.d( M_TAXI + TAG, "网约车-出租车拿到订单" ); } @Override @@ -238,7 +238,7 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS @RequiresApi(api = Build.VERSION_CODES.P) @Override public void onCurrentOrderStatusChanged(OrderQueryRespBean.Result order) { - CallerLogger.INSTANCE.d(M_TAXI + TAG,"order = "+order.toString()); + CallerLogger.d(M_TAXI + TAG,"order = "+order.toString()); if (TaxiOrderStatusEnum.UserArriveAtStart.getCode() == order.orderStatus){ TaxiModel.getInstance().queryAutopilotStatus(true); TaxiModel.getInstance().setStation(); 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 f74667d853..88f8b9baac 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 @@ -205,7 +205,7 @@ public abstract class BaseTaxiTabFragment 0){ @@ -422,7 +422,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment } public void onCurrentOrderRouteInfoGot(OrderQueryRouteInfoRespBean.Result routeInfo) {// 单位 米， 秒 - CallerLogger.INSTANCE.d(M_TAXI + TAG, "durationToEnd = " + routeInfo.durationToEnd); + CallerLogger.d(M_TAXI + TAG, "durationToEnd = " + routeInfo.durationToEnd); String dis = "0"; long distance = routeInfo.distanceToEnd; @@ -492,7 +492,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment public void onOrderStatusChanged(OrderQueryRespBean.Result order) { int status = order.orderStatus; - CallerLogger.INSTANCE.d(M_TAXI + TAG, "status==" + status); + CallerLogger.d(M_TAXI + TAG, "status==" + status); mCurrentOrder = order; mActivity.runOnUiThread(() -> { if (status == TaxiOrderStatusEnum.None.getCode() || status == TaxiOrderStatusEnum.Cancel.getCode() || status == TaxiOrderStatusEnum.JourneyCompleted.getCode()) { @@ -588,7 +588,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment * @param being */ public void isHaveBeingOrder(boolean being) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "isHaveBeingOrder = " + being); + CallerLogger.d(M_TAXI + TAG, "isHaveBeingOrder = " + being); try { if (being) { mNoDataView.setVisibility(View.GONE); @@ -610,7 +610,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment @Override public void onClick(View v) { if (v.getId() == R.id.module_och_taxi_order_server_status_tv) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, mOrderServerStatus.getText().toString()); + CallerLogger.d(M_TAXI + TAG, mOrderServerStatus.getText().toString()); startOrEndService(); } else if (v.getId() == R.id.module_och_taxi_order_cancel_iv) { new TaxiOrderCancelDialog(mTaxiFragment, mActivity, mOrderNo, saveOrderState).show(); @@ -624,11 +624,11 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment showNaviToEndStationFragment(true); } }else if (v.getId() == R.id.taxi_start_by_auto){//自驾模式 - CallerLogger.INSTANCE.d(M_TAXI + TAG, "自驾模式"); + CallerLogger.d(M_TAXI + TAG, "自驾模式"); mOrderStartModeBtn.setTag(0); startOrEndService(); } else if (v.getId() == R.id.taxi_start_by_manual){//人工模式 - CallerLogger.INSTANCE.d(M_TAXI + TAG, "人工模式"); + CallerLogger.d(M_TAXI + TAG, "人工模式"); mOrderStartModeBtn.setTag(1); mTaxiFragment.confirmAutopilotConditionByDriver(); } @@ -699,7 +699,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment @Override public void reInitNaviAmap(boolean isPlay, boolean isRestart) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "isPlay = " + isPlay + ", isRestart=" + isRestart); + CallerLogger.d(M_TAXI + TAG, "isPlay = " + isPlay + ", isRestart=" + isRestart); if (!isRestart) { mTaxiFragment.showAmapNaviToStationFragment(false); return; @@ -754,7 +754,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment if (isAdd){ //开启线程执行起终点marker设置 Runnable setMapMarkerRunnable = () -> { - CallerLogger.INSTANCE.d(M_TAXI + "setMapMaker= " + Thread.currentThread().getName(), + CallerLogger.d(M_TAXI + "setMapMaker= " + Thread.currentThread().getName(), uuid + "=latitude=" + station.get(1) + ",longitude=" + station.get(0)); Point.Options.Builder builder = new Point.Options.Builder(TaxiConst.TYPE_MARKER_TAXI_ORDER, Level.MAP_MARKER) @@ -786,7 +786,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment }else { //开启线程移除起终点marker设置 Runnable removeMapMarkerRunnable = () -> { - CallerLogger.INSTANCE.d(M_TAXI + "RemoveMapMaker=" + Thread.currentThread().getName(), + CallerLogger.d(M_TAXI + "RemoveMapMaker=" + Thread.currentThread().getName(), uuid + "=latitude=" + station.get(1) + ",longitude=" + station.get(0)); // Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMarkerManager(AbsMogoApplication.getApp())).removeMarkers(uuid); IMoGoOverlayManager overlayManager = CallerMapUIServiceManager.INSTANCE.getOverlayManager(); diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java index c194d6c587..845d9b19f3 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java @@ -91,7 +91,7 @@ public class TaxiFragment extends BaseTaxiTabFragment parent, View view, int position, long id) { - CallerLogger.INSTANCE.d(M_TAXI + TAG,"mCurrentReason ="+ mContentArrays[position]); + CallerLogger.d(M_TAXI + TAG,"mCurrentReason ="+ mContentArrays[position]); mCurrentReason = mContentArrays[position]; // GradientDrawable background = (GradientDrawable) mCancelBt.getBackground();//GradientDrawable是Drawable的子类 // background.setColor(Color.parseColor("#2B6EFF")); diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java index fe488af13e..e9a8752287 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java @@ -127,7 +127,7 @@ public class TaxiPersonalDialogFragment extends windowManager.getDefaultDisplay().getSize(point); params.width = (int)(point.x * 0.375); params.height = ViewGroup.LayoutParams.MATCH_PARENT; - CallerLogger.INSTANCE.d(M_TAXI + TAG,"width= "+params.width+"height= "+params.height); + CallerLogger.d(M_TAXI + TAG,"width= "+params.width+"height= "+params.height); window.setAttributes(params); window.getDecorView().setBackgroundColor(Color.parseColor("#00FFFFFF"));//设置背景， 不然显示不全 window.setGravity(Gravity.LEFT|Gravity.BOTTOM); @@ -226,13 +226,13 @@ public class TaxiPersonalDialogFragment extends ImageView imageView = (ImageView) tab.getCustomView().findViewById(R.id.operation_tab_line_iv); if (isSelected){ textView.setTextSize(TypedValue.COMPLEX_UNIT_PX,AutoSizeUtils.dp2px(getContext(),46)); - CallerLogger.INSTANCE.d(M_TAXI + TAG,"SelectTv = "+ textView.getText()); + CallerLogger.d(M_TAXI + TAG,"SelectTv = "+ textView.getText()); textView.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD)); textView.setTextColor(Color.parseColor("#FFFFFF")); imageView.setImageDrawable(getResources().getDrawable(R.drawable.taxi_driver_operation_tab_line)); }else { textView.setTextSize(TypedValue.COMPLEX_UNIT_PX,AutoSizeUtils.dp2px(getContext(),40)); - CallerLogger.INSTANCE.d(M_TAXI + TAG,"unSelectTv = "+ textView.getText()); + CallerLogger.d(M_TAXI + TAG,"unSelectTv = "+ textView.getText()); textView.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL)); textView.setTextColor(Color.parseColor("#A7B6F0")); imageView.setImageDrawable(null); @@ -480,7 +480,7 @@ public class TaxiPersonalDialogFragment extends LinearLayoutManager linearLayoutManager = (LinearLayoutManager) manager; int lastItemPosition = linearLayoutManager.findLastCompletelyVisibleItemPosition(); int itemCount = linearLayoutManager.getItemCount(); - CallerLogger.INSTANCE.d(M_TAXI + TAG,"lastItemPosition=="+lastItemPosition+",itemCount=="+itemCount); + CallerLogger.d(M_TAXI + TAG,"lastItemPosition=="+lastItemPosition+",itemCount=="+itemCount); //向上滑动到最后一个 if ((lastItemPosition == itemCount-1) && isUpwardSliding){ onLoadMore(); diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java index 91007e4705..838cf0c69b 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java @@ -96,7 +96,7 @@ public class TaxiServerOrdersFragment extends BaseTaxiUIFragment { } } - CallerLogger.INSTANCE.d(M_TAXI + TAG,"activity="+getActivity()); + CallerLogger.d(M_TAXI + TAG,"activity="+getActivity()); mTaxiOrderTab.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) @Override @@ -139,13 +139,13 @@ public class TaxiServerOrdersFragment extends BaseTaxiUIFragment { if (isSelected){ textView.setBackground(getActivity().getDrawable(R.drawable.taxi_driver_tab_item_bg)); textView.setTextSize(TypedValue.COMPLEX_UNIT_PX,AutoSizeUtils.dp2px(getContext(),40)); - CallerLogger.INSTANCE.d(M_TAXI + TAG,"SelectTv = "+ textView.getText()); + CallerLogger.d(M_TAXI + TAG,"SelectTv = "+ textView.getText()); textView.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD)); textView.setTextColor(Color.parseColor("#FFFFFF")); }else { textView.setBackground(null); textView.setTextSize(TypedValue.COMPLEX_UNIT_PX,AutoSizeUtils.dp2px(getContext(),36)); - CallerLogger.INSTANCE.d(M_TAXI + TAG,"unSelectTv = "+ textView.getText()); + CallerLogger.d(M_TAXI + TAG,"unSelectTv = "+ textView.getText()); textView.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL)); textView.setTextColor(Color.parseColor("#CCD4F5")); } @@ -163,7 +163,7 @@ public class TaxiServerOrdersFragment extends BaseTaxiUIFragment { @NonNull @Override public Fragment getItem(int position) { - CallerLogger.INSTANCE.d( M_TAXI + TAG, "getItem="+position); + CallerLogger.d( M_TAXI + TAG, "getItem="+position); return fragments.get(position); } @@ -175,7 +175,7 @@ public class TaxiServerOrdersFragment extends BaseTaxiUIFragment { @Nullable @Override public CharSequence getPageTitle(int position) { - CallerLogger.INSTANCE.d( M_TAXI + TAG, "getPageTitle="+position); + CallerLogger.d( M_TAXI + TAG, "getPageTitle="+position); return mTabTitles[position]; } } diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.kt b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.kt index 22e0c765d4..0521b9a774 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.kt +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.kt @@ -81,7 +81,7 @@ object TaxiAnalyticsManager { ) { mStartAutopilotKey = if (restart) TaxiConst.EVENT_KEY_RESTART_AUTOPILOT else TaxiConst.EVENT_KEY_START_SERVICE -// CallerLogger.INSTANCE.d(M_TAXI + "埋点==","restart = "+restart+", send= "+send); +// CallerLogger.d(M_TAXI + "埋点==","restart = "+restart+", send= "+send); if (send) { if (mStartAutopilotParams.isEmpty()) return // 开启成功，上报埋点 diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java index cf0079e809..18ae00b5df 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java @@ -52,14 +52,14 @@ public class TaxiTrajectoryManager { public void syncTrajectoryInfo() { OrderQueryRespBean.Result orderInfo = TaxiModel.getInstance().getCurrentOCHOrder(); if (orderInfo == null || orderInfo.orderStatus >= TaxiOrderStatusEnum.OnTheWayToEnd.getCode()) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "syncTrajectoryInfo() stop."); + CallerLogger.d(M_TAXI + TAG, "syncTrajectoryInfo() stop."); stopTrajReqLoop(); } else { if (mPrevOrderNo.equals(orderInfo.orderNo)) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "syncTrajectoryInfo() 重复订单."); + CallerLogger.d(M_TAXI + TAG, "syncTrajectoryInfo() 重复订单."); } else { mPrevOrderNo = orderInfo.orderNo; - CallerLogger.INSTANCE.d(M_TAXI + TAG, "syncTrajectoryInfo() start."); + CallerLogger.d(M_TAXI + TAG, "syncTrajectoryInfo() start."); startTrajReqLoop(); } } @@ -73,31 +73,31 @@ public class TaxiTrajectoryManager { if (guardianInfo == null || !guardianInfo.hasCode()) return; if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) { // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发） - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹开始下载"); + CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹开始下载"); // ToastUtils.showShort("轨迹开始下载"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) { // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发） - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载成功"); + CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载成功"); // ToastUtils.showShort("轨迹下载成功"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) { // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹 - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() " + + CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地无对应轨迹"); // ToastUtils.showShort("轨迹下载失败，本地无对应轨迹"); } else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) { // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功 - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() " + + CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地有对应轨迹，认为成功"); // ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功"); } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) { // 5. 轨迹管理_轨迹下载超时 - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载超时"); + CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载超时"); // ToastUtils.showShort("轨迹下载超时"); } else if ("ISSM_FUNC_AUTO_PILOT_READY".equals(guardianInfo.getCode())) { // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。 - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() ssm ready，再次发起下载"); + CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() ssm ready，再次发起下载"); syncTrajectoryInfo(); } } @@ -105,7 +105,7 @@ public class TaxiTrajectoryManager { private void setupAutoPilotLine() { OrderQueryRespBean.Result order = TaxiModel.getInstance().getCurrentOCHOrder(); if (order == null) { - CallerLogger.INSTANCE.e(M_TAXI + TAG, + CallerLogger.e(M_TAXI + TAG, "setupAutoPilotLine(): orderInfo is null."); return; } else { @@ -154,7 +154,7 @@ public class TaxiTrajectoryManager { if (mSendReqDisposable != null && !mSendReqDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.d(M_TAXI + TAG, "startTrajReqLoop()"); + CallerLogger.d(M_TAXI + TAG, "startTrajReqLoop()"); setupAutoPilotLine(); mSendReqDisposable = Observable.interval(TaxiConst.LOOP_DELAY, TaxiConst.LOOP_PERIOD_10S, TimeUnit.MILLISECONDS) @@ -167,14 +167,14 @@ public class TaxiTrajectoryManager { stopTrajReqLoop(); return; } - CallerLogger.INSTANCE.d(M_TAXI + TAG, "loop sendTrajectoryReq: " + aLong); + CallerLogger.d(M_TAXI + TAG, "loop sendTrajectoryReq: " + aLong); sendTrajectoryReq(); }); } private void stopTrajReqLoop() { if (mSendReqDisposable != null) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "stopTrajReqLoop()"); + CallerLogger.d(M_TAXI + TAG, "stopTrajReqLoop()"); mSendReqDisposable.dispose(); mSendReqDisposable = null; clearAutoPilotLine(); @@ -183,12 +183,12 @@ public class TaxiTrajectoryManager { private void sendTrajectoryReq() { if (mAutoPilotLine == null) { - CallerLogger.INSTANCE.e(M_TAXI + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!"); + CallerLogger.e(M_TAXI + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!"); return; } CallerAutoPilotControlManager.INSTANCE.sendTrajectoryDownloadReq(mAutoPilotLine); - CallerLogger.INSTANCE.d(M_TAXI + TAG, "sendTrajectoryReq(): " + CallerLogger.d(M_TAXI + TAG, "sendTrajectoryReq(): " + GsonUtils.toJson(mAutoPilotLine)); } } diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java index c81773973b..a0c0677371 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java @@ -37,21 +37,21 @@ class MogoOCHTaxiPassenger implements IMogoOCH { @Override public void init(Context context) { - CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "init"); + CallerLogger.d(M_TAXI_P + TAG, "init"); } /** * 进入鹰眼模式，设置手势缩放地图失效 */ private void stepIntoVrMode() { - CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "进入vr模式"); + CallerLogger.d(M_TAXI_P + TAG, "进入vr模式"); CallerMoGoUiSettingManager.INSTANCE.stepInNightMode();//夜间模式 状态栏字体颜色变黑 } private void showFragment() { FragmentManager supportFragmentManager = mActivity.getSupportFragmentManager(); if (ochTaxiPassengerFragment == null) { - CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "准备add fragment======"); + CallerLogger.d(M_TAXI_P + TAG, "准备add fragment======"); Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(TaxiPassengerBaseFragment.TAG); if (fragmentByTag instanceof TaxiPassengerBaseFragment){ ochTaxiPassengerFragment = (TaxiPassengerBaseFragment) fragmentByTag; @@ -64,7 +64,7 @@ class MogoOCHTaxiPassenger implements IMogoOCH { } return; } - CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "准备show fragment"); + CallerLogger.d(M_TAXI_P + TAG, "准备show fragment"); supportFragmentManager.beginTransaction().show(ochTaxiPassengerFragment).commitAllowingStateLoss(); } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java index a86a8f2edd..81e7416da2 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java @@ -144,7 +144,7 @@ public class TaxiOrderCancelDialog extends AlertDialog implements View.OnClickLi @Override public void onItemClick(AdapterView parent, View view, int position, long id) { - CallerLogger.INSTANCE.d(M_TAXI + TAG,"mCurrentReason ="+ mContentArrays[position]); + CallerLogger.d(M_TAXI + TAG,"mCurrentReason ="+ mContentArrays[position]); mCurrentReason = mContentArrays[position]; mContentAdapter.notifyCurrentReasons(mCurrentReason); } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/RoutingNaviPresenter.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/RoutingNaviPresenter.java index 09345d2682..1947fdfd16 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/RoutingNaviPresenter.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/RoutingNaviPresenter.java @@ -37,7 +37,7 @@ public class RoutingNaviPresenter extends Presenter imp @Override public void onCreate( @NonNull LifecycleOwner owner ) { super.onCreate( owner ); - CallerLogger.INSTANCE.d( M_TAXI + TAG, " onCreate" ); + CallerLogger.d( M_TAXI + TAG, " onCreate" ); } @Override diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt index ae99c9c22a..0e72b048dc 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt @@ -571,7 +571,7 @@ class TaxiCurrentTaskFragment : BaseFragment(), * @param timeInSecond 秒 */ fun updateDistanceAndTime(meters: Long, timeInSecond: Long) { -// CallerLogger.INSTANCE.d(M_TAXI + TAG,"meters = "+meters+"timeInSecond ="+timeInSecond); +// CallerLogger.d(M_TAXI + TAG,"meters = "+meters+"timeInSecond ="+timeInSecond); if (mCurrentTaskWithOrder == null) return if (mCurrentTaskWithOrder!!.endSite == null && mDriveToNearestStationTask == null) return diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java index 5a33a5e5ee..a6945fde00 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java @@ -55,7 +55,7 @@ public class TaxiAnalyticsManager { private void triggerStartAutopilotFailureEvent(String failCode, String failMsg){ if (mStartAutopilotParams.isEmpty()) return; - CallerLogger.INSTANCE.e(M_TAXI + "triggerStartAutopilotFailureEvent", failMsg); + CallerLogger.e(M_TAXI + "triggerStartAutopilotFailureEvent", failMsg); if (CallerAutoPilotStatusListenerManager.INSTANCE.getState() != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){ mStartAutopilotParams.put(TaxiUnmannedConst.EVENT_PARAM_START_FAILURE_CODE, failCode); @@ -104,7 +104,7 @@ public class TaxiAnalyticsManager { mStartAutopilotParams.put(TaxiUnmannedConst.EVENT_PARAM_LINE_ID, lineId); mStartAutopilotParams.put(TaxiUnmannedConst.EVENT_PARAM_ORDER_NUMBER, orderNo); -// CallerLogger.INSTANCE.d(M_TAXI + "埋点==","restart = "+restart+", send= "+send); +// CallerLogger.d(M_TAXI + "埋点==","restart = "+restart+", send= "+send); if (send) { if (mStartAutopilotParams.isEmpty()) return; diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java index ef3287ad56..92370e4f24 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java @@ -69,14 +69,14 @@ public class TaxiTrajectoryManager { public void syncTrajectoryInfo() { QueryCurrentTaskRespBean.Result taskAndOrder = TaxiModel.INSTANCE.getCurTaskAndOrder(); if (taskAndOrder == null || taskAndOrder.getCurrentStatus() >= TaskStatusEnum.StartTask.getCode()) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "syncTrajectoryInfo() stop."); + CallerLogger.d(M_TAXI + TAG, "syncTrajectoryInfo() stop."); stopTrajReqLoop(); } else { if (mPrevTaskLineId.equals(String.valueOf(taskAndOrder.getLineId()))) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "syncTrajectoryInfo() 重复订单."); + CallerLogger.d(M_TAXI + TAG, "syncTrajectoryInfo() 重复订单."); } else { mPrevTaskLineId = String.valueOf(taskAndOrder.getLineId()); - CallerLogger.INSTANCE.d(M_TAXI + TAG, "syncTrajectoryInfo() start."); + CallerLogger.d(M_TAXI + TAG, "syncTrajectoryInfo() start."); startTrajReqLoop(); } } @@ -90,27 +90,27 @@ public class TaxiTrajectoryManager { if (guardianInfo == null || !guardianInfo.hasCode()) return; if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) { // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发） - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹开始下载"); + CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹开始下载"); // ToastUtils.showShort("轨迹开始下载"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) { // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发） - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载成功"); + CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载成功"); // ToastUtils.showShort("轨迹下载成功"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) { // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹 - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() " + + CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地无对应轨迹"); // ToastUtils.showShort("轨迹下载失败，本地无对应轨迹"); } else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) { // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功 - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() " + + CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地有对应轨迹，认为成功"); // ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功"); } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) { // 5. 轨迹管理_轨迹下载超时 - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载超时"); + CallerLogger.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载超时"); // ToastUtils.showShort("轨迹下载超时"); } } @@ -119,7 +119,7 @@ public class TaxiTrajectoryManager { QueryCurrentTaskRespBean.Result taskAndOrder = TaxiModel.INSTANCE.getCurTaskAndOrder(); if (taskAndOrder == null || taskAndOrder.getEndSite() == null) { - CallerLogger.INSTANCE.e(M_TAXI + TAG, + CallerLogger.e(M_TAXI + TAG, "setupAutoPilotLine(): taskAndOrder or taskAndOrder.getEndSite() is null."); } else { /** @@ -239,7 +239,7 @@ public class TaxiTrajectoryManager { if (mSendReqDisposable != null && !mSendReqDisposable.isDisposed()) { return; } - CallerLogger.INSTANCE.d(M_TAXI + TAG, "startTrajReqLoop()"); + CallerLogger.d(M_TAXI + TAG, "startTrajReqLoop()"); setupAutoPilotLine(); mSendReqDisposable = Observable.interval(TaxiUnmannedConst.LOOP_DELAY, TaxiUnmannedConst.LOOP_PERIOD_10S, TimeUnit.MILLISECONDS) @@ -252,14 +252,14 @@ public class TaxiTrajectoryManager { stopTrajReqLoop(); return; } - CallerLogger.INSTANCE.d(M_TAXI + TAG, "loop sendTrajectoryReq: " + aLong); + CallerLogger.d(M_TAXI + TAG, "loop sendTrajectoryReq: " + aLong); sendTrajectoryReq(); }); } private void stopTrajReqLoop() { if (mSendReqDisposable != null) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "stopTrajReqLoop()"); + CallerLogger.d(M_TAXI + TAG, "stopTrajReqLoop()"); mSendReqDisposable.dispose(); mSendReqDisposable = null; clearAutoPilotLine(); @@ -270,16 +270,16 @@ public class TaxiTrajectoryManager { if (mAutoPilotLine != null) { CallerAutoPilotControlManager.INSTANCE.sendTrajectoryDownloadReq(mAutoPilotLine,COMMON_LOADING); }else { - CallerLogger.INSTANCE.e(M_TAXI + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!"); + CallerLogger.e(M_TAXI + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!"); } if (mPreAutoPilotLine != null){ CallerAutoPilotControlManager.INSTANCE.sendTrajectoryDownloadReq(mPreAutoPilotLine,PRE_LOADING); }else { - CallerLogger.INSTANCE.e(M_TAXI + TAG, "sendTrajectoryReq(): mPreAutoPilotLine is null!!!"); + CallerLogger.e(M_TAXI + TAG, "sendTrajectoryReq(): mPreAutoPilotLine is null!!!"); } - CallerLogger.INSTANCE.d(M_TAXI + TAG, "sendTrajectoryReq(): common_load = " + CallerLogger.d(M_TAXI + TAG, "sendTrajectoryReq(): common_load = " + GsonUtils.toJson(mAutoPilotLine) + ", pre_load" + GsonUtils.toJson(mPreAutoPilotLine)); } } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java index 92f169a9ec..7d3b5ed99f 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java @@ -33,21 +33,21 @@ public class MogoOCHTaxiPassenger implements IMogoOCH { @Override public void init(Context context) { - CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "init"); + CallerLogger.d(M_TAXI_P + TAG, "init"); } /** * 进入鹰眼模式，设置手势缩放地图失效 */ private void stepIntoVrMode() { - CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "进入vr模式"); + CallerLogger.d(M_TAXI_P + TAG, "进入vr模式"); CallerMoGoUiSettingManager.INSTANCE.stepInNightMode();//夜间模式 状态栏字体颜色变黑 } private void showFragment() { FragmentManager supportFragmentManager = mActivity.getSupportFragmentManager(); if (ochTaxiPassengerFragment == null) { - CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "准备add fragment======"); + CallerLogger.d(M_TAXI_P + TAG, "准备add fragment======"); Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(TaxiPassengerBaseFragment.TAG); if (fragmentByTag instanceof TaxiPassengerBaseFragment){ ochTaxiPassengerFragment = (TaxiPassengerBaseFragment) fragmentByTag; @@ -60,7 +60,7 @@ public class MogoOCHTaxiPassenger implements IMogoOCH { } return; } - CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "准备show fragment"); + CallerLogger.d(M_TAXI_P + TAG, "准备show fragment"); supportFragmentManager.beginTransaction().show(ochTaxiPassengerFragment).commitAllowingStateLoss(); } diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/impl/V2XScenarioManager.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/impl/V2XScenarioManager.java index 20061490ec..cae288b52c 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/impl/V2XScenarioManager.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/impl/V2XScenarioManager.java @@ -46,7 +46,7 @@ public class V2XScenarioManager implements IV2XScenarioManager { @Override public void handlerMessage(V2XMessageEntity v2XMessageEntity) { - CallerLogger.INSTANCE.d(M_V2X + TAG, "处理V2X场景：" + (v2XMessageEntity == null ? "null" : v2XMessageEntity.toString())); + CallerLogger.d(M_V2X + TAG, "处理V2X场景：" + (v2XMessageEntity == null ? "null" : v2XMessageEntity.toString())); try { synchronized (V2XScenarioManager.class) { // 展示 @@ -72,7 +72,7 @@ public class V2XScenarioManager implements IV2XScenarioManager { default: mV2XScenario = null; - CallerLogger.INSTANCE.e(M_V2X + TAG, "当前V2X消息类型未定义:" + v2XMessageEntity); + CallerLogger.e(M_V2X + TAG, "当前V2X消息类型未定义:" + v2XMessageEntity); return; } // 展示最新的消息 diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java index 381b852113..d2ae4a4554 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java @@ -62,7 +62,7 @@ public class V2XRoadEventMarker implements IV2XMarker { String id = entity.getLocation().getLon() + "_" + entity.getLocation().getLat(); MarkerRemoveManager.INSTANCE.addMarker(new MarkerWrapper(id, entity.getLocation().getLon(), entity.getLocation().getLat(), 0, markers, null, null)); } else { - CallerLogger.INSTANCE.d(M_V2X + "RWJ", "V2XRoadEventMarker:" + entity.getPoiType() + "--- return empty marker"); + CallerLogger.d(M_V2X + "RWJ", "V2XRoadEventMarker:" + entity.getPoiType() + "--- return empty marker"); } } } diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java index c1fe08de93..df2adcc441 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java @@ -50,7 +50,7 @@ public class V2XFrontWarningScenario extends AbsV2XScenario implements IMoGoChas @Override public void init(@Nullable V2XMessageEntity v2XMessageEntity) { - CallerLogger.INSTANCE.d(M_V2X + TAG, "----- init -----:\n" + (v2XMessageEntity == null ? "null" : v2XMessageEntity.toString())); + CallerLogger.d(M_V2X + TAG, "----- init -----:\n" + (v2XMessageEntity == null ? "null" : v2XMessageEntity.toString())); try { setV2XMessageEntity(v2XMessageEntity); if (v2XMessageEntity != null && v2XMessageEntity.getContent() instanceof V2XWarningTarget) { @@ -64,9 +64,9 @@ public class V2XFrontWarningScenario extends AbsV2XScenario implements IMoGoChas @Override public void show() { - CallerLogger.INSTANCE.d(M_V2X + TAG, "----- show --- 1 --:\n" + (mMarkerEntity == null ? "null" : mMarkerEntity.toString())); + CallerLogger.d(M_V2X + TAG, "----- show --- 1 --:\n" + (mMarkerEntity == null ? "null" : mMarkerEntity.toString())); if (mMarkerEntity != null) { - CallerLogger.INSTANCE.d(M_V2X + TAG, "----- show --- 2 --:\n" + mMarkerEntity); + CallerLogger.d(M_V2X + TAG, "----- show --- 2 --:\n" + mMarkerEntity); String v2xType = getV2XTypeForFrontWarning(mMarkerEntity); V2XMessageEntity entity = getV2XMessageEntity(); if (!v2xType.equals("0")) { @@ -126,13 +126,13 @@ public class V2XFrontWarningScenario extends AbsV2XScenario implements IMoGoChas IV2XMarker marker = getV2XMarker(); if (marker != null && mMarkerEntity != null) { marker.drawPOI(mMarkerEntity); - CallerLogger.INSTANCE.d(M_V2X + TAG, "drawPOI"); + CallerLogger.d(M_V2X + TAG, "drawPOI"); } } @Override public void clearPOI() { - CallerLogger.INSTANCE.d(M_V2X + TAG, "----- clearPOI -----"); + CallerLogger.d(M_V2X + TAG, "----- clearPOI -----"); } @Override diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XWarningMarker.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XWarningMarker.java index 571ac758f6..c5366f474c 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XWarningMarker.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XWarningMarker.java @@ -59,12 +59,12 @@ // @Override // public void drawPOI(Object entity) { // try { -// CallerLogger.INSTANCE.d(M_V2X + TAG, "===drawPOI"); +// CallerLogger.d(M_V2X + TAG, "===drawPOI"); // mCloundWarningInfo = (V2XWarningTarget) entity; // drawLineWithEntity(); // // } catch (Exception e) { -// CallerLogger.INSTANCE.d(M_V2X + TAG, e.toString()); +// CallerLogger.d(M_V2X + TAG, e.toString()); // } // // } @@ -115,14 +115,14 @@ // //衡阳交付-取消划线需求,只渲染识别物红色模型移动过程 // //handleStopLine(); // }, 0); -// CallerLogger.INSTANCE.d(M_V2X + TAG, "显示时间为++" + showTime + "识别物类型:" + +// CallerLogger.d(M_V2X + TAG, "显示时间为++" + showTime + "识别物类型:" + // String.valueOf(mCloundWarningInfo.getType())); // // } else { //无停止线 -// CallerLogger.INSTANCE.d(M_V2X + TAG, "无停止线"); +// CallerLogger.d(M_V2X + TAG, "无停止线"); // WorkThreadHandler.getInstance().postDelayed(() -> { // /* 衡阳交付-取消划线需求,只渲染识别物红色模型移动过程 -// CallerLogger.INSTANCE.d(M_V2X + TAG, "无停止线" + mCloundWarningInfo.toString()); +// CallerLogger.d(M_V2X + TAG, "无停止线" + mCloundWarningInfo.toString()); // //绘制识别物与交汇点连线，并且更新连线数据 // drawOtherObjectLine(mCloundWarningInfo); // //二轮车和行人的渲染和移动 @@ -130,7 +130,7 @@ // if (carLocation.lat != 0 && carLocation.lon != 0) { // drawSelfCarLine(carLocation.lon, carLocation.lat, bearing); // } else { -// CallerLogger.INSTANCE.d(M_V2X + TAG, "数据为空carLocation == null"); +// CallerLogger.d(M_V2X + TAG, "数据为空carLocation == null"); // } // */ // Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMarkerService()).renderWarningMoveMarker(mCloundWarningInfo.getLon() @@ -153,7 +153,7 @@ // MogoLatLng startLatLng = new MogoLatLng(carLocation.lat, carLocation.lon); // MogoLatLng endLatLng = new MogoLatLng(middleLocationInStopLine.lat, middleLocationInStopLine.lon); // double angle = Trigonometric.getAngle(startLatLng.lon, startLatLng.lat, endLatLng.lon, endLatLng.lat); -// CallerLogger.INSTANCE.d(M_V2X + TAG, "angle==" + String.valueOf(angle)); +// CallerLogger.d(M_V2X + TAG, "angle==" + String.valueOf(angle)); // return angle; // } // @@ -166,14 +166,14 @@ // startLatLng, MogoLatLng mogoLatLng) { // if (info != null) { // double angle = Trigonometric.getAngle(startLatLng.lon, startLatLng.lat, mogoLatLng.lon, mogoLatLng.lat); -// CallerLogger.INSTANCE.d(M_V2X + TAG, "angle==drawRedWarningLineFrontOfStopLine:" + String.valueOf(angle)); +// CallerLogger.d(M_V2X + TAG, "angle==drawRedWarningLineFrontOfStopLine:" + String.valueOf(angle)); // IMoGoStopPolylineManager stopPolyLineMnager = BridgeApi.INSTANCE.v2xStopPolyline(); // if (stopPolyLineMnager != null) { // IMogoPolyline polyLine = stopPolyLineMnager.getMogoStopPolyline(); // MogoLatLng endLatlng = new MogoLatLng(mogoLatLng.lat, mogoLatLng.lon); // MogoLatLng addMiddleLoc = Trigonometric.getNewLocation(startLatLng.lon, startLatLng.lat, 25, angle); // if (polyLine != null) { -// CallerLogger.INSTANCE.d(M_V2X + TAG, "drawStopLine polyLine != null"); +// CallerLogger.d(M_V2X + TAG, "drawStopLine polyLine != null"); // polyLine.setPoints(Arrays.asList(startLatLng, addMiddleLoc, endLatlng)); // polyLine.setTransparency(0.5f); // } else { @@ -184,11 +184,11 @@ // locations.add(endLatlng); // lineInfo.setLocations(locations); // lineInfo.setHeading(info.getHeading()); -// CallerLogger.INSTANCE.d(TAG, "drawStopLine width = " + info.getRoadwidth()); +// CallerLogger.d(TAG, "drawStopLine width = " + info.getRoadwidth()); // lineInfo.setWidth(info.getRoadwidth() * 14 + 5); // stopPolyLineMnager.drawStopPolyline(BridgeApi.INSTANCE.context(), lineInfo); // } -// CallerLogger.INSTANCE.d(M_V2X + TAG, "停止线前方50m区域的三个坐标点是:" + startLatLng.lon + "," + startLatLng.lat + +// CallerLogger.d(M_V2X + TAG, "停止线前方50m区域的三个坐标点是:" + startLatLng.lon + "," + startLatLng.lat + // "中间点坐标:" + addMiddleLoc.lon + "," + addMiddleLoc.lat // + "终点" + endLatlng.lon + "," + endLatlng.lat); // } @@ -199,7 +199,7 @@ // // public void clearAllLine() { // UiThreadHandler.postDelayed(() -> { -// CallerLogger.INSTANCE.d(M_V2X + TAG, "清除所有预警线的时间是:" + String.valueOf(showTime)); +// CallerLogger.d(M_V2X + TAG, "清除所有预警线的时间是:" + String.valueOf(showTime)); // //清除识别物到碰撞点预警线 // IMoGoPersonWarnPolylineManager personStopPolyLineManager = BridgeApi.INSTANCE.v2xPersonWarnPolyline(); // if (personStopPolyLineManager != null) { @@ -251,10 +251,10 @@ // } // fillPoints.add(y); // } else { -// CallerLogger.INSTANCE.d(M_V2X + TAG, "停止线数据不存在"); +// CallerLogger.d(M_V2X + TAG, "停止线数据不存在"); // } // } catch (Exception e) { -// CallerLogger.INSTANCE.e(M_V2X + TAG, "exception : " + e); +// CallerLogger.e(M_V2X + TAG, "exception : " + e); // e.printStackTrace(); // } // } @@ -294,7 +294,7 @@ // * */ // private MogoLatLng getMiddleLocationInStopLine() { // if (carLocation.lat == 0 || carLocation.lon == 0) { -// CallerLogger.INSTANCE.d(M_V2X + TAG, "获取不到车的位置"); +// CallerLogger.d(M_V2X + TAG, "获取不到车的位置"); // } // MogoLatLng newLocation = new MogoLatLng(0, 0); // if (mCloundWarningInfo != null && mCloundWarningInfo.getStopLines() != null && mCloundWarningInfo.getStopLines().size() > 1) { @@ -304,7 +304,7 @@ // double angle = Trigonometric.getAngle(x.getLat(), x.getLat(), y.getLon(), y.getLat()); // newLocation = Trigonometric.getNewLocation(x.getLon(), x.getLat(), distance * 0.5, angle); // } else { -// CallerLogger.INSTANCE.d(M_V2X + TAG, "停止线返回坐标点数量不正确" + mCloundWarningInfo.getStopLines().size()); +// CallerLogger.d(M_V2X + TAG, "停止线返回坐标点数量不正确" + mCloundWarningInfo.getStopLines().size()); // } // return newLocation; // } @@ -316,7 +316,7 @@ // * lat 自车纬度 // */ // public void drawSelfCarLine(double lon, double lat, float bearing) { -// CallerLogger.INSTANCE.d(M_V2X + TAG, "drawSelfCarLine"); +// CallerLogger.d(M_V2X + TAG, "drawSelfCarLine"); // if (!isSelfLineClear) { // if (mCloundWarningInfo != null) { // IMoGoWarnPolylineManager warnPolyLineManager = BridgeApi.INSTANCE.v2xWarnPolyline(); @@ -342,7 +342,7 @@ // //扩展点为了渐变色添加 // addMiddleLoc = Trigonometric.getNewLocation(startLatlng.getLon(), startLatlng.getLat(), distance / 2, // Trigonometric.getAngle(startLatlng.lon, startLatlng.lat, endLatlng.lon, endLatlng.lat)); -// CallerLogger.INSTANCE.d(M_V2X + TAG, "angle==扩展点为了渐变色添加:" + +// CallerLogger.d(M_V2X + TAG, "angle==扩展点为了渐变色添加:" + // String.valueOf(Trigonometric.getAngle(startLatlng.lon, startLatlng.lat, endLatlng.lon, endLatlng.lat))); // if (mogoPolyline != null) { // mogoPolyline.setPoints(Arrays.asList(startLatlng, addMiddleLoc, endLatlng)); @@ -360,9 +360,9 @@ // info.setHasStopLines(mCloundWarningInfo.getStopLines().size() > 0); // } // warnPolyLineManager.drawWarnPolyline(BridgeApi.INSTANCE.context(), info); -// CallerLogger.INSTANCE.d(M_V2X + TAG, "自车前方第一条线" + "起点:" + startLatlng + "中间点:" + addMiddleLoc + "终点:" + endLatlng); +// CallerLogger.d(M_V2X + TAG, "自车前方第一条线" + "起点:" + startLatlng + "中间点:" + addMiddleLoc + "终点:" + endLatlng); // } -// CallerLogger.INSTANCE.d(M_V2X + TAG, "自车为起点绘制 自车;" + startLatlng.lon + "," + startLatlng.lat + +// CallerLogger.d(M_V2X + TAG, "自车为起点绘制 自车;" + startLatlng.lon + "," + startLatlng.lat + // "中间扩展点" + addMiddleLoc.lon + "," + addMiddleLoc.lat + "终点:" + endLatlng.lon + "," + endLatlng.lat); // } else { // clearAllLine(); @@ -375,7 +375,7 @@ // */ // private void drawOtherObjectLine(V2XWarningTarget info) { // if (info != null) { -// CallerLogger.INSTANCE.d(M_V2X + TAG, "info != null"); +// CallerLogger.d(M_V2X + TAG, "info != null"); // IMoGoPersonWarnPolylineManager personWarnPolylineManager = BridgeApi.INSTANCE.v2xPersonWarnPolyline(); // if (personWarnPolylineManager == null) { // return; @@ -387,7 +387,7 @@ // MogoLatLng addMiddleLoc = Trigonometric.getNewLocation(startLatlng.getLon(), startLatlng.getLat(), distance / 2, // Trigonometric.getAngle(startLatlng.lon, startLatlng.lat, endLatlng.lon, endLatlng.lat));//补点 // if (polyLine != null) { -// CallerLogger.INSTANCE.d(M_V2X + TAG, "目标物与碰撞点连线 != null"); +// CallerLogger.d(M_V2X + TAG, "目标物与碰撞点连线 != null"); // polyLine.setPoints(Arrays.asList(startLatlng, addMiddleLoc, endLatlng)); // polyLine.setTransparency(0.5f); // } else { @@ -402,10 +402,10 @@ // lineInfo.setHeading(info.getHeading()); // lineInfo.setWidth(info.getRoadwidth() * 14 + 5); // personWarnPolylineManager.drawPersonWarnPolyline(BridgeApi.INSTANCE.context(), lineInfo); -// CallerLogger.INSTANCE.d(M_V2X + TAG, "目标物与预碰撞点画线点为" + "起点:" + startLatlng + "中间点:" + addMiddleLoc + "终点:" + endLatlng); +// CallerLogger.d(M_V2X + TAG, "目标物与预碰撞点画线点为" + "起点:" + startLatlng + "中间点:" + addMiddleLoc + "终点:" + endLatlng); // } // } else { -// CallerLogger.INSTANCE.e(M_V2X + TAG, "info == null"); +// CallerLogger.e(M_V2X + TAG, "info == null"); // clearAllLine(); // } // } @@ -415,14 +415,14 @@ // float distance = CoordinateUtils.calculateLineDistance( // startLatLng.lon, startLatLng.lat, endLatLng.lon, endLatLng.lat); // double rotate = Trigonometric.getAngle(startLatLng.lon, startLatLng.lat, endLatLng.lon, endLatLng.lat); -// CallerLogger.INSTANCE.d(M_V2X + TAG, "添加小箭头--目标物与预碰撞点之间的距离是" + String.valueOf(distance)); +// CallerLogger.d(M_V2X + TAG, "添加小箭头--目标物与预碰撞点之间的距离是" + String.valueOf(distance)); // if (distance > 5) { // int count = (int) (distance / 5); // for (int i = 0; i < count; i++) { // MogoLatLng newLo = Trigonometric.getNewLocation( // startLatLng.getLon(), startLatLng.getLat(), 5 * (i + 1), Trigonometric.getAngle(startLatLng.lon, startLatLng.lat, endLatLng.lon, endLatLng.lat)); // Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMarkerService()).drawerArrowsMarkerWithLocation(newLo, WARNING_ARROWS, 10, new Double(rotate).intValue()); -// CallerLogger.INSTANCE.d(M_V2X + TAG, "小箭头位置" + newLo); +// CallerLogger.d(M_V2X + TAG, "小箭头位置" + newLo); // } // } // @@ -441,6 +441,6 @@ // //衡阳交付-取消划线需求,只渲染识别物红色模型移动过程 // //drawSelfCarLine(latLng.getLongitude(), latLng.getLatitude(), latLng.getBearing()); // } -// CallerLogger.INSTANCE.d(M_V2X + TAG, "车辆行驶轨迹" + latLng.getLongitude() + "," + latLng.getLatitude()); +// CallerLogger.d(M_V2X + TAG, "车辆行驶轨迹" + latLng.getLongitude() + "," + latLng.getLatitude()); // } //} diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt index 2e6d9195ce..75100b5784 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt @@ -6,7 +6,6 @@ import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Handler import android.util.AttributeSet -import android.util.Log import android.view.LayoutInflater import android.view.View import androidx.constraintlayout.widget.ConstraintLayout @@ -19,6 +18,8 @@ import com.mogo.eagle.core.data.deva.badcase.SubBagEntity import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.zhidao.loglib.download.DownloadManager @@ -116,7 +117,7 @@ class BadCaseManagerView @JvmOverloads constructor( if(bagManagerList.size>0){ bagManagerEntity.reqType = 3 bagManagerEntity.keyReq = bagManagerList[0].key - Log.i("sendBagManagerCmd","bagManagerEntity.keyReq="+bagManagerEntity.keyReq) + CallerLogger.i(M_DEVA+"sendBagManagerCmd","bagManagerEntity.keyReq="+bagManagerEntity.keyReq) CallerAutoPilotControlManager.sendBagManagerCmd(bagManagerEntity) bagUploadDialog = BagUploadDialog(context) @@ -237,24 +238,24 @@ class BadCaseManagerView @JvmOverloads constructor( override fun onBagManagerResult(bagManager: BagManagerOuterClass.BagManager) { super.onBagManagerResult(bagManager) UiThreadHandler.post { - Log.i(TAG,"onBagManagerResult Start") - Log.i(TAG,"keyReq="+bagManager.keyReq) - Log.i(TAG,"reqType="+bagManager.reqType) - Log.i(TAG,"uploadCosResp stat="+bagManager.uploadCosResp.stat) - Log.i(TAG,"descReq description="+bagManager.descReq.description + CallerLogger.i(M_DEVA + TAG,"onBagManagerResult Start") + CallerLogger.i(M_DEVA + TAG,"keyReq="+bagManager.keyReq) + CallerLogger.i(M_DEVA + TAG,"reqType="+bagManager.reqType) + CallerLogger.i(M_DEVA + TAG,"uploadCosResp stat="+bagManager.uploadCosResp.stat) + CallerLogger.i(M_DEVA + TAG,"descReq description="+bagManager.descReq.description +" audioUrl="+bagManager.descReq.audioUrl +" reportBI="+bagManager.descReq.reportBI +" hasAudio="+bagManager.descReq.hasAudio) for(logBag in bagManager.bagsInfoRespList){ - Log.i(TAG,"bagPath="+logBag.bagPath) - Log.i(TAG,"timestamp="+logBag.timestamp) - Log.i(TAG,"description="+logBag.description) - Log.i(TAG,"key="+logBag.key) - Log.i(TAG,"mergeStat="+logBag.mergeStat) - Log.i(TAG,"totalSize="+logBag.totalSize) - Log.i(TAG,"uploadStat="+logBag.uploadStat) + CallerLogger.i(M_DEVA + TAG,"bagPath="+logBag.bagPath) + CallerLogger.i(M_DEVA + TAG,"timestamp="+logBag.timestamp) + CallerLogger.i(M_DEVA + TAG,"description="+logBag.description) + CallerLogger.i(M_DEVA + TAG,"key="+logBag.key) + CallerLogger.i(M_DEVA + TAG,"mergeStat="+logBag.mergeStat) + CallerLogger.i(M_DEVA + TAG,"totalSize="+logBag.totalSize) + CallerLogger.i(M_DEVA + TAG,"uploadStat="+logBag.uploadStat) } - Log.i(TAG,"onBagManagerResult End") + CallerLogger.i(M_DEVA + TAG,"onBagManagerResult End") //获取空间使用信息 if(bagManager.reqType == 1){ @@ -367,7 +368,7 @@ class BadCaseManagerView @JvmOverloads constructor( //执行下一个上传Bag命令 bagManagerEntity.reqType = 3 bagManagerEntity.keyReq = bagManagerList[0].key - Log.i("sendBagManagerCmd","bagManagerEntity.keyReq="+bagManagerEntity.keyReq) + CallerLogger.i("sendBagManagerCmd","bagManagerEntity.keyReq="+bagManagerEntity.keyReq) CallerAutoPilotControlManager.sendBagManagerCmd(bagManagerEntity) } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/record/RecordHelper.java b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/record/RecordHelper.java index bcd74d8efe..d7a33d08ae 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/record/RecordHelper.java +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/record/RecordHelper.java @@ -1,5 +1,7 @@ package com.zhjt.mogo_core_function_devatools.badcase.record; +import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_DEVA; + import android.media.AudioRecord; import android.media.MediaRecorder; import android.os.Environment; @@ -164,8 +166,7 @@ public class RecordHelper { mp3EncodeThread = new Mp3EncodeThread(resultFile, bufferSize, currentConfig); mp3EncodeThread.start(); } catch (Exception e) { -// Log.e(e, TAG, e.getMessage()); - CallerLogger.INSTANCE.d("$M_DEVA$TAG", e.getMessage()); + CallerLogger.d(M_DEVA+TAG, e.getMessage()); } } @@ -176,14 +177,14 @@ public class RecordHelper { AudioRecordThread() { bufferSize = AudioRecord.getMinBufferSize(currentConfig.getSampleRate(), currentConfig.getChannelConfig(), currentConfig.getEncodingConfig()) * RECORD_AUDIO_BUFFER_TIMES; - CallerLogger.INSTANCE.d("$M_DEVA$TAG", "record buffer size = %s", bufferSize); + CallerLogger.d("$M_DEVA$TAG", "record buffer size = %s", bufferSize); audioRecord = new AudioRecord(MediaRecorder.AudioSource.MIC, currentConfig.getSampleRate(), currentConfig.getChannelConfig(), currentConfig.getEncodingConfig(), bufferSize); if (currentConfig.getFormat() == RecordConfig.RecordFormat.MP3) { if (mp3EncodeThread == null) { initMp3EncoderThread(bufferSize); } else { - CallerLogger.INSTANCE.e("$M_DEVA$TAG", "mp3EncodeThread != null, 请检查代码"); + CallerLogger.e("$M_DEVA$TAG", "mp3EncodeThread != null, 请检查代码"); } } } @@ -205,7 +206,7 @@ public class RecordHelper { private void startPcmRecorder() { state = RecordState.RECORDING; notifyState(); - CallerLogger.INSTANCE.d("$M_DEVA$TAG", "开始录制 Pcm"); + CallerLogger.d("$M_DEVA$TAG", "开始录制 Pcm"); FileOutputStream fos = null; try { fos = new FileOutputStream(tmpFile); @@ -223,7 +224,7 @@ public class RecordHelper { if (state == RecordState.STOP) { makeFile(); } else { - CallerLogger.INSTANCE.i("$M_DEVA$TAG", "暂停！"); + CallerLogger.i("$M_DEVA$TAG", "暂停！"); } } catch (Exception e) { notifyError("录音失败"); @@ -239,7 +240,7 @@ public class RecordHelper { if (state != RecordState.PAUSE) { state = RecordState.IDLE; notifyState(); - CallerLogger.INSTANCE.d("$M_DEVA$TAG", "录音结束"); + CallerLogger.d("$M_DEVA$TAG", "录音结束"); } } @@ -267,7 +268,7 @@ public class RecordHelper { notifyState(); stopMp3Encoded(); } else { - CallerLogger.INSTANCE.d("$M_DEVA$TAG", "暂停"); + CallerLogger.d("$M_DEVA$TAG", "暂停"); } } } @@ -282,7 +283,7 @@ public class RecordHelper { } }); } else { - CallerLogger.INSTANCE.e("$M_DEVA$TAG", "mp3EncodeThread is null, 代码业务流程有误，请检查！！ "); + CallerLogger.e("$M_DEVA$TAG", "mp3EncodeThread is null, 代码业务流程有误，请检查！！ "); } } @@ -301,7 +302,7 @@ public class RecordHelper { break; } notifyFinish(); - CallerLogger.INSTANCE.i("$M_DEVA$TAG", "录音完成！ path: %s ； 大小：%s", resultFile.getAbsoluteFile(), resultFile.length()); + CallerLogger.i("$M_DEVA$TAG", "录音完成！ path: %s ； 大小：%s", resultFile.getAbsoluteFile(), resultFile.length()); } /** @@ -353,7 +354,7 @@ public class RecordHelper { inputStream.close(); } } catch (Exception e) { - Log.e(TAG, e.getMessage()); + CallerLogger.e(M_DEVA + TAG, e.getMessage()); return false; } finally { try { @@ -376,7 +377,7 @@ public class RecordHelper { private String getFilePath(String fileName) { if (!FileUtils.createOrExistsDir(ROOT_PATH)) { - CallerLogger.INSTANCE.w("$M_DEVA$TAG", "文件夹创建失败：%s", ROOT_PATH); + CallerLogger.w("$M_DEVA$TAG", "文件夹创建失败：%s", ROOT_PATH); return null; } @@ -387,7 +388,7 @@ public class RecordHelper { private String getTempFilePath() { if (!FileUtils.createOrExistsDir(TEMP_PATH)) { - CallerLogger.INSTANCE.e("$M_DEVA$TAG", "文件夹创建失败：%s", TEMP_PATH); + CallerLogger.e("$M_DEVA$TAG", "文件夹创建失败：%s", TEMP_PATH); } String fileName = String.format(Locale.getDefault(), "tmp_%s", FileUtils.getNowString(new SimpleDateFormat("yyyyMMddHHmmssSSS", Locale.SIMPLIFIED_CHINESE))); return String.format(Locale.getDefault(), "%s%s.pcm", TEMP_PATH, fileName); diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/record/mp3/Mp3Utils.java b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/record/mp3/Mp3Utils.java index 5a8f84e0fd..ff851d67a9 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/record/mp3/Mp3Utils.java +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/record/mp3/Mp3Utils.java @@ -1,9 +1,11 @@ package com.zhjt.mogo_core_function_devatools.badcase.record.mp3; +import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_DEVA; + import android.media.MediaExtractor; import android.media.MediaFormat; -import android.util.Log; +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.FileUtils; import com.zhjt.mogo_core_function_devatools.badcase.record.RecordConfig; @@ -34,7 +36,7 @@ public class Mp3Utils { long duration = mf.getLong(MediaFormat.KEY_DURATION) / 1000L; return duration; } catch (IOException e) { - Log.e(TAG, e.getMessage()); + CallerLogger.e(M_DEVA +TAG, e.getMessage()); } finally { if (mex != null) { mex.release(); diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/BaseFloatDialog.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/BaseFloatDialog.java index 7435516b70..3e9a52ceb4 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/BaseFloatDialog.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/BaseFloatDialog.java @@ -53,14 +53,14 @@ public class BaseFloatDialog extends Dialog { @Override public void show() { - CallerLogger.INSTANCE.d(TAG, "onShow===="); + CallerLogger.d(TAG, "onShow===="); super.show(); setWindowSize(); } @Override public void dismiss() { - CallerLogger.INSTANCE.d( TAG, "onDismiss===="); + CallerLogger.d( TAG, "onDismiss===="); super.dismiss(); } private void setWindowSize(){ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/roundimage/RoundedDrawable.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/roundimage/RoundedDrawable.java index 5a7c95c0e5..2751aaac37 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/roundimage/RoundedDrawable.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/roundimage/RoundedDrawable.java @@ -142,7 +142,7 @@ public class RoundedDrawable extends Drawable { drawable.draw(canvas); } catch (Exception e) { e.printStackTrace(); - CallerLogger.INSTANCE.w(M_HMI + TAG, "Failed to create bitmap from drawable!"); + CallerLogger.w(M_HMI + TAG, "Failed to create bitmap from drawable!"); bitmap = null; } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/roundimage/RoundedImageView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/roundimage/RoundedImageView.java index ab4a3f0dd2..2e3e5bb38c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/roundimage/RoundedImageView.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/roundimage/RoundedImageView.java @@ -273,7 +273,7 @@ public class RoundedImageView extends AppCompatImageView { try { d = rsrc.getDrawable(mResource); } catch (Exception e) { - CallerLogger.INSTANCE.w(M_HMI + TAG, "Unable to find resource : " + mResource + " exception : " + e); + CallerLogger.w(M_HMI + TAG, "Unable to find resource : " + mResource + " exception : " + e); // Don't try again. mResource = 0; } @@ -311,7 +311,7 @@ public class RoundedImageView extends AppCompatImageView { try { d = rsrc.getDrawable(mBackgroundResource); } catch (Exception e) { - CallerLogger.INSTANCE.w(M_HMI + TAG, "Unable to find resource : " + mBackgroundResource + " exception : " + e); + CallerLogger.w(M_HMI + TAG, "Unable to find resource : " + mBackgroundResource + " exception : " + e); // Don't try again. mBackgroundResource = 0; } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java index 3e93aeb725..d051dd3928 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java @@ -53,7 +53,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); EventBus.getDefault().register(this); - CallerLogger.INSTANCE.i(M_HMI + TAG, "onCreate"); + CallerLogger.i(M_HMI + TAG, "onCreate"); } @Override @@ -99,7 +99,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis @Override protected void loadOthersModules() { super.loadOthersModules(); - CallerLogger.INSTANCE.d(M_MAIN + TAG, "loadOthersModules"); + CallerLogger.d(M_MAIN + TAG, "loadOthersModules"); loadOCHModule(); } @@ -156,7 +156,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis paramIndexes = {0} ) private void traceStartUp(String content) { - CallerLogger.INSTANCE.d(M_HMI + TAG, content); + CallerLogger.d(M_HMI + TAG, content); } @Override diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index 38a4ecf33f..8d24b5c6b2 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -66,7 +66,7 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { } private void initModules() { - CallerLogger.INSTANCE.d(M_MAIN + TAG, "initModules"); + CallerLogger.d(M_MAIN + TAG, "initModules"); // BIZ MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_FUNC_BIZ, "IMoGoNoticeProvider")); // 后置 车聊聊，IM @@ -76,7 +76,7 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { // 后置 地图数据收集模块 MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_MAP_DATA_COLLECT_PROVIDER, "MoGoMapDataCollector")); } - CallerLogger.INSTANCE.i(M_MAIN + TAG, "App launch timer cost " + (System.currentTimeMillis() - start) + "ms"); + CallerLogger.i(M_MAIN + TAG, "App launch timer cost " + (System.currentTimeMillis() - start) + "ms"); } @Override diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java index 8eb7f3d55d..8b2bc3e951 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java @@ -66,7 +66,7 @@ public class PassengerLauncherActivity extends MainActivity implements IMogoInte protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); EventBus.getDefault().register(this); - CallerLogger.INSTANCE.i(M_HMI + TAG, "onCreate"); + CallerLogger.i(M_HMI + TAG, "onCreate"); } @Override @@ -120,7 +120,7 @@ public class PassengerLauncherActivity extends MainActivity implements IMogoInte @Override protected void loadOthersModules() { super.loadOthersModules(); - CallerLogger.INSTANCE.d(M_HMI + TAG, "loadOthersModules"); + CallerLogger.d(M_HMI + TAG, "loadOthersModules"); loadOCHModule(); } @@ -151,7 +151,7 @@ public class PassengerLauncherActivity extends MainActivity implements IMogoInte paramIndexes = {0} ) private void traceStartUp(String content) { - CallerLogger.INSTANCE.d(M_HMI + TAG, content); + CallerLogger.d(M_HMI + TAG, content); } @Override diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/modules/MogoModulesManager.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/modules/MogoModulesManager.java index 73d2bcfae5..0f53108175 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/modules/MogoModulesManager.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/modules/MogoModulesManager.java @@ -83,7 +83,7 @@ public class MogoModulesManager implements MogoModulesHandler { final List modules = MogoModulePaths.getModuleFunctions(); if (modules != null && !modules.isEmpty()) { for (MogoModule module : modules) { - CallerLogger.INSTANCE.d(M_MAIN + TAG, "module.getPath():" + module.getPath() + " name: " + module.getName()); + CallerLogger.d(M_MAIN + TAG, "module.getPath():" + module.getPath() + " name: " + module.getName()); IMoGoFunctionProvider provider = loadFunction(module.getPath()); if (provider != null) { mModuleFunctionProviders.put(module, provider); @@ -98,7 +98,7 @@ public class MogoModulesManager implements MogoModulesHandler { final List modules = MogoModulePaths.getModuleFunctionServers(); if (modules != null && !modules.isEmpty()) { for (MogoModule module : modules) { - CallerLogger.INSTANCE.d(M_MAIN + TAG, "module.getPath():" + module.getPath() + " name: " + module.getName()); + CallerLogger.d(M_MAIN + TAG, "module.getPath():" + module.getPath() + " name: " + module.getName()); IMoGoFunctionServerProvider provider = loadFunctionServer(module.getPath()); if (provider != null) { mModuleFunctionServerProviders.put(module, provider); @@ -115,7 +115,7 @@ public class MogoModulesManager implements MogoModulesHandler { if (baseModule == null) { continue; } - CallerLogger.INSTANCE.d(M_MAIN + TAG, "加载基本模块 : " + baseModule.getPath()); + CallerLogger.d(M_MAIN + TAG, "加载基本模块 : " + baseModule.getPath()); loadBaseProvider(baseModule.getPath()); } } @@ -155,10 +155,10 @@ public class MogoModulesManager implements MogoModulesHandler { if (modules != null) { for (IMoGoFunctionProvider module : modules) { try { - CallerLogger.INSTANCE.d(M_HMI + TAG, "destroy module: " + module.getFunctionName()); + CallerLogger.d(M_HMI + TAG, "destroy module: " + module.getFunctionName()); module.onDestroy(); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_HMI + TAG, e + " onDestroy"); + CallerLogger.e(M_HMI + TAG, e + " onDestroy"); } } } @@ -172,10 +172,10 @@ public class MogoModulesManager implements MogoModulesHandler { if (modules != null) { for (IMoGoFunctionServerProvider module : modules) { try { - CallerLogger.INSTANCE.d(M_HMI + TAG, "destroy module: " + module.getFunctionName()); + CallerLogger.d(M_HMI + TAG, "destroy module: " + module.getFunctionName()); module.onDestroy(); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_HMI + TAG, e + " onDestroy"); + CallerLogger.e(M_HMI + TAG, e + " onDestroy"); } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/windowview/FloatingViewHandler.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/windowview/FloatingViewHandler.java index a1dad25a40..cfd43c9748 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/windowview/FloatingViewHandler.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/windowview/FloatingViewHandler.java @@ -62,7 +62,7 @@ public class FloatingViewHandler { } if (sFloatingLayout == null) { - CallerLogger.INSTANCE.e(M_HMI + TAG, "no floating frame. "); + CallerLogger.e(M_HMI + TAG, "no floating frame. "); return; } @@ -85,7 +85,7 @@ public class FloatingViewHandler { } if (sFloatingLayout == null) { - CallerLogger.INSTANCE.e(M_HMI + TAG, "no floating frame. "); + CallerLogger.e(M_HMI + TAG, "no floating frame. "); return; } sFloatingLayout.addView(view, params); @@ -106,18 +106,18 @@ public class FloatingViewHandler { } if (sFloatingLayout == null) { - CallerLogger.INSTANCE.e(M_HMI + TAG, "no floating frame. "); + CallerLogger.e(M_HMI + TAG, "no floating frame. "); return; } if (sView == view) { - CallerLogger.INSTANCE.w(M_HMI + TAG, "改布局已添加且没有移除，不操作"); + CallerLogger.w(M_HMI + TAG, "改布局已添加且没有移除，不操作"); return; } if (sView != null) { if (priority < sPriority) { - CallerLogger.INSTANCE.w(M_HMI + TAG, "过滤低优先级布局"); + CallerLogger.w(M_HMI + TAG, "过滤低优先级布局"); return; } sFloatingLayout.removeView(sView); @@ -144,18 +144,18 @@ public class FloatingViewHandler { } if (sFloatingLayout == null) { - CallerLogger.INSTANCE.e(M_HMI + TAG, "no floating frame. "); + CallerLogger.e(M_HMI + TAG, "no floating frame. "); return; } if (sView == view) { - CallerLogger.INSTANCE.w(M_HMI + TAG, "改布局已添加且没有移除，不操作"); + CallerLogger.w(M_HMI + TAG, "改布局已添加且没有移除，不操作"); return; } if (sView != null) { if (priority < sPriority) { - CallerLogger.INSTANCE.w(M_HMI + TAG, "过滤低优先级布局"); + CallerLogger.w(M_HMI + TAG, "过滤低优先级布局"); return; } sFloatingLayout.removeView(sView); diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt index 08b423cae0..be35a30e56 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt @@ -3,7 +3,6 @@ package com.mogo.eagle.core.function.view import android.content.Context import android.os.Bundle import android.util.AttributeSet -import android.util.Log import androidx.lifecycle.LifecycleObserver import chassis.Chassis import com.mogo.eagle.core.data.map.MogoLocation @@ -13,7 +12,6 @@ import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener import com.mogo.eagle.core.function.call.autopilot.CallerChassisLamplightListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager -import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager import com.mogo.map.MogoMapView diff --git a/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/HttpParamsEx.java b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/HttpParamsEx.java index 8cc29d18ce..4d9df600ca 100644 --- a/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/HttpParamsEx.java +++ b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/HttpParamsEx.java @@ -19,7 +19,7 @@ public class HttpParamsEx extends HttpParams { if (!TextUtils.isEmpty(key)) { if (value == null) { - CallerLogger.INSTANCE.e(M_NETWORK + TAG, key + " with illegal value"); + CallerLogger.e(M_NETWORK + TAG, key + " with illegal value"); } } return super.put(key, value); diff --git a/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/SubscribeImpl.java b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/SubscribeImpl.java index 694ce2bec2..6d1326a942 100644 --- a/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/SubscribeImpl.java +++ b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/SubscribeImpl.java @@ -35,7 +35,7 @@ public abstract class SubscribeImpl implements Observer { @Override public void onError(Throwable e) { onFinish(); - CallerLogger.INSTANCE.e(M_NETWORK + TAG, "occur when net request , exception : " + e); + CallerLogger.e(M_NETWORK + TAG, "occur when net request , exception : " + e); } @Override @@ -65,7 +65,7 @@ public abstract class SubscribeImpl implements Observer { } public void onError(String message, int code) { - CallerLogger.INSTANCE.e(M_NETWORK + TAG, "onError code : " + code + " , message : " + message); + CallerLogger.e(M_NETWORK + TAG, "onError code : " + code + " , message : " + message); } } diff --git a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/GestureTopCloseLayout.java b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/GestureTopCloseLayout.java index a705ab0fc5..987f313a8f 100644 --- a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/GestureTopCloseLayout.java +++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/GestureTopCloseLayout.java @@ -79,7 +79,7 @@ public class GestureTopCloseLayout extends ConstraintLayout { @Override public void onViewPositionChanged(@NonNull View changedView, int left, int top, int dx, int dy) { super.onViewPositionChanged(changedView, left, top, dx, dy); - CallerLogger.INSTANCE.i(TAG, "onViewPositionChanged==top=" + top + + CallerLogger.i(TAG, "onViewPositionChanged==top=" + top + " changedView.getHeight()==" + changedView.getHeight()); if (top < 0) { mTop = top; @@ -96,7 +96,7 @@ public class GestureTopCloseLayout extends ConstraintLayout { //手指释放的时候回调 @Override public void onViewReleased(View releasedChild, float xvel, float yvel) { - CallerLogger.INSTANCE.i(TAG, "onViewReleased==mTop=" + mTop + " getHeight=" + getHeight()); + CallerLogger.i(TAG, "onViewReleased==mTop=" + mTop + " getHeight=" + getHeight()); if (mTop < 0) { mViewDragHelper.settleCapturedViewAt(0, -getHeight()); invalidate(); diff --git a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/TextureVideoView.java b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/TextureVideoView.java index 6146af2b9b..5dd31a933a 100644 --- a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/TextureVideoView.java +++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/TextureVideoView.java @@ -218,7 +218,7 @@ public class TextureVideoView extends TextureView implements MediaPlayerControl mVideoHeight = mp.getVideoHeight(); int seekToPosition = mSeekWhenPrepared; -// CallerLogger.INSTANCE.i(TAG, "seekToPosition = " + seekToPosition); +// CallerLogger.i(TAG, "seekToPosition = " + seekToPosition); if (seekToPosition != 0) { seekTo(seekToPosition); } @@ -423,7 +423,7 @@ public class TextureVideoView extends TextureView implements MediaPlayerControl mTagetStateBackup = STATE_PLAYING; return; } - //CallerLogger.INSTANCE.i(TAG, "mCurrentState = " + mCurrentState); + //CallerLogger.i(TAG, "mCurrentState = " + mCurrentState); if (isInPlaybackState()) { mMediaPlayer.start(); mCurrentState = STATE_PLAYING; diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/CallerLogger.kt b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/CallerLogger.kt index fc76cc6b6b..117d5298ac 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/CallerLogger.kt +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/CallerLogger.kt @@ -4,24 +4,28 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.Scene.Companion.scene object CallerLogger { + @JvmStatic fun i(tag: String, message: Any? = null, vararg args: Any?) { if (scene.check(tag)) { Logger.i(tag, message.toString(), *args) } } + @JvmStatic fun d(tag: String, message: Any? = null, vararg args: Any?) { if (scene.check(tag)) { Logger.d(tag, message.toString(), *args) } } + @JvmStatic fun w(tag: String, message: Any? = null, vararg args: Any?) { if (scene.check(tag)) { Logger.w(tag, message.toString(), *args) } } + @JvmStatic fun e(tag: String, message: Any? = null, vararg args: Any?) { if (scene.check(tag)) { Logger.e(tag, message.toString(), *args) diff --git a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/locationinfo/MogoLocationInfoServices.java b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/locationinfo/MogoLocationInfoServices.java index 1a377a0b79..9d2f598560 100644 --- a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/locationinfo/MogoLocationInfoServices.java +++ b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/locationinfo/MogoLocationInfoServices.java @@ -45,16 +45,16 @@ public class MogoLocationInfoServices { public void start() { LocationManager.getInstance().start(); - CallerLogger.INSTANCE.d(TAG, "sdk - start"); + CallerLogger.d(TAG, "sdk - start"); } public void stop() { LocationManager.getInstance().stop(); - CallerLogger.INSTANCE.d(TAG, "sdk - stop"); + CallerLogger.d(TAG, "sdk - stop"); } public void init(Context context) { LocationManager.getInstance().init(context); - CallerLogger.INSTANCE.d(TAG, "sdk - init"); + CallerLogger.d(TAG, "sdk - init"); } } diff --git a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java index 50ef32ca9f..8951f10428 100644 --- a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java +++ b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java @@ -104,7 +104,7 @@ public class MogoAiCloudSocketManager extends ConnectionLifecycleListener implem @Override public void registerOnMessageListener(int msgType, IMogoOnMessageListener listener) { if (mListeners.containsKey(msgType)) { - CallerLogger.INSTANCE.w(TAG, "msgType is exist : " + msgType); + CallerLogger.w(TAG, "msgType is exist : " + msgType); return; } if (!mListeners.containsKey(msgType)) { @@ -154,7 +154,7 @@ public class MogoAiCloudSocketManager extends ConnectionLifecycleListener implem @Override public void sendMsg(MsgBody body, IMogoMsgAckListener listener) { - CallerLogger.INSTANCE.d(TAG, "sendMsg."); + CallerLogger.d(TAG, "sendMsg."); mAckListeners.put(body.getMsgId(), listener); MsgBody msgBody = new MsgBody(); msgBody.msgType(body.getMsgType()); @@ -194,15 +194,15 @@ public class MogoAiCloudSocketManager extends ConnectionLifecycleListener implem @Override public void onMsgReceived(int msgType, Object obj) { if (obj == null) { - CallerLogger.INSTANCE.e(TAG, "Failed to parse the received message!"); + CallerLogger.e(TAG, "Failed to parse the received message!"); return; } - CallerLogger.INSTANCE.d(TAG, "onMsgReceived obj className : " + obj.getClass().getName()); + CallerLogger.d(TAG, "onMsgReceived obj className : " + obj.getClass().getName()); List listeners = mListeners.get(msgType); if (listeners != null && !listeners.isEmpty()) { for (IMogoOnMessageListener listener : listeners) { if (listener != null) { -// CallerLogger.INSTANCE.d(TAG, "received msgId = " + mAckListeners.get(msgType) + " content = " + obj.toString()); +// CallerLogger.d(TAG, "received msgId = " + mAckListeners.get(msgType) + " content = " + obj.toString()); listener.onMsgReceived(obj); } } diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java index 5126c87f36..9d4d5fdb61 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java @@ -55,7 +55,7 @@ public abstract class AbsMogoApplication extends Application { private void initRxJavaErrorHandler() { RxJavaPlugins.setErrorHandler(throwable -> { - CallerLogger.INSTANCE.e("RxJava", "" + throwable); + CallerLogger.e("RxJava", "" + throwable); }); } diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/crash/FinalizeCrashFixer.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/crash/FinalizeCrashFixer.java index 63ea19249f..4363fd8ffe 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/crash/FinalizeCrashFixer.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/crash/FinalizeCrashFixer.java @@ -36,10 +36,10 @@ public class FinalizeCrashFixer { AppStateManager.INSTANCE.registerAppStateListener(isForeground -> { if (isForeground) { //前后台则重新反射关闭一遍，避免线程被再次开启 - CallerLogger.INSTANCE.d("FinalizeCrashFixer", "--- 切换到前台 ---"); + CallerLogger.d("FinalizeCrashFixer", "--- 切换到前台 ---"); } else { //前后台则重新反射关闭一遍，避免线程被再次开启 - CallerLogger.INSTANCE.d("FinalizeCrashFixer", "--- 切换到后台 ---"); + CallerLogger.d("FinalizeCrashFixer", "--- 切换到后台 ---"); } realFix(); }); diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java index 6cfd729f0b..302a01be68 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java @@ -83,7 +83,7 @@ public class ParamsUtil { public static RequestBody convert(Map map) { String json = GsonUtil.getGson().toJson(map); - CallerLogger.INSTANCE.d(TAG, "request params : " + json); + CallerLogger.d(TAG, "request params : " + json); return RequestBody.create(okhttp3.MediaType.parse("application/json; charset=utf-8"), json); } @@ -109,13 +109,13 @@ public class ParamsUtil { StringBuilder builder = new StringBuilder(); for (String key : keys) { if (TextUtils.isEmpty(key)) { - CallerLogger.INSTANCE.w(TAG, "key is illegal"); + CallerLogger.w(TAG, "key is illegal"); continue; } final Object value = params.get(key); if (value == null) { - CallerLogger.INSTANCE.w(TAG, key + " value is illegal"); + CallerLogger.w(TAG, key + " value is illegal"); continue; } String targetValue = value.toString(); diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java index 5b6a7b122a..4b793c227b 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java @@ -45,7 +45,7 @@ public class AIAssist { try { mTTS.release(); } catch (Exception e) { - CallerLogger.INSTANCE.e(TAG, "release has exception : " + e); + CallerLogger.e(TAG, "release has exception : " + e); } } sInstance = null; diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index a42d522e0e..3ecde6eca0 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java @@ -24,13 +24,11 @@ import android.graphics.Rect; import android.os.Bundle; import android.os.Looper; import android.text.TextUtils; -import android.util.Log; import android.view.MotionEvent; import android.view.View; import androidx.annotation.NonNull; -import com.mogo.commons.debug.DebugConfig; import com.mogo.eagle.core.data.config.HdMapBuildConfig; import com.mogo.eagle.core.data.enums.TrafficTypeEnum; import com.mogo.eagle.core.data.map.CenterLine; @@ -44,7 +42,6 @@ import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager; import com.mogo.eagle.core.function.call.map.CallerMapRomaListener; import com.mogo.eagle.core.function.call.map.CallerMapStyleListenerManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import com.mogo.eagle.core.utilcode.util.ThreadUtils; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.map.hdcache.IHdCacheListener; @@ -127,7 +124,7 @@ public class AMapViewWrapper implements IMogoMapView, private IHdCacheListener hdCacheListener; public AMapViewWrapper(MapAutoView mMapView) { - CallerLogger.INSTANCE.i(M_MAP + TAG, "autoop--AMapViewWrapper: init"); + CallerLogger.i(M_MAP + TAG, "autoop--AMapViewWrapper: init"); this.mMapView = mMapView; initViews(); initListeners(); @@ -137,7 +134,7 @@ public class AMapViewWrapper implements IMogoMapView, private void initViews() { // 初始化首次地图进入的时候的样式， MapAutoApi.INSTANCE.init(context, mapParams);将影响这里的数据 int mapStyle = MapAutoApi.INSTANCE.getMapParams().getStyleMode(); - CallerLogger.INSTANCE.d(M_MAP + TAG, "默认配置地图模式：mapStyle=" + mapStyle); + CallerLogger.d(M_MAP + TAG, "默认配置地图模式：mapStyle=" + mapStyle); switch (mapStyle) { case MapAutoApi.MAP_STYLE_DAY: mCurrentUI = EnumMapUI.MAP_STYLE_DAY; @@ -158,7 +155,7 @@ public class AMapViewWrapper implements IMogoMapView, mCurrentUI = EnumMapUI.MAP_STYLE_NIGHT_VR; break; default: - CallerLogger.INSTANCE.e(M_MAP + TAG, "暂不支持此地图模式，默认使用VR夜间模式"); + CallerLogger.e(M_MAP + TAG, "暂不支持此地图模式，默认使用VR夜间模式"); } } @@ -198,7 +195,7 @@ public class AMapViewWrapper implements IMogoMapView, mMapView.setOnMapViewVisualAngleChangeListener(this); mMapView.setOnRoadInfoListener(this, 1); MapAutoApi.INSTANCE.registerLogListener(this); - CallerLogger.INSTANCE.d(M_MAP + TAG, "styleop - initListeners - setOnMapStyleListener - view " + mMapView); + CallerLogger.d(M_MAP + TAG, "styleop - initListeners - setOnMapStyleListener - view " + mMapView); } /** @@ -210,10 +207,10 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void onRoadIdInfo(@androidx.annotation.Nullable String roadId, @androidx.annotation.Nullable String s1) { if (roadId != null && !TextUtils.isEmpty(roadId)) { - // CallerLogger.INSTANCE.d(M_MAP + TAG, "onRoadIdInfo::" + roadId); + // CallerLogger.d(M_MAP + TAG, "onRoadIdInfo::" + roadId); CallerMapRoadListenerManager.INSTANCE.invokeListenersOnRoadIdGet(roadId); } else { - //CallerLogger.INSTANCE.d(M_MAP + TAG, "onRoadIdInfo::null"); + //CallerLogger.d(M_MAP + TAG, "onRoadIdInfo::null"); } } @@ -228,18 +225,18 @@ public class AMapViewWrapper implements IMogoMapView, if (stopLine != null && stopLine.road_id != null && !stopLine.road_id.isEmpty() && stopLine.points != null && stopLine.points.size() > 0) { ArrayList points = stopLine.points; if (carLoc != null) { -// //CallerLogger.INSTANCE.d(M_MAP + TAG, "onStopLineInfo:stop_line" + stopLine + ", car_loc:{lon: " + carLoc.getLatitude() + ", lat: " + carLoc.getLongitude() + "}"); +// //CallerLogger.d(M_MAP + TAG, "onStopLineInfo:stop_line" + stopLine + ", car_loc:{lon: " + carLoc.getLatitude() + ", lat: " + carLoc.getLongitude() + "}"); MapRoadInfo.StopLine stopInfo = convert(stopLine); LonLatPoint p1 = points.get(0); LonLatPoint p2 = points.get(points.size() - 1); double distanceOfCarToStopLine = MapDataApi.INSTANCE.getNearstFromPointToSegment(carLoc.getLongitude(), carLoc.getLatitude(), p1.longitude, p1.latitude, p2.longitude, p2.latitude) * 10_0000; stopInfo.setDistanceOfCarToStopLine(distanceOfCarToStopLine); - //CallerLogger.INSTANCE.d(M_MAP + TAG, "onStopLineInfo: --- distance: " + distanceOfCarToStopLine); + //CallerLogger.d(M_MAP + TAG, "onStopLineInfo: --- distance: " + distanceOfCarToStopLine); CallerMapRoadListenerManager.INSTANCE.invokeListenersOnStopLineGet(stopInfo); } } else { if (carLoc != null) { - //CallerLogger.INSTANCE.d(M_MAP + TAG, "onStopLineInfo::null, car_loc:{lon: " + carLoc.getLatitude() + ", lat: " + carLoc.getLongitude() + "}"); + //CallerLogger.d(M_MAP + TAG, "onStopLineInfo::null, car_loc:{lon: " + carLoc.getLatitude() + ", lat: " + carLoc.getLongitude() + "}"); } } } @@ -287,7 +284,7 @@ public class AMapViewWrapper implements IMogoMapView, public void onCreate(Bundle bundle) { if (mMapView != null) { mMapView.onCreate(bundle); - CallerLogger.INSTANCE.d(M_MAP + TAG, "map onCreate"); + CallerLogger.d(M_MAP + TAG, "map onCreate"); } } @@ -295,7 +292,7 @@ public class AMapViewWrapper implements IMogoMapView, public void onResume() { if (mMapView != null) { mMapView.onResume(); - CallerLogger.INSTANCE.d(M_MAP + TAG, "map onResume"); + CallerLogger.d(M_MAP + TAG, "map onResume"); } } @@ -303,7 +300,7 @@ public class AMapViewWrapper implements IMogoMapView, public void onPause() { if (mMapView != null) { mMapView.onPause(); - CallerLogger.INSTANCE.d(M_MAP + TAG, "map onPause"); + CallerLogger.d(M_MAP + TAG, "map onPause"); } } @@ -317,7 +314,7 @@ public class AMapViewWrapper implements IMogoMapView, mMapView.setOnMapClickListener(null); mMapView.setOnCameraChangeListener(null); MapAutoApi.INSTANCE.unregisterLogListener(this); - CallerLogger.INSTANCE.d(M_MAP + TAG, "map onDestroy"); + CallerLogger.d(M_MAP + TAG, "map onDestroy"); } } @@ -326,7 +323,7 @@ public class AMapViewWrapper implements IMogoMapView, public void onSaveInstanceState(Bundle outState) { if (mMapView != null) { mMapView.onSaveInstanceState(outState); - CallerLogger.INSTANCE.d(M_MAP + TAG, "map onSaveInstanceState"); + CallerLogger.d(M_MAP + TAG, "map onSaveInstanceState"); } } @@ -340,7 +337,7 @@ public class AMapViewWrapper implements IMogoMapView, if (isVrMold()) { return MapControlResult.ERROR; } - CallerLogger.INSTANCE.d(M_MAP + TAG, "changeZoom : " + zoom); + CallerLogger.d(M_MAP + TAG, "changeZoom : " + zoom); getMap().changeZoom(zoom); return MapControlResult.SUCCESS; } @@ -350,7 +347,7 @@ public class AMapViewWrapper implements IMogoMapView, // if (isVrMold()) { // return; // } - CallerLogger.INSTANCE.d(M_MAP + TAG, "changeZoom2 : " + zoom); + CallerLogger.d(M_MAP + TAG, "changeZoom2 : " + zoom); getMap().changeZoom2(zoom); } @@ -366,7 +363,7 @@ public class AMapViewWrapper implements IMogoMapView, mVisualAngleMode = angelMode; if (angelMode == MODE_CLOSE_SIGHT) { if (mogoLatLng == null) { - CallerLogger.INSTANCE.e(M_MAP + TAG, "切换地图近景需要传入要移动的经纬度数据"); + CallerLogger.e(M_MAP + TAG, "切换地图近景需要传入要移动的经纬度数据"); return; } // 近景传入经纬度为点击地图上静态marker经纬度数据，为GPS坐标点。 @@ -417,7 +414,7 @@ public class AMapViewWrapper implements IMogoMapView, private boolean checkAMapView() { if (mMapView == null || mMapView.getMapAutoViewHelper() == null) { - CallerLogger.INSTANCE.e(M_MAP + TAG, "自研mapView实例为空，请检查"); + CallerLogger.e(M_MAP + TAG, "自研mapView实例为空，请检查"); return false; } return true; @@ -425,9 +422,9 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void moveToCenter(MogoLatLng latLng, boolean animate) { - CallerLogger.INSTANCE.d(M_MAP + TAG, "move to center " + latLng); + CallerLogger.d(M_MAP + TAG, "move to center " + latLng); if (latLng == null || latLng.lat == 0.0d || latLng.lon == 0.0d) { - CallerLogger.INSTANCE.e(M_MAP + TAG, "latLng = null or is illegal"); + CallerLogger.e(M_MAP + TAG, "latLng = null or is illegal"); return; } if (checkAMapView()) { @@ -437,7 +434,7 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void showMyLocation(boolean visible) { - CallerLogger.INSTANCE.d(M_MAP + TAG, "showMyLocation1 " + visible); + CallerLogger.d(M_MAP + TAG, "showMyLocation1 " + visible); // 如果是VR模式 if (isVrMold()) { return; @@ -458,7 +455,7 @@ public class AMapViewWrapper implements IMogoMapView, */ private boolean isVrMold() { boolean isVrMode = mCurrentUI == EnumMapUI.MAP_STYLE_NIGHT_VR || mCurrentUI == EnumMapUI.MAP_STYLE_DAY_VR; - CallerLogger.INSTANCE.d(M_MAP + TAG, "是否是VR模式: " + isVrMode); + CallerLogger.d(M_MAP + TAG, "是否是VR模式: " + isVrMode); return isVrMode; } @@ -540,7 +537,7 @@ public class AMapViewWrapper implements IMogoMapView, if (isVrMold()) { return; } - CallerLogger.INSTANCE.d(M_MAP + TAG, "setPointToCenter x : " + mapCenterX + " y : " + mapCenterY); + CallerLogger.d(M_MAP + TAG, "setPointToCenter x : " + mapCenterX + " y : " + mapCenterY); mMapView.getMapAutoViewHelper().setPointToCenter((float) mapCenterX, (float) mapCenterY); } } @@ -577,7 +574,7 @@ public class AMapViewWrapper implements IMogoMapView, if (checkAMapView()) { if (mMapView.getMapAutoViewHelper() != null) { mMapView.getMapAutoViewHelper().setRenderFps(fps); - CallerLogger.INSTANCE.d(M_MAP + TAG, "设置刷新帧率 fps = " + fps); + CallerLogger.d(M_MAP + TAG, "设置刷新帧率 fps = " + fps); } } } @@ -588,16 +585,16 @@ public class AMapViewWrapper implements IMogoMapView, return; } if (isVrMold()) { - CallerLogger.INSTANCE.w(M_MAP + TAG, "vr 模式下忽略该设置"); + CallerLogger.w(M_MAP + TAG, "vr 模式下忽略该设置"); return; } - CallerLogger.INSTANCE.i(M_MAP + TAG, "showBounds : " + M_MAP + TAG + " , " + carPosition.toString() + " , " + bound.toShortString() + " , " + lockCarPosition); + CallerLogger.i(M_MAP + TAG, "showBounds : " + M_MAP + TAG + " , " + carPosition.toString() + " , " + bound.toShortString() + " , " + lockCarPosition); try { LatLngBounds latLngBounds = MogoMapUtils.getLatLngBounds(carPosition, lonLats, lockCarPosition); mMapView.getMapAutoViewHelper().setCenter(ObjectUtils.fromMogo(carPosition)); mMapView.getMapAutoViewHelper().moveCamera(CameraUpdateFactory.INSTANCE.newLatLngBounds(latLngBounds, bound.left, bound.right, bound.top, bound.bottom)); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAP + TAG, "M_MAP+TAG : " + M_MAP + TAG + " error : " + e); + CallerLogger.e(M_MAP + TAG, "M_MAP+TAG : " + M_MAP + TAG + " error : " + e); } } @@ -730,7 +727,7 @@ public class AMapViewWrapper implements IMogoMapView, ) @Override public void onMapInit() { - CallerLogger.INSTANCE.i(M_MAP + TAG, "autoop--onMapInit: "); + CallerLogger.i(M_MAP + TAG, "autoop--onMapInit: "); MogoMapListenerHandler.Companion.getMogoMapListenerHandler().onMapLoaded(); } @@ -742,7 +739,7 @@ public class AMapViewWrapper implements IMogoMapView, ) @Override public void onMapLoaded() { - CallerLogger.INSTANCE.i(M_MAP + TAG, "autoop--onMapLoaded: "); + CallerLogger.i(M_MAP + TAG, "autoop--onMapLoaded: "); if (checkAMapView()) { CameraPosition cameraPosition = mMapView.getMapAutoViewHelper().getCameraPosition(); MogoMapListenerHandler.Companion.getMogoMapListenerHandler().onMapChanged(ObjectUtils.fromAMap(cameraPosition.getTarget()), @@ -781,7 +778,7 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void onMapViewVisualAngleChange(int i) { - CallerLogger.INSTANCE.d(M_MAP + TAG, " 地图自动更改视距 currentThread : " + Thread.currentThread().getName()); + CallerLogger.d(M_MAP + TAG, " 地图自动更改视距 currentThread : " + Thread.currentThread().getName()); mVisualAngleMode = getVisualAngleMode(i); MogoMapListenerHandler.Companion.getMogoMapListenerHandler().onMapVisualAngleChanged(mVisualAngleMode); } @@ -829,7 +826,7 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void onChangeMapStyle(int styleId) { - CallerLogger.INSTANCE.d(M_MAP + TAG, "currentMapStyle = " + styleId); + CallerLogger.d(M_MAP + TAG, "currentMapStyle = " + styleId); // 映射地图样式ID到鹰眼样式ID if (styleId == MapAutoApi.MAP_STYLE_DAY || styleId == MapAutoApi.MAP_STYLE_DAY_NAV) { @@ -849,7 +846,7 @@ public class AMapViewWrapper implements IMogoMapView, if (mCurrentUI != null) { UiThreadHandler.post(() -> { try { - CallerLogger.INSTANCE.d(M_MAP + TAG, "currentUI = " + mCurrentUI); + CallerLogger.d(M_MAP + TAG, "currentUI = " + mCurrentUI); MogoMapListenerHandler.Companion.getMogoMapListenerHandler().onMapModeChanged(mCurrentUI); CallerMapStyleListenerManager.INSTANCE.invokeMapStyleChange(styleId); } catch (Exception e) { @@ -870,7 +867,7 @@ public class AMapViewWrapper implements IMogoMapView, mMapView.getLocationClient().rtkEnable(mRtkEnable); } } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAP + TAG, "rtkEnable has exception : " + e); + CallerLogger.e(M_MAP + TAG, "rtkEnable has exception : " + e); } } @@ -925,7 +922,7 @@ public class AMapViewWrapper implements IMogoMapView, * 加载3D模型 */ private void loadPreVehicleModel() { - CallerLogger.INSTANCE.d(M_MAP + TAG, "添加感知模型到地图中……"); + CallerLogger.d(M_MAP + TAG, "添加感知模型到地图中……"); ThreadUtils.getIoPool().submit(() -> { addPreVehicleModelWeiZhi(TrafficTypeEnum.TYPE_TRAFFIC_ID_WEI_ZHI, "添加感知模型到地图中……preVehicleStrWeiZhi="); @@ -964,11 +961,11 @@ public class AMapViewWrapper implements IMogoMapView, .addPreVehicleModel(typeTrafficId.getType(), typeTrafficId.getTraffic3DNightIconId()); } - CallerLogger.INSTANCE.d(M_MAP + TAG, logMsg + preVehicleStrWeiZhi); + CallerLogger.d(M_MAP + TAG, logMsg + preVehicleStrWeiZhi); if (preVehicleStrWeiZhi == null) { UiThreadHandler.postDelayed(() -> { - CallerLogger.INSTANCE.w(M_MAP + TAG, "添加感知模型到地图中失败，尝试重复添加……"); + CallerLogger.w(M_MAP + TAG, "添加感知模型到地图中失败，尝试重复添加……"); addPreVehicleModelWeiZhi(typeTrafficId, logMsg); }, 1000L); } @@ -977,7 +974,6 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void setLockMode(boolean isLock) { if (checkAMapView()) { - Log.d("TTTTT", "setLockMode:" +isLock); mMapView.getMapAutoViewHelper().setLockMode(isLock); } } @@ -1044,7 +1040,7 @@ public class AMapViewWrapper implements IMogoMapView, public void cacheHDDataByCity(IHdCacheListener listener) { if (mMapView.getMapAutoViewHelper() != null) { String gdCityCode = GDLocationClient.getInstance(getContext()).getLastCityCode(); - CallerLogger.INSTANCE.i(M_MAP + TAG, "gdCityCode is:" + gdCityCode); + CallerLogger.i(M_MAP + TAG, "gdCityCode is:" + gdCityCode); Integer id = HDMapUtils.getHDCityCode(gdCityCode); if (id != null) { hdCacheListener = listener; @@ -1087,7 +1083,7 @@ public class AMapViewWrapper implements IMogoMapView, public void cacheHDDataByCity(IHdCacheListener listener, MogoLocation location) { if (mMapView.getMapAutoViewHelper() != null) { hdCacheListener = listener; - CallerLogger.INSTANCE.i(M_MAP + TAG, "location lon is:" + location.getLongitude() + ",lat is:" + location.getLatitude()); + CallerLogger.i(M_MAP + TAG, "location lon is:" + location.getLongitude() + ",lat is:" + location.getLatitude()); mMapView.getMapAutoViewHelper().cacheHDDataByCityByLonLat(location.getLongitude(), location.getLatitude(), new OnHdDataDownByCityListener() { @Override public void onMapHDDataCacheProgressByCity(int cityId, double progress) { @@ -1126,7 +1122,7 @@ public class AMapViewWrapper implements IMogoMapView, public boolean isCityDataCached() { if (mMapView.getMapAutoViewHelper() != null) { String gdCityCode = GDLocationClient.getInstance(getContext()).getLastCityCode(); - CallerLogger.INSTANCE.i(M_MAP + TAG, "gdCityCode is:" + gdCityCode); + CallerLogger.i(M_MAP + TAG, "gdCityCode is:" + gdCityCode); Integer id = HDMapUtils.getHDCityCode(gdCityCode); if (id != null) { List cityInfoList = mMapView.getMapAutoViewHelper().getAllCityCode(); diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java index ff37c1c16e..da45eca7d8 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java @@ -52,7 +52,7 @@ public class AMapWrapper implements IMogoMap { private IMogoUiSettings mUiSettings; public AMapWrapper(MapAutoViewHelper map, MapAutoView mapView, IMogoMapUIController controller) { - CallerLogger.INSTANCE.i(TAG, "autoop--AMapWrapper: init" + this); + CallerLogger.i(TAG, "autoop--AMapWrapper: init" + this); this.mAMap = map; sAMap = map; this.mMapView = mapView; @@ -89,7 +89,7 @@ public class AMapWrapper implements IMogoMap { } MarkerOptions markerOptions = ObjectUtils.fromMogo(options); if (markerOptions == null) { - CallerLogger.INSTANCE.e(TAG, "marker参数为空"); + CallerLogger.e(TAG, "marker参数为空"); return null; } Marker delegate = mAMap.addMarker(markerOptions); @@ -106,7 +106,7 @@ public class AMapWrapper implements IMogoMap { } PolylineOptions polylineOptions = ObjectUtils.fromMogo(options); if (polylineOptions == null) { - CallerLogger.INSTANCE.e(TAG, "polyline参数为空"); + CallerLogger.e(TAG, "polyline参数为空"); return null; } Polyline delegate = polylineOptions.lineWidth > 0 ? mAMap.drawThickLine(polylineOptions) : mAMap.drawLine(polylineOptions); @@ -230,7 +230,7 @@ public class AMapWrapper implements IMogoMap { @Override public void changeZoom(float zoom) { - CallerLogger.INSTANCE.d(TAG, "changeZoom %s", zoom); + CallerLogger.d(TAG, "changeZoom %s", zoom); if (checkAMap()) { mAMap.setZoom((int) zoom); } @@ -238,7 +238,7 @@ public class AMapWrapper implements IMogoMap { @Override public void changeZoom2(float zoom) { - CallerLogger.INSTANCE.d(TAG, "changeZoom %s", zoom); + CallerLogger.d(TAG, "changeZoom %s", zoom); if (checkAMap()) { mAMap.setZoomVal(zoom); } @@ -260,7 +260,7 @@ public class AMapWrapper implements IMogoMap { mAMap = mMapView.getMapAutoViewHelper(); sAMap = mAMap; if (mAMap == null) { - CallerLogger.INSTANCE.e(TAG, "自研map实例为空，请检查"); + CallerLogger.e(TAG, "自研map实例为空，请检查"); return false; } return true; diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java index d2e239d2b1..7f68078bf7 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java @@ -88,7 +88,7 @@ public class MogoMapUIController implements IMogoMapUIController { public void changeMapVisualAngle(VisualAngleMode angelMode, MogoLatLng mogoLatLng) { initDelegate(); if (mDelegate != null) { - CallerLogger.INSTANCE.d(TAG, "set VisualAngle: " + angelMode.name()); + CallerLogger.d(TAG, "set VisualAngle: " + angelMode.name()); mDelegate.changeMapVisualAngle(angelMode, mogoLatLng); } } @@ -105,7 +105,7 @@ public class MogoMapUIController implements IMogoMapUIController { public void setRomaMode(int mode) { initDelegate(); if (mDelegate != null) { - CallerLogger.INSTANCE.d(TAG, "set setRomaMode: " + mode); + CallerLogger.d(TAG, "set setRomaMode: " + mode); mDelegate.setRomaMode(mode); } } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapView.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapView.java index 62f04538f1..ae00328745 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapView.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapView.java @@ -49,7 +49,7 @@ public class MogoMapView extends MogoBaseMapView implements ILifeCycle { if (mapView != null) { addView(mapView, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); } else { - CallerLogger.INSTANCE.e(TAG, "create MapView instance failed."); + CallerLogger.e(TAG, "create MapView instance failed."); } } } @@ -57,25 +57,25 @@ public class MogoMapView extends MogoBaseMapView implements ILifeCycle { @Override public void onCreate(Bundle bundle) { super.onCreate(bundle); - CallerLogger.INSTANCE.d(TAG, "onCreate"); + CallerLogger.d(TAG, "onCreate"); } @Override public void onResume() { super.onResume(); - CallerLogger.INSTANCE.d(TAG, "onResume"); + CallerLogger.d(TAG, "onResume"); } @Override public void onPause() { super.onPause(); - CallerLogger.INSTANCE.d(TAG, "onPause"); + CallerLogger.d(TAG, "onPause"); } @Override public void onDestroy() { super.onDestroy(); - CallerLogger.INSTANCE.d(TAG, "onDestroy"); + CallerLogger.d(TAG, "onDestroy"); } @Override diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/utils/PointInterpolatorUtil.java b/libraries/mogo-map/src/main/java/com/mogo/map/utils/PointInterpolatorUtil.java index a985d9b90c..f8469574fe 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/utils/PointInterpolatorUtil.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/utils/PointInterpolatorUtil.java @@ -39,13 +39,13 @@ public class PointInterpolatorUtil { MogoLatLng current = points.get(i); MogoLatLng next = points.get(i + 1); float distance = CoordinateUtils.calculateLineDistance(current.lon, current.lat, next.lon, next.lat); - CallerLogger.INSTANCE.d(TAG, i + ": " + distance); + CallerLogger.d(TAG, i + ": " + distance); if (distance > DISTANCE_THRESHOLD) { int inter = (int) (distance / DISTANCE_THRESHOLD) + 1; for (int j = 1; j < inter; j++) { double newLat = current.lat + (next.lat - current.lat) * j / inter; double newLon = current.lon + (next.lon - current.lon) * j / inter; - CallerLogger.INSTANCE.d(TAG, "distance: " + distance + ", j: " + j + ", nextLat: " + next.lat + ", nextLon: " + next.lon + ", newLat: " + newLat + ", newLon: " + newLon); + CallerLogger.d(TAG, "distance: " + distance + ", j: " + j + ", nextLat: " + next.lat + ", nextLon: " + next.lon + ", newLat: " + newLat + ", newLon: " + newLon); points.add(i + 1, new MogoLatLng(newLat, newLon)); current = points.get(++i); } diff --git a/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java b/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java index 266a399abf..b0c6964cfa 100644 --- a/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java +++ b/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java @@ -206,7 +206,7 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider { //************************************* CMDB绑定的信息 *********************************************** if (mInfo != null) { - CallerLogger.INSTANCE.d(TAG, "nuber = " + mInfo.getNumber_plate() + "--brand = " + mInfo.getBrand() + "--modle = " + mInfo.getModel()); + CallerLogger.d(TAG, "nuber = " + mInfo.getNumber_plate() + "--brand = " + mInfo.getBrand() + "--modle = " + mInfo.getModel()); map.put("CMDB_PLATE_NUMBER", mInfo.getNumber_plate()); map.put("CMDB_BRAND", mInfo.getBrand()); map.put("CMDB_MODEL", mInfo.getModel()); diff --git a/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java b/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java index c96d698363..4c3e8705cf 100644 --- a/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java +++ b/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java @@ -71,7 +71,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList private LinkedList> linkedList = new LinkedList<>(); public void release() { - CallerLogger.INSTANCE.d(TAG, "release"); + CallerLogger.d(TAG, "release"); ThreadUtils.runOnUiThread(() -> { if (mCmdMap != null && !mCmdMap.isEmpty() && mVoiceClient != null) { for (String cmd : mCmdMap.keySet()) { @@ -143,7 +143,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList private void initTtsConfig(String sn) { try { - CallerLogger.INSTANCE.d(TAG, "initTtsConfig"); + CallerLogger.d(TAG, "initTtsConfig"); //在线授权配置 AuthConfig.Builder onlineBuilder = new AuthConfig.Builder() .setType(AuthType.ONLINE) @@ -183,7 +183,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList .create(), new DUILiteSDK.InitListener() { @Override public void success() { - CallerLogger.INSTANCE.d(TAG, "授权成功"); + CallerLogger.d(TAG, "授权成功"); isAuthing = false; ThreadUtils.runOnUiThread(() -> { mHasAuth = true; @@ -193,7 +193,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList @Override public void error(String errorCode, final String errorInfo) { - CallerLogger.INSTANCE.e(TAG, "error code : " + errorCode + " , error info :" + errorInfo); + CallerLogger.e(TAG, "error code : " + errorCode + " , error info :" + errorInfo); isAuthing = false; if (retryCount++ < 3) { initDUILiteSDK(onlineBuilder, echoConfig); @@ -203,15 +203,15 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList }); // boolean isAuthorized = DUILiteSDK.isAuthorized(mContext);//查询授权状态，DUILiteSDK.init之后随时可以调 -// CallerLogger.INSTANCE.d(TAG, "DUILite SDK is isAuthorized ？ " + isAuthorized); +// CallerLogger.d(TAG, "DUILite SDK is isAuthorized ？ " + isAuthorized); // // String core_version = DUILiteSDK.getCoreVersion();//获取内核版本号 -// CallerLogger.INSTANCE.d(TAG, "core version is: " + core_version); +// CallerLogger.d(TAG, "core version is: " + core_version); } private void initTtsEngine() { if (isInitEngine) return; - CallerLogger.INSTANCE.d(TAG, "initTtsEngine"); + CallerLogger.d(TAG, "initTtsEngine"); // AILocalTTSConfig config = new AILocalTTSConfig(); // // 设置assets目录下合成字典名 // config.setDictResource(TTS_DICT_RES);//普通话字典 @@ -260,7 +260,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList * 初始化 */ private void initSpeech(Context context) { - CallerLogger.INSTANCE.d(TAG, "initSpeech"); + CallerLogger.d(TAG, "initSpeech"); mogoVoiceManager = MogoVoiceManagerImpl.getInstance(); mogoVoiceManager.init(context, new OnConnStatusListener() { @Override @@ -290,7 +290,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList if (!mCmdMap.containsKey(cmd)) { return; } - CallerLogger.INSTANCE.d(TAG, "received command : " + cmd); + CallerLogger.d(TAG, "received command : " + cmd); Iterator iterator = null; try { @@ -403,7 +403,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList * @param text */ public void speakTTSVoice(String text) { - CallerLogger.INSTANCE.d(TAG, "speakTTSVoice"); + CallerLogger.d(TAG, "speakTTSVoice"); if (mEngine != null && mHasAuth) { // 合成并播放 mEngine.speak(text, text, mAILocalTTSIntent); @@ -416,14 +416,14 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList if (ttsLevel == curTtsLevel) { // 对应p3、p2级别的排队 if (ttsLevel == 0 || ttsLevel == 1) { - CallerLogger.INSTANCE.d(TAG, "==================="); - CallerLogger.INSTANCE.d(TAG, "插入消息：" + text + ",level为：" + ttsLevel); + CallerLogger.d(TAG, "==================="); + CallerLogger.d(TAG, "插入消息：" + text + ",level为：" + ttsLevel); insertTts(text, ttsLevel); return; } else { // 打断并合成新的 stopTts(); - CallerLogger.INSTANCE.d(TAG, "非Level1同级别打断!"); + CallerLogger.d(TAG, "非Level1同级别打断!"); } } else { // 将要TTS的比现在正在TTS的优先级高 @@ -432,11 +432,11 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList // 打断并合成高优先级的 stopTts(); } - CallerLogger.INSTANCE.d(TAG, "高优先级打断低级别的!"); + CallerLogger.d(TAG, "高优先级打断低级别的!"); } else { if (ttsLevel == 0 || ttsLevel == 1) { - CallerLogger.INSTANCE.d(TAG, "==================="); - CallerLogger.INSTANCE.d(TAG, "插入消息：" + text + ",level为：" + ttsLevel); + CallerLogger.d(TAG, "==================="); + CallerLogger.d(TAG, "插入消息：" + text + ",level为：" + ttsLevel); insertTts(text, ttsLevel); } return; @@ -445,7 +445,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList curTtsLevel = ttsLevel; curTtsContent = text; // 合成并播放 - CallerLogger.INSTANCE.d(TAG, "tts准备合成：" + text + ",curTtsLevel为：" + curTtsLevel); + CallerLogger.d(TAG, "tts准备合成：" + text + ",curTtsLevel为：" + curTtsLevel); mEngine.speak(text, text, mAILocalTTSIntent); } } @@ -477,9 +477,9 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList } for (Pair ttsPair: linkedList) { - CallerLogger.INSTANCE.d(TAG, "tts文本为：" + ttsPair.first + ",level为：" + ttsPair.second); + CallerLogger.d(TAG, "tts文本为：" + ttsPair.first + ",level为：" + ttsPair.second); } - CallerLogger.INSTANCE.d(TAG, "==================="); + CallerLogger.d(TAG, "==================="); } /** @@ -579,7 +579,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList mVoiceClient.registerCustomWakeupCmd(cmd, cmdWords); mCacheUnWakeupCommands.remove(cmd); } - CallerLogger.INSTANCE.i(TAG, "cache un wakeup command2. " + cmd); + CallerLogger.i(TAG, "cache un wakeup command2. " + cmd); mCacheUnWakeupCommands.put(cmd, cmdWords); } @@ -595,7 +595,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList mVoiceClient.registerCustomWakeupCmd(cmd, cmdWords); mCacheUnWakeupCommands.remove(cmd); } - CallerLogger.INSTANCE.i(TAG, "cache un wakeup command. " + cmd); + CallerLogger.i(TAG, "cache un wakeup command. " + cmd); mCacheUnWakeupCommands.put(cmd, cmdWords); } @@ -647,14 +647,14 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList * @param status window_start_cancel 0 - 结束， 1 - 显示， 2 - 未激活调试进入 */ public static void startAssistant(Context context, int status) { - CallerLogger.INSTANCE.w(TAG, "startAssistant status = " + status); + CallerLogger.w(TAG, "startAssistant status = " + status); final Intent intent = new Intent(); intent.setFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); intent.setAction("pvetec.intent.action.txz.switch"); intent.putExtra("window_start_cancel", status); intent.putExtra("extra_switch_type", "window_start_cancel"); - CallerLogger.INSTANCE.d(TAG, "status = " + status); + CallerLogger.d(TAG, "status = " + status); context.sendBroadcast(intent); } @@ -663,7 +663,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList return; } mHasFlush = true; - CallerLogger.INSTANCE.d(TAG, "flush cache voice command when voice service ready."); + CallerLogger.d(TAG, "flush cache voice command when voice service ready."); final Map tmp = new HashMap<>(mCacheUnWakeupCommands); for (String cmd : tmp.keySet()) { registerUnWakeupCommand(cmd, tmp.get(cmd)); @@ -672,11 +672,11 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList private boolean isVoiceServiceReady(Context context) { if (isProcessRunning(context, getPackageUid(context, "com.zhidao.speech"))) { - CallerLogger.INSTANCE.d(TAG, "pad txz is voiceServiceReady"); + CallerLogger.d(TAG, "pad txz is voiceServiceReady"); return true; } else if (isProcessRunning(context, getPackageUid(context, "com.txznet.txz")) && isProcessRunning(context, getPackageUid(context, "com.txznet.adapter"))) { - CallerLogger.INSTANCE.d(TAG, "txz is voiceServiceReady"); + CallerLogger.d(TAG, "txz is voiceServiceReady"); return true; } return true; @@ -762,7 +762,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList } else { initSpeech(context); } - CallerLogger.INSTANCE.w(TAG, "voice is mHasFlush = " + mHasFlush + " mInitReady= " + mInitReady); + CallerLogger.w(TAG, "voice is mHasFlush = " + mHasFlush + " mInitReady= " + mInitReady); } } @@ -773,13 +773,13 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList @Override public void startAIAssist(Context context, int status) { - CallerLogger.INSTANCE.w(TAG, "startAIAssist status = " + status); + CallerLogger.w(TAG, "startAIAssist status = " + status); final Intent intent = new Intent(); intent.setFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); intent.setAction("pvetec.intent.action.txz.switch"); intent.putExtra("window_start_cancel", status); intent.putExtra("extra_switch_type", "window_start_cancel"); - CallerLogger.INSTANCE.d(TAG, "status = " + status); + CallerLogger.d(TAG, "status = " + status); context.sendBroadcast(intent); } @@ -787,17 +787,17 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList @Override public void onInit(int status) { - CallerLogger.INSTANCE.d(TAG, "初始化完成，返回值：" + status); + CallerLogger.d(TAG, "初始化完成，返回值：" + status); if (status == AIConstant.OPT_SUCCESS) { - CallerLogger.INSTANCE.d(TAG, "初始化成功!"); + CallerLogger.d(TAG, "初始化成功!"); } else { - CallerLogger.INSTANCE.d(TAG, "初始化失败!code:" + status); + CallerLogger.d(TAG, "初始化失败!code:" + status); } } @Override public void onError(String utteranceId, AIError aiError) { - CallerLogger.INSTANCE.d(TAG, "检测到错误:" + aiError.toString()); + CallerLogger.d(TAG, "检测到错误:" + aiError.toString()); curTtsLevel = -1; curTtsContent = ""; IMogoTTSCallback callBack = PadTTS.this.mSpeakVoiceMap.remove(utteranceId); @@ -808,14 +808,14 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList @Override public void onReady(String s) { - CallerLogger.INSTANCE.d(TAG, "开始播放"); + CallerLogger.d(TAG, "开始播放"); } @Override public void onCompletion(String utteranceId) { curTtsLevel = -1; curTtsContent = ""; - CallerLogger.INSTANCE.d(TAG, "播放完成"); + CallerLogger.d(TAG, "播放完成"); ttsNext(); IMogoTTSCallback callBack = PadTTS.this.mSpeakVoiceMap.remove(utteranceId); if (callBack != null) { @@ -825,12 +825,12 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList @Override public void onProgress(int currentTime, int totalTime, boolean isRefTextTTSFinished) { - //CallerLogger.INSTANCE.d(TAG, "当前:" + currentTime + "ms, 总计:" + totalTime + "ms, 可信度:" + isRefTextTTSFinished); + //CallerLogger.d(TAG, "当前:" + currentTime + "ms, 总计:" + totalTime + "ms, 可信度:" + isRefTextTTSFinished); } @Override public void onSynthesizeStart(String utteranceId) { - CallerLogger.INSTANCE.d(TAG, "合成开始"); + CallerLogger.d(TAG, "合成开始"); } @Override @@ -841,7 +841,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList @Override public void onSynthesizeFinish(String utteranceId) { - CallerLogger.INSTANCE.d(TAG, "合成结束"); + CallerLogger.d(TAG, "合成结束"); } } @@ -849,11 +849,11 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList private void ttsNext() { if (!linkedList.isEmpty()) { Pair ttsPair = linkedList.removeFirst(); - CallerLogger.INSTANCE.i(TAG, "排队播放的下一条文本为：" + ttsPair.first + ",级别为：" + ttsPair.second); + CallerLogger.i(TAG, "排队播放的下一条文本为：" + ttsPair.first + ",级别为：" + ttsPair.second); curTtsLevel = ttsPair.second; speakTTSVoice(ttsPair.first); } else { - CallerLogger.INSTANCE.i(TAG, "队列为空"); + CallerLogger.i(TAG, "队列为空"); } } From 745bce7a29a7a98c2ca07290f66e4b030323a570 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 24 Aug 2023 11:42:14 +0800 Subject: [PATCH 08/11] =?UTF-8?q?[6.0.0]=20=E9=87=8D=E6=9E=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=90=8E=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java | 5 +---- .../com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java index a86a8f2edd..0d595b0099 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java @@ -6,7 +6,6 @@ import android.app.AlertDialog; import android.content.Context; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; -import android.os.Build; import android.os.Bundle; import android.text.TextUtils; import android.view.Display; @@ -21,8 +20,6 @@ import android.widget.BaseAdapter; import android.widget.GridView; import android.widget.TextView; -import androidx.annotation.RequiresApi; - import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.och.taxi.constant.TaxiOrderStatusEnum; @@ -149,7 +146,7 @@ public class TaxiOrderCancelDialog extends AlertDialog implements View.OnClickLi mContentAdapter.notifyCurrentReasons(mCurrentReason); } - interface CommitReasonListener{ + public interface CommitReasonListener{ void cancelCurOrder(int type); } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt index ae99c9c22a..3e79670915 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt @@ -654,8 +654,8 @@ class TaxiCurrentTaskFragment : BaseFragment(), activity?.also { TaxiOrderCancelDialog( it, mCurrentTaskWithOrder!!.order!!.orderStatus - ) { - mViewModel.sendUiIntent(UnmannedIntent.CancelOrder(it)) + ) {type -> + mViewModel.sendUiIntent(UnmannedIntent.CancelOrder(type)) }.show() } } From 61c49bace70f567dd1aa88e0f27e0f44858b31dc Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 24 Aug 2023 14:17:30 +0800 Subject: [PATCH 09/11] [6.0.0] open deva_module log --- .../binding/BindingCarManager.kt | 19 +++++++++---------- .../mofang/MoGoMoFangProviderImpl.kt | 14 ++++++++------ .../scene/SceneManager.kt | 2 +- .../core/utilcode/mogo/logger/scene/Scene.kt | 2 +- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt index 32368ffc0d..7cffd54f88 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt @@ -3,7 +3,6 @@ package com.zhjt.mogo_core_function_devatools.binding import android.annotation.* import android.content.Context import android.text.TextUtils -import android.util.* import com.elegant.utils.UiThreadHandler import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.constants.SharedPrefsConstants @@ -18,7 +17,7 @@ import com.mogo.eagle.core.function.call.obu.CallerObuApiManager import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils.isDriver import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils.isPassenger import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr import com.zhjt.mogo_core_function_devatools.upgrade.IPCUpgradeManager.Companion.ipcUpgradeManager import com.zhjt.mogo_core_function_devatools.upgrade.ObuUpgradeAppNetWorkManager @@ -61,9 +60,9 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener { } override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) { - CallerLogger.d("${SceneConstant.M_DEVA}${TAG}", "onAutopilotCarConfig ----------> ") + CallerLogger.d("${M_DEVA}${TAG}", "onAutopilotCarConfig ----------> ") if (!TextUtils.isEmpty(carConfigResp.macAddress)) { - CallerLogger.d("${SceneConstant.M_DEVA}${TAG}", + CallerLogger.d("${M_DEVA}${TAG}", "onAutopilotCarConfig carConfigResp.macAddress = ${carConfigResp.macAddress} ") getBindingCarInfo(carConfigResp.macAddress, MoGoAiCloudClientConfig.getInstance().sn) } @@ -89,7 +88,7 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener { queryObuUpgrade(obuVersion) } } - CallerLogger.d("${SceneConstant.M_DEVA}${TAG}", + CallerLogger.d("${M_DEVA}${TAG}", "getBindingcarInfo macAddress = $macAddress--widevineIDWithMd5 = $widevineIDWithMd5 ---screenType = $screenType" ) SharedPrefsMgr.getInstance(mContext!!).putString(SharedPrefsConstants.APP_MAC, macAddress) @@ -179,10 +178,10 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener { * 查询app是否需要升级 */ fun queryAppUpgrade() { - Log.d("UPGRADE", "---- 1 ----") + CallerLogger.d(M_DEVA+"UPGRADE", "---- 1 ----") var macAddress = mAddress if (TextUtils.isEmpty(macAddress)) { - Log.d("UPGRADE", "---- 2 ----") + CallerLogger.d(M_DEVA+"UPGRADE", "---- 2 ----") macAddress = SharedPrefsMgr.getInstance(mContext!!) .getString(SharedPrefsConstants.APP_MAC) } @@ -190,7 +189,7 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener { if (!TextUtils.equals(macAddress, mAddress)) { mAddress = macAddress } - Log.d("UPGRADE", "---- 3 ----[mac: $macAddress]") + CallerLogger.d(M_DEVA+"UPGRADE", "---- 3 ----[mac: $macAddress]") UpgradeAppNetWorkManager.instance ?.getAppUpgradeInfo(mContext, macAddress, role.toString() + "") } @@ -202,9 +201,9 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener { */ fun queryObuUpgrade(obuVersionName: String) { mObuVersion = obuVersionName - CallerLogger.d("${SceneConstant.M_DEVA}${MogoObuConst.TAG_UPGRADE_OBU}", "screenType = $screenType ----role = $role") + CallerLogger.d("${M_DEVA}${MogoObuConst.TAG_UPGRADE_OBU}", "screenType = $screenType ----role = $role") if (screenType == 1) { - CallerLogger.d("${SceneConstant.M_DEVA}${MogoObuConst.TAG_UPGRADE_OBU}","queryObuUpgrade isConnected = ${CallerObuApiManager.isConnected()} --- mAddress = $mAddress") + CallerLogger.d("${M_DEVA}${MogoObuConst.TAG_UPGRADE_OBU}","queryObuUpgrade isConnected = ${CallerObuApiManager.isConnected()} --- mAddress = $mAddress") ObuUpgradeAppNetWorkManager.instance?.getObuUpgradeInfo(if(!mAddress.isNullOrEmpty()) mAddress else SharedPrefsMgr.getInstance(mContext!!).getString(SharedPrefsConstants.APP_MAC), obuVersionName) } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt index fea3bc7849..309972293c 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt @@ -19,6 +19,8 @@ import com.mogo.core.mofang.connect.listener.* import com.mogo.eagle.core.function.api.devatools.mofang.* import com.mogo.eagle.core.function.api.devatools.mofang.IMoGoMoFangProvider.OnMoFangStatusListener import com.mogo.eagle.core.utilcode.floating.* +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA import com.mogo.eagle.core.utilcode.util.* import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_BATTERY import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_BATTERY_VALUE @@ -266,7 +268,7 @@ internal class MoGoMoFangProviderImpl: IMoGoMoFangProvider, OnMoFangDeviceListen override fun onBluetoothKeyboardEvent(event: KeyEvent) { } override fun onBluetoothKeyboardInputInvalid() { - Log.d(TAG, "--- onBluetoothKeyboardInputInvalid ---") + CallerLogger.d(M_DEVA+TAG, "--- onBluetoothKeyboardInputInvalid ---") MoFangAnalyticUtils.track(EVENT_MOFANG_CONNECT, mutableMapOf(EVENT_SUB_IS_INVALID to "${System.currentTimeMillis()}")) linkedLog.record(mapOf("callback" to "onBluetoothKeyboardInputInvalid")) UiThreadHandler.post { @@ -277,25 +279,25 @@ internal class MoGoMoFangProviderImpl: IMoGoMoFangProvider, OnMoFangDeviceListen } override fun onBluetoothKeyboardInputValid() { - Log.d(TAG, "--- onBluetoothKeyboardInputValid ---") + CallerLogger.d(M_DEVA+TAG, "--- onBluetoothKeyboardInputValid ---") MoFangAnalyticUtils.track(EVENT_MOFANG_CONNECT, mutableMapOf(EVENT_SUB_IS_VALID to "${System.currentTimeMillis()}")) linkedLog.record(mapOf("callback" to "onBluetoothKeyboardInputValid")) } override fun onBluetoothOpenAgreed() { - Log.d(TAG, "--- onBluetoothOpenAgreed ---") + CallerLogger.d(M_DEVA+TAG, "--- onBluetoothOpenAgreed ---") MoFangAnalyticUtils.track(EVENT_MOFANG_CONNECT, mutableMapOf(EVENT_SUB_BLUETOOTH_OPEN_AGREE to "${System.currentTimeMillis()}")) linkedLog.record(mapOf("callback" to "onBluetoothOpenAgreed")) } override fun onBluetoothOpenDenied() { - Log.d(TAG, "--- onBluetoothOpenDenied ---") + CallerLogger.d(M_DEVA+TAG, "--- onBluetoothOpenDenied ---") MoFangAnalyticUtils.track(EVENT_MOFANG_CONNECT, mutableMapOf(EVENT_SUB_BLUETOOTH_OPEN_DENY to "${System.currentTimeMillis()}")) linkedLog.record(mapOf("callback" to "onBluetoothOpenDenied")) } override fun onBluetoothSettingRequest() { - Log.d(TAG, "--- onBluetoothSettingRequest ---") + CallerLogger.d(M_DEVA+TAG, "--- onBluetoothSettingRequest ---") MoFangAnalyticUtils.track(EVENT_MOFANG_CONNECT, mutableMapOf(EVENT_SUB_BLUETOOTH_SETTING_REQ to "${System.currentTimeMillis()}")) linkedLog.record(mapOf("callback" to "onBluetoothSettingRequest")) UiThreadHandler.post { @@ -304,7 +306,7 @@ internal class MoGoMoFangProviderImpl: IMoGoMoFangProvider, OnMoFangDeviceListen } override fun onBluetoothKeyboardAbnormalDisconnected(status: Int) { - Log.d(TAG, "--- onBluetoothKeyboardAbnormalDisconnected(status: $status) ---") + CallerLogger.d(M_DEVA+TAG, "--- onBluetoothKeyboardAbnormalDisconnected(status: $status) ---") MoFangAnalyticUtils.track(EVENT_MOFANG_CONNECT, mutableMapOf(EVENT_SUB_DISCONNECT_SLEEP to "${System.currentTimeMillis()}")) linkedLog.record(mapOf("callback" to "onBluetoothKeyboardAbnormalDisconnected:$status")) } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt index fa289a6d2c..71dec64930 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt @@ -48,7 +48,7 @@ class SceneManager { init { //过滤所需条件 sceneModuleTAG.map[ADAS] = SceneModule(true, M_D_C) - sceneModuleTAG.map[DEVA] = SceneModule(false, M_DEVA) + sceneModuleTAG.map[DEVA] = SceneModule(true, M_DEVA) sceneModuleTAG.map[HMI] = SceneModule(false, M_HMI) sceneModuleTAG.map[OBU] = SceneModule(true, M_OBU) sceneModuleTAG.map[V2X] = SceneModule(true, M_V2X) diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/Scene.kt b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/Scene.kt index 5589b9edb7..7e97380243 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/Scene.kt +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/Scene.kt @@ -38,7 +38,7 @@ class Scene { val adasMap = SceneLogCache(mutableMapOf(), true) sceneCache[M_D_C] = adasMap //初始化deva - val devaMap = SceneLogCache(mutableMapOf(), false) + val devaMap = SceneLogCache(mutableMapOf(), true) sceneCache[M_DEVA] = devaMap //初始化hmi val hmiMap = SceneLogCache(mutableMapOf(), false) From 2b75fa4f16cfe561a5c896bd7e9fa75a305d36d5 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 24 Aug 2023 14:35:29 +0800 Subject: [PATCH 10/11] =?UTF-8?q?[6.0.0]=20=E5=BE=85=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E6=92=AD=E6=8A=A5=E4=B8=A4=E6=AC=A1=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt | 4 +++- .../java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt index 1a90437eb1..34a3e97e42 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt @@ -11,6 +11,7 @@ import com.mogo.commons.mvp.BaseFragment import com.mogo.och.taxi.R import com.mogo.och.taxi.bean.OrderDetail import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean +import com.mogo.och.taxi.constant.TaskStatusEnum import com.mogo.och.taxi.constant.TaskTypeEnum import com.mogo.och.taxi.ui.base.TaxiFragment import kotlinx.android.synthetic.main.task_fragment_current.endStationName @@ -53,7 +54,8 @@ class TaxiNextTaskFragment : BaseFragment() { return } - if (model.taskType == TaskTypeEnum.VirtualTask.code) { + if (model.taskType == TaskTypeEnum.VirtualTask.code && + model.currentStatus != TaskStatusEnum.CompleteTask.code) { val order = model.order updateOrderUI(order!!) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt index 053f6d8641..7da87e3ce9 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt @@ -18,6 +18,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.taxi.R import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean +import com.mogo.och.taxi.constant.TaskStatusEnum import com.mogo.och.taxi.constant.TaskTypeEnum import com.mogo.och.taxi.ui.base.TaxiFragment import com.mogo.och.taxi.ui.task.TaxiCurrentTaskFragment @@ -193,7 +194,7 @@ class TaxiTaskTabFragment : BaseFragment() { fun updateOrderChanged(model: QueryCurrentTaskRespBean.Result?) { if (null == nextTaskFragment) return if (model != null && model.taskType == TaskTypeEnum.VirtualTask.code - && model.order != null) { + && model.order != null && model.currentStatus != TaskStatusEnum.CompleteTask.code) { VoiceNotice.showNotice("已为您提前接到下一订单，待完成当前任务后服务") wait_order_num.visibility = View.VISIBLE } else { From 8c0d8f8af47ef4e55ba132dc5a201215737bb5a0 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 24 Aug 2023 16:21:15 +0800 Subject: [PATCH 11/11] =?UTF-8?q?[6.0.0]=20refactor:=20=E5=89=8D=E5=BE=80?= =?UTF-8?q?=E6=A0=87=E5=AE=9A=E7=AB=99=E7=82=B9=E4=BB=BB=E5=8A=A1=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt | 5 +++++ .../com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt index 3e5a693443..972c8a0329 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt @@ -172,6 +172,11 @@ class TaxiCurrentTaskFragment : BaseFragment(), is TaskWithOrderUIState.TaskWithOrder -> { mCurrentTaskWithOrder = taskAndOrderUiState.taskWithOrder + //如果在前往标定站点, 显示标定站点 + if (mDriveToNearestStationTask != null){ + return@collect + } + if (mCurrentTaskWithOrder == null) { initContainerView(false) removeAllMapMarker() diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt index 514f9f196e..ea3c90e398 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt @@ -262,7 +262,7 @@ class TaxiCurrentTaskViewModel : BaseViewModel() sendUiState { copy( taskWithOrderUIState = TaskWithOrderUIState.TaskWithOrder( - null, + null ) ) }