From 0fc07997df52c59912e506aee139e73b6ff75545 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Mon, 16 May 2022 15:29:17 +0800 Subject: [PATCH 1/7] =?UTF-8?q?[Update]ADAS=E6=97=A5=E5=BF=97=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MoGoAdasMsgConnectStatusListenerImpl.kt | 1 + .../core/function/main/MainActivity.java | 18 ++++++++++++++---- .../res/layout/module_main_activity_main.xml | 6 ++++-- .../data/autopilot/AutopilotStatusInfo.kt | 19 ++++++++++++++++--- 4 files changed, 35 insertions(+), 9 deletions(-) diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt index ba60215687..cae2b3874c 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt @@ -75,6 +75,7 @@ class MoGoAdasMsgConnectStatusListenerImpl : OnAdasConnectStatusListener, } else if (ipcConnectionStatus == Constants.IPC_CONNECTION_STATUS.NOT_FOUND_ADDRESS) { CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 找不到可用IP 传入的IP不可用或固定IP列表中所有IP不可用") } + CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().ipcConnStatus = ipcConnectionStatus CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectStatusDescribe=reason CallerAutoPilotStatusListenerManager.invokeAutoPilotStatus() } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java index 312ac1a5be..a148257f3d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java @@ -91,6 +91,7 @@ public class MainActivity extends MvpActivity implement private RecyclerView mConnectInfoRV; private ConnInfoAdapter mConnAdapter; private List dataList = new ArrayList<>(); + private int mLastStatus = 0x00; private boolean isFloatingLayerHidden = false; @Override @@ -372,22 +373,31 @@ public class MainActivity extends MvpActivity implement @Override public void onAutopilotStatusResponse(@NonNull AutopilotStatusInfo autoPilotStatusInfo) { - mConnectInfoRV.post(() -> updateConnectInfoView(autoPilotStatusInfo)); + int status = autoPilotStatusInfo.getIpcConnStatus(); + if (mLastStatus != status) { + AutopilotStatusInfo statusInfo = autoPilotStatusInfo.clone(); + mConnectInfoRV.post(() -> updateConnectInfoView(statusInfo)); + mLastStatus = status; + } } @Override - public void onAutopilotArriveAtStation(@Nullable MessagePad.ArrivalNotification arrivalNotification) {} + public void onAutopilotArriveAtStation(@Nullable MessagePad.ArrivalNotification arrivalNotification) { + } @Override - public void onAutopilotGuardian(@Nullable MogoReportMsg.MogoReportMessage guardianInfo) {} + public void onAutopilotGuardian(@Nullable MogoReportMsg.MogoReportMessage guardianInfo) { + } @Override - public void onAutopilotSNRequest() {} + public void onAutopilotSNRequest() { + } private void updateConnectInfoView(@NonNull AutopilotStatusInfo autoPilotStatusInfo) { if (!isFloatingLayerHidden) {// 遮罩层显示的时候 mConnAdapter.updateData(autoPilotStatusInfo); mConnectInfoRV.scrollToPosition(mConnAdapter.getItemCount() - 1); + mLastStatus = autoPilotStatusInfo.getIpcConnStatus(); } else {// 遮罩层隐藏的时候 CallerAutoPilotStatusListenerManager.INSTANCE.removeListener(TAG); } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml index 7cc2f8956f..2bedffe09e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml @@ -89,8 +89,10 @@ \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt index ccadc635e1..ad4110ac37 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt @@ -9,7 +9,7 @@ import java.io.Serializable * 不建议自己初始化此对象，建议使用 CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo(); * */ -class AutopilotStatusInfo : Serializable { +open class AutopilotStatusInfo : Serializable, Cloneable { /** * 当前链接的IP地址, 默认地址 192.168.1.102 */ @@ -20,6 +20,7 @@ class AutopilotStatusInfo : Serializable { */ var connectPort: Int = 4110 var connectStatus = false + /** * 工控机连接状态文字描述 */ @@ -74,11 +75,23 @@ class AutopilotStatusInfo : Serializable { */ var pilotmode = 0 + // 默认未连接 + var ipcConnStatus = 0x01 + override fun toString(): String { - return "AutopilotStatusInfo(connectIP=$connectIP, connectPort=$connectPort, " + + return "connectIP=$connectIP, connectPort=$connectPort, " + "connectStatus=$connectStatus, connectDescribe=$connectStatusDescribe, version=$version, dockVersion=$dockVersion," + " locationStatus=$locationStatus), locationLat=$locationLat, locationLon=$locationLon," + " satelliteTime=$satelliteTime, speed=$speed, state=$state, reason=$reason, camera=$camera," + - " radar=$radar, rtk=$rtk, pilotmode=$pilotmode)" + " radar=$radar, rtk=$rtk, pilotmode=$pilotmode, ipcConnStatus=$ipcConnStatus" + } + + public override fun clone(): AutopilotStatusInfo { + try { + return super.clone() as AutopilotStatusInfo + } catch (e: Exception) { + e.printStackTrace() + } + return AutopilotStatusInfo() } } \ No newline at end of file From 37a72ae29a59dbe8127bfe1a973fc1a632834e36 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 16 May 2022 15:31:57 +0800 Subject: [PATCH 2/7] update log version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 476474b5a3..ce326dbf30 100644 --- a/gradle.properties +++ b/gradle.properties @@ -60,7 +60,7 @@ HOOK_LOG_VERSION=1.6.1 SERVICE_CHAIN_VERSION=1.1.0 ################ 外部依赖引用 ################ # loglib -LOGLIB_VERSION=1.2.60 +LOGLIB_VERSION=1.2.80 ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION MOGO_NETWORK_VERSION=1.3.55 From e0fa0027a09e8b34af3ef794aac89a1df678217b Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 12 May 2022 19:59:39 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=B8=90=E5=8F=98=E6=A8=A1=E7=B3=8A?= =?UTF-8?q?=E5=8C=96,=E8=89=B2=E5=80=BC=E5=BE=85=E4=B8=8EUI=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hmi/ui/widget/CircularProgressView.kt | 9 +++++- .../hmi/ui/widget/SteeringWheelView.java | 10 ++++--- .../res/layout/hmi_steering_wheel_taxi.xml | 28 +++++++++---------- .../src/main/res/values/color.xml | 3 +- 4 files changed, 29 insertions(+), 21 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CircularProgressView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CircularProgressView.kt index 93a1707834..a6e00ed9ca 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CircularProgressView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CircularProgressView.kt @@ -56,6 +56,7 @@ class CircularProgressView @JvmOverloads constructor( mProgPaint.isDither = true // 设置抖动 mProgPaint.strokeWidth = typedArray.getDimension(R.styleable.CircularProgressView_progWidth, 10.0f) mProgPaint.color = typedArray.getColor(R.styleable.CircularProgressView_progColor, Color.BLUE) +// mProgPaint.setPathEffect() // 初始化进度圆环渐变色 val startColor = typedArray.getColor(R.styleable.CircularProgressView_progStartColor, -1) val firstColor = typedArray.getColor(R.styleable.CircularProgressView_progFirstColor, -1) @@ -65,7 +66,7 @@ class CircularProgressView @JvmOverloads constructor( mColorArray = null } - +// mProgPaint.setShadowLayer() typedArray.recycle(); } @@ -102,6 +103,12 @@ class CircularProgressView @JvmOverloads constructor( } + fun setBlurMaskFilter(blur: Boolean,radius: Float) { + var blur: BlurMaskFilter = BlurMaskFilter(radius, BlurMaskFilter.Blur.NORMAL) + mProgPaint.setMaskFilter(blur) + invalidate() + } + /** * 获取当前进度 * @return 当前进度（0-100） diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java index f11ab82e66..b39cc3c670 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java @@ -75,13 +75,15 @@ public class SteeringWheelView extends ConstraintLayout { tapPositionView = findViewById(R.id.tap_position); steeringCircularV = findViewById(R.id.steering_circular); steeringCircularV.setBackWidth(8); - steeringCircularV.setBackColor(R.color.hmi_light_blue_00); + steeringCircularV.setBackColor(R.color.hmi_light_back_bg); steeringCircularV.setProgColor(R.color.hmi_light_blue, R.color.hmi_dark_blue); steeringCircularV.setProgress((int) (180 * 100) / 360, 1000); - if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)){ + if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { steeringCircularVAlpha = findViewById(R.id.steering_circular_alpha); - steeringCircularVAlpha.setAlpha(0.4f); - steeringCircularVAlpha.setBackColor(R.color.hmi_light_blue_00); + steeringCircularVAlpha.setBackWidth(20); + steeringCircularVAlpha.setProgWidth(20); + steeringCircularVAlpha.setBlurMaskFilter(true, 10.0f); + steeringCircularVAlpha.setBackColor(R.color.hmi_clear_00); steeringCircularVAlpha.setProgColor(R.color.hmi_light_blue_alpha); steeringCircularVAlpha.setProgress((int) (180 * 100) / 360, 1000); } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml index 496870eddc..9995d22f72 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml @@ -18,18 +18,18 @@ app:layout_constraintTop_toTopOf="parent" /> - + + + + + + + + + + + + + app:layout_constraintTop_toBottomOf="@+id/steering_circular" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml index d3a8ba3651..9eecbbe85f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml @@ -56,6 +56,7 @@ #FFFF9B00 #45D3FF #1B5BFF - #0045D3FF + #1EBBCFF6 #666C79C4 + #0045D3FF \ No newline at end of file From 8315cbf07f0006306e04e97540e4f3709332aa8e Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 16 May 2022 16:04:02 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=96=B9=E5=90=91=E7=9B=98=E5=A4=96?= =?UTF-8?q?=E5=9C=88=E8=92=99=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hmi/ui/widget/CircularProgressView.kt | 6 ++-- .../hmi/ui/widget/SteeringWheelView.java | 6 ++-- .../res/layout/hmi_steering_wheel_taxi.xml | 28 ++++++------------- .../src/main/res/values/color.xml | 2 +- .../res/values-xhdpi-2560x1440/dimens.xml | 1 + .../res/values-xhdpi-2560x1600/dimens.xml | 1 + 6 files changed, 16 insertions(+), 28 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CircularProgressView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CircularProgressView.kt index a6e00ed9ca..829163327f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CircularProgressView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CircularProgressView.kt @@ -65,8 +65,6 @@ class CircularProgressView @JvmOverloads constructor( } else { mColorArray = null } - -// mProgPaint.setShadowLayer() typedArray.recycle(); } @@ -103,8 +101,8 @@ class CircularProgressView @JvmOverloads constructor( } - fun setBlurMaskFilter(blur: Boolean,radius: Float) { - var blur: BlurMaskFilter = BlurMaskFilter(radius, BlurMaskFilter.Blur.NORMAL) + fun setBlurMaskFilter(blur: BlurMaskFilter.Blur, radius: Float) { + var blur: BlurMaskFilter = BlurMaskFilter(radius, blur) mProgPaint.setMaskFilter(blur) invalidate() } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java index b39cc3c670..88512fac87 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java @@ -1,6 +1,7 @@ package com.mogo.eagle.core.function.hmi.ui.widget; import android.content.Context; +import android.graphics.BlurMaskFilter; import android.util.AttributeSet; import android.util.Log; import android.view.LayoutInflater; @@ -80,9 +81,8 @@ public class SteeringWheelView extends ConstraintLayout { steeringCircularV.setProgress((int) (180 * 100) / 360, 1000); if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { steeringCircularVAlpha = findViewById(R.id.steering_circular_alpha); - steeringCircularVAlpha.setBackWidth(20); - steeringCircularVAlpha.setProgWidth(20); - steeringCircularVAlpha.setBlurMaskFilter(true, 10.0f); + steeringCircularVAlpha.setBackWidth(12); + steeringCircularVAlpha.setBlurMaskFilter(BlurMaskFilter.Blur.NORMAL, 12); steeringCircularVAlpha.setBackColor(R.color.hmi_clear_00); steeringCircularVAlpha.setProgColor(R.color.hmi_light_blue_alpha); steeringCircularVAlpha.setProgress((int) (180 * 100) / 360, 1000); diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml index 9995d22f72..2166c95c20 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml @@ -17,20 +17,6 @@ app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> - - - - - - - - - - - - - - #45D3FF #1B5BFF #1EBBCFF6 - #666C79C4 + #6C79C4 #0045D3FF \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml index 7f051678b4..36a6e225b7 100644 --- a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -1,5 +1,6 @@ + 12px 20px 26px 30px diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml index daf0174189..c4a29618fd 100644 --- a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml @@ -1,5 +1,6 @@ + 12px 42px 628px 188px From c3c03e286bc2aa0f725b5423d7fbc6826a315d13 Mon Sep 17 00:00:00 2001 From: xuxinchao <13522809046@163.com> Date: Mon, 16 May 2022 16:50:33 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=B0=83=E8=AF=95=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加SN、docker版本和经纬度的复制 --- .../hmi/ui/setting/DebugSettingView.kt | 39 +++++++++++ .../main/res/layout/view_debug_setting.xml | 68 ++++++++++++++++--- 2 files changed, 98 insertions(+), 9 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index d7817aab5b..d9e31975a5 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -2,6 +2,8 @@ package com.mogo.eagle.core.function.hmi.ui.setting import android.annotation.SuppressLint import android.app.Activity +import android.content.ClipData +import android.content.ClipboardManager import android.content.Context import android.graphics.Color import android.os.Build @@ -12,6 +14,7 @@ import android.view.View import androidx.annotation.RequiresApi import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat +import androidx.core.content.ContextCompat.getSystemService import androidx.recyclerview.widget.LinearLayoutManager import chassis.Chassis import com.mogo.cloud.passport.MoGoAiCloudClient @@ -133,6 +136,9 @@ class DebugSettingView @JvmOverloads constructor( private var clickListener: ClickListener? = null + //剪切板 + private var clipboardManager: ClipboardManager ?= null + init { LayoutInflater.from(context).inflate(R.layout.view_debug_setting, this, true) initView() @@ -616,6 +622,39 @@ class DebugSettingView @JvmOverloads constructor( clickListener?.showReportListWindow(isChecked) } + //SN复制按钮 + tvPadSnClip.setOnClickListener { + if(clipboardManager==null){ + //获取剪贴板管理器： + clipboardManager = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager + } + // 创建普通字符型ClipData ,将ClipData内容放到系统剪贴板里 + clipboardManager?.setPrimaryClip(ClipData.newPlainText("MoGoSN",AppConfigInfo.mogoSN)) + ToastUtils.showLong("SN复制成功") + } + + //工控机镜像复制按钮 + tvIpcVersionInfoClip.setOnClickListener{ + if(clipboardManager==null){ + //获取剪贴板管理器： + clipboardManager = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager + } + // 创建普通字符型ClipData ,将ClipData内容放到系统剪贴板里 + clipboardManager?.setPrimaryClip(ClipData.newPlainText("DockVersion",mAutoPilotStatusInfo?.dockVersion)) + ToastUtils.showLong("docker版本复制成功") + } + + //经纬度复制按钮 + tvCarInfoCopyClip.setOnClickListener{ + if(clipboardManager==null){ + //获取剪贴板管理器： + clipboardManager = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager + } + // 创建普通字符型ClipData ,将ClipData内容放到系统剪贴板里 + clipboardManager?.setPrimaryClip(ClipData.newPlainText("LonAndLat","${mGnssInfo?.longitude},${mGnssInfo?.latitude}")) + ToastUtils.showLong("经纬度复制成功") + } + } /** diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index 2e426d215d..526677d2a4 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -207,11 +207,32 @@ android:orientation="vertical" android:visibility="gone"> - + android:layout_height="wrap_content" + android:orientation="horizontal"> + + + + + + + + - + android:layout_height="wrap_content" + android:orientation="horizontal"> + + + + + + + + + app:layout_constraintTop_toBottomOf="@id/tvCarInfoCopyClip" /> Date: Mon, 16 May 2022 18:45:41 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=BA=A2=E7=BB=BF=E7=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改红绿灯隐藏时机 --- .../trafficlight/core/MogoTrafficLightManager.kt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt index e6a41943b7..ae399ce8ad 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt @@ -49,10 +49,10 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 { mThreadHandler = TrafficLightThreadHandler(Looper.getMainLooper(), { //查询路口时，如果红绿灯显示，则隐藏掉 - if (TrafficLightHMIManager.INSTANCE.isWarningTrafficLightShow()) { - TrafficLightHMIManager.INSTANCE.hideTrafficLight() - CallTrafficLightListenerManager.resetTrafficLightData() - } +// if (TrafficLightHMIManager.INSTANCE.isWarningTrafficLightShow()) { +// TrafficLightHMIManager.INSTANCE.hideTrafficLight() +// CallTrafficLightListenerManager.resetTrafficLightData() +// } mLocation?.let { it -> val tileId = CallerMapUIServiceManager.getMapUIController()?.getTileId(it.longitude, it.latitude) ?: 0 trafficLightNetWorkModel.requestRoadID( @@ -78,7 +78,7 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 { trafficLightNetWorkModel.requestTrafficLight( it.latitude, it.longitude, it.bearing.toDouble(), road, { result -> trafficLightResult = result - TrafficLightHMIManager.INSTANCE.updateTrafficLight(result) +// TrafficLightHMIManager.INSTANCE.updateTrafficLight(result) CallTrafficLightListenerManager.invokeTrafficLightStatus(result) }, { errorMsg -> @@ -99,6 +99,10 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 { 2_000L ) } + if (TrafficLightHMIManager.INSTANCE.isWarningTrafficLightShow()) { + TrafficLightHMIManager.INSTANCE.hideTrafficLight() + CallTrafficLightListenerManager.resetTrafficLightData() + } }) } }, { From e8b7631f025b00f82cf6aa5b124fddbba2e3c1ed Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 16 May 2022 19:14:17 +0800 Subject: [PATCH 7/7] rename adasinit to eagleinit ,which include cloud and adas init status , plus added the adas connect operations trace log --- .../mogo/launcher/stageone/HttpDnsStartUp.kt | 32 +++++++++++++++++++ .../autopilot/MoGoAutopilotProvider.kt | 3 -- .../autopilot/adapter/MoGoAdasListenerImpl.kt | 21 ++++++------ .../logcatch/MogoLogCatchConst.kt | 5 +++ .../logcatch/MogoLogCatchManager.kt | 5 +++ .../trace/TraceManager.kt | 8 ++++- .../core/data/deva/chain/ChainConstant.kt | 19 ++++++++--- .../api/autopilot/IMoGoAutopilotProvider.kt | 6 ---- gradle.properties | 2 +- .../zhidao/support/adas/high/AdasChannel.java | 20 ++++++++++-- .../support/adas/high/chain/AdasChain.java | 2 ++ 11 files changed, 96 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt b/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt index 7aa1fe54f4..8af8175fbf 100644 --- a/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt @@ -20,6 +20,11 @@ import com.mogo.commons.debug.DebugConfig import com.mogo.commons.device.Devices import com.mogo.commons.network.NetConfigUtils import com.mogo.commons.network.Utils +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_CLOUD_CONNECT_FAIL +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_CLOUD_CONNECT_LOST +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_CLOUD_CONNECT_SUCCESS +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_CLOUD_SHOW +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_CONNECT_STATUS import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.call.analytics.AnalyticsManager import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager @@ -30,6 +35,8 @@ import com.mogo.eagle.core.utilcode.util.ProcessUtils import com.mogo.eagle.core.utilcode.util.ThreadPoolService import com.mogo.module.common.constants.HostConst import com.rousetime.android_startup.AndroidStartup +import com.zhjt.service.chain.ChainLog +import com.zhjt.service.chain.TracingConstants.Endpoint.Companion.PAD import java.lang.NumberFormatException class HttpDnsStartUp : AndroidStartup() { @@ -245,16 +252,41 @@ class HttpDnsStartUp : AndroidStartup() { MogoAiCloudSocketManager.getInstance(context).destroy() MogoAiCloudSocketManager.getInstance(context) .registerLifecycleListener(10020, object : IMogoLifecycleListener { + + @ChainLog( + linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, + linkCode = CHAIN_LINK_CLOUD_SHOW, + endpoint = PAD, + nodeAliasCode = CHAIN_ALIAS_CODE_CLOUD_CONNECT_FAIL, + paramIndexes = [-1], + clientPkFileName = "sn" + ) override fun onConnectFailure() { CallerLogger.d(SceneConstant.M_HMI + TAG, "socket-onConnectFailure") DebugConfig.setDownloadSnapshot(false) } + @ChainLog( + linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, + linkCode = CHAIN_LINK_CLOUD_SHOW, + endpoint = PAD, + nodeAliasCode = CHAIN_ALIAS_CODE_CLOUD_CONNECT_SUCCESS, + paramIndexes = [-1], + clientPkFileName = "sn" + ) override fun onConnectSuccess() { CallerLogger.d(SceneConstant.M_HMI + TAG, "socket-onConnectSuccess") DebugConfig.setDownloadSnapshot(true) } + @ChainLog( + linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, + linkCode = CHAIN_LINK_CLOUD_SHOW, + endpoint = PAD, + nodeAliasCode = CHAIN_ALIAS_CODE_CLOUD_CONNECT_LOST, + paramIndexes = [-1], + clientPkFileName = "sn" + ) override fun onConnectLost() { CallerLogger.d(SceneConstant.M_HMI + TAG, "socket-onConnectLost") DebugConfig.setDownloadSnapshot(false) diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt index 66b18e4e7d..68dca8c2fa 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt @@ -286,9 +286,6 @@ class MoGoAutopilotProvider : ) } - override fun sendMessageToAutopilot(jsonString: String) { - } - override fun cancelAutoPilot() { if (AdasManager.getInstance().ipcConnectionStatus == Constants.IPC_CONNECTION_STATUS.CONNECTED) { AdasManager.getInstance().sendAutoPilotModeReq(0, 1, null) diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt index 756a0dac83..179c15bd15 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -8,6 +8,7 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_C import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_RECORD import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_ROUTE import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_STATUS +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_TRAFFIC_LIGHT import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_TRAJECTORY import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_VEHICLE import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_CAR_STATE @@ -15,6 +16,8 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_C import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_ADAS import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_GNSSINFO +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_TRAFFIC_LIGHT import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager @@ -111,7 +114,7 @@ class MoGoAdasListenerImpl : OnAdasListener { //自车定位信息 @ChainLog( - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT, + linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_GNSSINFO, linkCode = CHAIN_LINK_ADAS, endpoint = PAD, nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_CAR_STATE, @@ -221,6 +224,14 @@ class MoGoAdasListenerImpl : OnAdasListener { } //感知红绿灯 + @ChainLog( + linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_TRAFFIC_LIGHT, + linkCode = CHAIN_LINK_ADAS, + endpoint = PAD, + nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_TRAFFIC_LIGHT, + paramIndexes = [0, 1], + clientPkFileName = "sn" + ) override fun onPerceptionTrafficLight( header: MessagePad.Header?, trafficLights: TrafficLightOuterClass.TrafficLights? @@ -331,14 +342,6 @@ class MoGoAdasListenerImpl : OnAdasListener { } -// override fun onSSHResult(info: com.zhidao.adas.client.ssh.SSHResult?) { -// if (info != null && "docker restart autocar_default_1" == info.cmd) { -// showDockerRebootResult(info.code, info.msg) -// } else { -// CallerLogger.w("$M_ADAS_IMPL$TAG", "onSSHResult : result info is null") -// } -// } - override fun onError(status: ProtocolStatus, bytes: ByteArray) { } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchConst.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchConst.kt index 517399f6af..df28e0d747 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchConst.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchConst.kt @@ -24,5 +24,10 @@ class MogoLogCatchConst { * 本应用设置，关闭日志 */ const val LOCAL_CONFIG_CLOSE_LOG = 4 + + /** + * 上传本地缓存链路日志 + */ + const val CACHE_TRACE_UPLOAD = 5 } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt index 6962119c14..8083dffd71 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt @@ -27,6 +27,7 @@ import com.zhidao.loglib.bean.RemoteLogPushContent import com.zhidao.loglib.call.LogInfoManagerFactory import com.zhidao.loglib.core.ILogListener import com.zhidao.loglib.core.LogInfoManager +import com.zhjt.mogo_core_function_devatools.logcatch.MogoLogCatchConst.Companion.CACHE_TRACE_UPLOAD import com.zhjt.mogo_core_function_devatools.logcatch.MogoLogCatchConst.Companion.LOCAL_CONFIG_CLOSE_LOG import com.zhjt.mogo_core_function_devatools.logcatch.MogoLogCatchConst.Companion.LOCAL_CONFIG_OPEN_LOG import com.zhjt.mogo_core_function_devatools.logcatch.MogoLogCatchConst.Companion.LOG_PUSH_TYPE @@ -103,6 +104,10 @@ object MogoLogCatchManager : IMogoOnMessageListener, Handl TipToast.longTip("云端下发关闭日志开关") closeLoggerLevel() } + CACHE_TRACE_UPLOAD -> { + TipToast.longTip("上传本地缓存链路日志") + + } else -> { } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt index b9264ea64c..bfbb8da03d 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt @@ -37,6 +37,8 @@ class TraceManager { // Trace过程中进行日志抓取，对日志进行配置 fwBuildMap[ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS] = FwBuild(true, -1,pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_INIT) + fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_GNSSINFO] = + FwBuild(true, -1,pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_GNSS) fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT] = FwBuild(true, -1,pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_AUTO) fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED] = @@ -45,11 +47,15 @@ class TraceManager { FwBuild(false, 30,pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_TRAJECTORY) fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE] = FwBuild(false, 30,pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_VEHICLE) + fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_TRAFFIC_LIGHT] = + FwBuild(false, 30,pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_TRAFFIC_LIGHT) traceInfoCache[ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS] = ChainLogParam(true, "ADAS连接状态") + traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_GNSSINFO] = + ChainLogParam(true, "ADAS自车定位") traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT] = - ChainLogParam(false, "ADAS自动驾驶链路(包含: 定位,自动驾驶状态,全局路径,到站提醒,节点状态,异常上报)") + ChainLogParam(true, "ADAS自动驾驶链路(包含: 自动驾驶状态交互,全局路径,到站提醒,节点状态,异常上报)") traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED] = ChainLogParam(false, "ADAS感知物体") traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY] = 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 ae4f3a71d2..11ec8308d4 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 @@ -8,16 +8,20 @@ class ChainConstant { const val CHAIN_LINK_ADAS = 1 const val CHAIN_LINK_LOG_CONNECT_STATUS = 0 - const val CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT = 1 - const val CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED = 2 - const val CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY = 3 - const val CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE = 4 + const val CHAIN_LINK_LOG_WEB_SOCKET_GNSSINFO = 1 + const val CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT = 2 + const val CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED = 3 + const val CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY = 4 + const val CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE = 5 + const val CHAIN_LINK_LOG_WEB_SOCKET_TRAFFIC_LIGHT = 6 - const val CHAIN_LINK_LOG_ADAS_INIT = "-adasInitStatus" + const val CHAIN_LINK_LOG_ADAS_INIT = "-eagleInitStatus" + const val CHAIN_LINK_LOG_ADAS_GNSS = "-adasWsGnssInfo" const val CHAIN_LINK_LOG_ADAS_AUTO = "-adasWsAutoPilot" const val CHAIN_LINK_LOG_ADAS_DATA_TRACK = "-adasWsDataTrack" const val CHAIN_LINK_LOG_ADAS_TRAJECTORY = "-adasWsTrajectory" const val CHAIN_LINK_LOG_ADAS_VEHICLE = "-adasWsVehicle" + const val CHAIN_LINK_LOG_ADAS_TRAFFIC_LIGHT = "-adasWsTrafficLight" const val CHAIN_ALIAS_CODE_MULTI_CONNECT = "CHAIN_ALIAS_CODE_MULTI_CONNECT" const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA = "PAD_ADAS_MESSAGE_AUTOPILOT_RECT_DATA" @@ -29,8 +33,13 @@ class ChainConstant { const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_GUARDIAN = "PAD_ADAS_MESSAGE_AUTOPILOT_GUARDIAN" const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_RECORD = "PAD_ADAS_MESSAGE_AUTOPILOT_RECORD" const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_VEHICLE = "PAD_ADAS_MESSAGE_AUTOPILOT_VEHICLE" + const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_TRAFFIC_LIGHT = "PAD_ADAS_MESSAGE_AUTOPILOT_TRAFFIC_LIGHT" const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_WARN = "PAD_ADAS_MESSAGE_AUTOPILOT_WARN" + const val CHAIN_ALIAS_CODE_CLOUD_CONNECT_FAIL = "CHAIN_ALIAS_CODE_CLOUD_CONNECT_FAIL" + const val CHAIN_ALIAS_CODE_CLOUD_CONNECT_SUCCESS = "CHAIN_ALIAS_CODE_CLOUD_CONNECT_SUCCESS" + const val CHAIN_ALIAS_CODE_CLOUD_CONNECT_LOST = "CHAIN_ALIAS_CODE_CLOUD_CONNECT_LOST" + //operation by user const val CHAIN_ALIAS_CODE_OCH_BUS_START_AUTOPILOT = "CHAIN_ALIAS_CODE_OCH_BUS_START_AUTOPILOT" const val CHAIN_ALIAS_CODE_OCH_TAXI_START_AUTOPILOT = "CHAIN_ALIAS_CODE_OCH_TAXI_START_AUTOPILOT" diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt index eee345e182..1e3d65fd13 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt @@ -34,12 +34,6 @@ interface IMoGoAutopilotProvider : IMoGoFunctionServerProvider { */ fun sendTrafficLightData(trafficLightResult: TrafficLightResult) - /** - * 发送json数据给 Autopilot 自动驾驶控制器 - * 具体的json格式需要与@宋克难 进行沟通 - */ - fun sendMessageToAutopilot(jsonString: String) - /** * 结束自动驾驶 */ diff --git a/gradle.properties b/gradle.properties index ce326dbf30..9580c7a675 100644 --- a/gradle.properties +++ b/gradle.properties @@ -60,7 +60,7 @@ HOOK_LOG_VERSION=1.6.1 SERVICE_CHAIN_VERSION=1.1.0 ################ 外部依赖引用 ################ # loglib -LOGLIB_VERSION=1.2.80 +LOGLIB_VERSION=1.3.0 ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION MOGO_NETWORK_VERSION=1.3.55 diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java index 1f559f162b..d64f93bed2 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java @@ -1,17 +1,17 @@ package com.zhidao.support.adas.high; +import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_ALIAS_CODE_ADAS_SEND_GLOBAL_PATH; +import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_ALIAS_CODE_ADAS_SEND_SYSTEM_CMD; import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_ALIAS_CODE_ADAS_START_AUTOPILOT; import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_ALIAS_CODE_CONNECT_ADDRESS; import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_ALIAS_CODE_INIT; import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_ALIAS_CODE_STATUS_CHANGE_REASON; -import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_ALIAS_CODE_WEB_SOCKET_MESSAGE_BYTE; import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_LINK_ADAS; import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_LINK_LOG_CONNECT_STATUS; import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT; import android.text.TextUtils; -import android.util.Log; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -730,6 +730,14 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec * * @return boolean */ + @ChainLog( + linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT, + linkCode = CHAIN_LINK_ADAS, + endpoint = TracingConstants.Endpoint.PAD, + nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_SEND_GLOBAL_PATH, + paramIndexes = {-1}, + clientPkFileName = "sn" + ) @Override public boolean sendGlobalPathReq() { MessagePad.GlobalPathReq req = MessagePad.GlobalPathReq @@ -790,6 +798,14 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec * SystemCmdType。SYSTEMCMD_SHUT_DOWN 关机 * @return boolean */ + @ChainLog( + linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT, + linkCode = CHAIN_LINK_ADAS, + endpoint = TracingConstants.Endpoint.PAD, + nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_SEND_SYSTEM_CMD, + paramIndexes = {0}, + clientPkFileName = "sn" + ) @Override public boolean sendSystemCmdReq(@NonNull MessagePad.SystemCmdType type) { MessagePad.SystemCmdReq.Builder builder = MessagePad.SystemCmdReq.newBuilder(); diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/chain/AdasChain.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/chain/AdasChain.java index c69c8cfb54..03827f1030 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/chain/AdasChain.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/chain/AdasChain.java @@ -16,4 +16,6 @@ public class AdasChain { //operation by user public static final String CHAIN_ALIAS_CODE_ADAS_START_AUTOPILOT = "CHAIN_ALIAS_CODE_ADAS_START_AUTOPILOT"; + public static final String CHAIN_ALIAS_CODE_ADAS_SEND_GLOBAL_PATH = "CHAIN_ALIAS_CODE_ADAS_SEND_GLOBAL_PATH"; + public static final String CHAIN_ALIAS_CODE_ADAS_SEND_SYSTEM_CMD = "CHAIN_ALIAS_CODE_ADAS_SEND_SYSTEM_CMD"; }