diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml index 62f4f0c709..13fa62b502 100644 --- a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml +++ b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml @@ -101,17 +101,6 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> - - - diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml index 563a3da641..598f77c55f 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml @@ -100,17 +100,6 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> - - - diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneContainerView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneContainerView.kt index d17cebe916..38449868d0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneContainerView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneContainerView.kt @@ -33,14 +33,6 @@ class BoneContainerView @JvmOverloads constructor( clBoneBiz.addView(view) } - fun setCarNo(carNo: String){ - clBoneTab.setCarNo(carNo) - } - - fun setLoginInfo(loginNo: String){ - clBoneTab.setLoginInfo(loginNo) - } - fun loginOut(logOut:(() -> Unit)){ this.logOut = logOut } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt index fd536ecc21..ca47cd5208 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt @@ -192,22 +192,22 @@ class RoadCrossRoamView @JvmOverloads constructor( private fun attachView() { // 没有路线不做提示 - if (CallerAutoPilotStatusListenerManager.getLineId() == 0L) { - return - } - // 处于漫游模式下不做处理 - if (CallerMapIdentifyManager.roam.second) { - if (CallerMapIdentifyManager.roam.first != TAG) { - ToastUtils.showLong("正在漫游中，不展示路口漫游") - } - CallerLogger.d("$M_MAP$TAG", "正在漫游中，不展示路口漫游") - return - } - // 首页被遮挡不做提示 - if (!CallerHmiViewControlListenerManager.getMainPageVisible()) { - CallerLogger.d("$M_MAP$TAG", "attachView return , mainPageVisible is false") - return - } +// if (CallerAutoPilotStatusListenerManager.getLineId() == 0L) { +// return +// } +// // 处于漫游模式下不做处理 +// if (CallerMapIdentifyManager.roam.second) { +// if (CallerMapIdentifyManager.roam.first != TAG) { +// ToastUtils.showLong("正在漫游中，不展示路口漫游") +// } +// CallerLogger.d("$M_MAP$TAG", "正在漫游中，不展示路口漫游") +// return +// } +// // 首页被遮挡不做提示 +// if (!CallerHmiViewControlListenerManager.getMainPageVisible()) { +// CallerLogger.d("$M_MAP$TAG", "attachView return , mainPageVisible is false") +// return +// } //播放语音 val dis = CallerMapRoadListenerManager.getStopLineDistance()?.toInt() ?: 0 if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-nodpi/bg_road_cross_roam.9.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-nodpi/bg_road_cross_roam.9.png new file mode 100644 index 0000000000..7ea3cdf16c Binary files /dev/null and b/core/function-impl/mogo-core-function-map/src/main/res/drawable-nodpi/bg_road_cross_roam.9.png differ diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-nodpi/bg_road_cross_roam.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-nodpi/bg_road_cross_roam.png deleted file mode 100644 index 205b0efaae..0000000000 Binary files a/core/function-impl/mogo-core-function-map/src/main/res/drawable-nodpi/bg_road_cross_roam.png and /dev/null differ diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable/anim_road_cross_progress.xml b/core/function-impl/mogo-core-function-map/src/main/res/drawable/anim_road_cross_progress.xml new file mode 100644 index 0000000000..fdea873033 --- /dev/null +++ b/core/function-impl/mogo-core-function-map/src/main/res/drawable/anim_road_cross_progress.xml @@ -0,0 +1,6 @@ + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-map/src/main/res/layout/item_road_cross_roam_tip.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/item_road_cross_roam_tip.xml index c4a5ab6d02..3951b93163 100644 --- a/core/function-impl/mogo-core-function-map/src/main/res/layout/item_road_cross_roam_tip.xml +++ b/core/function-impl/mogo-core-function-map/src/main/res/layout/item_road_cross_roam_tip.xml @@ -9,9 +9,9 @@ android:id="@+id/tvRoadItemTip" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:layout_constraintBottom_toBottomOf="parent" - android:textSize="@dimen/dp_26" android:textColor="@color/white" + android:textSize="@dimen/dp_26" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -19,7 +19,9 @@ android:id="@+id/pbRoadItemTip" android:layout_width="@dimen/dp_35" android:layout_height="@dimen/dp_35" - android:progressDrawable="@drawable/icon_road_roam_progress" + android:indeterminateBehavior="repeat" + android:indeterminateDrawable="@drawable/anim_road_cross_progress" + android:indeterminateOnly="true" android:visibility="visible" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IOchFunctionCall.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IOchFunctionCall.kt index 21ea45b889..678eb951a4 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IOchFunctionCall.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IOchFunctionCall.kt @@ -10,4 +10,9 @@ interface IOchFunctionCall { */ fun registerToolKitDefaultItemClickListener(tag: String, listener: IToolKitItemClickListener) {} + /** + * 网约车回调登陆信息 + */ + fun invokeLoginInfo(){} + } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerOchFunctionCallManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerOchFunctionCallManager.kt index df1126fcf8..a2ddd90e59 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerOchFunctionCallManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerOchFunctionCallManager.kt @@ -2,22 +2,34 @@ package com.mogo.eagle.core.function.call.och import com.mogo.eagle.core.function.api.och.IOchFunctionCall import com.mogo.eagle.core.function.api.och.IToolKitItemClickListener +import com.mogo.eagle.core.function.call.base.CallerBase import com.mogo.eagle.core.function.call.hmi.CallerHmiManager /** * 实现给 Och 业务层调用的接口 */ -object CallerOchFunctionCallManager : IOchFunctionCall { +object CallerOchFunctionCallManager : CallerBase() { const val TAG = "CallerOchFunctionCallManager" + override fun doSomeAfterAddListener(tag: String, listener: IOchFunctionCall) { + super.doSomeAfterAddListener(tag, listener) + listener.invokeLoginInfo() + } + /** * 注册 工具箱 item点击事件监听 (默认样式item的点击事件监听，自定义样式的item的点击交给view自己处理) */ - override fun registerToolKitDefaultItemClickListener( + fun toolKitDefaultItemClickListener( tag: String, listener: IToolKitItemClickListener ) { CallerHmiManager.registerToolKitDefaultItemClickListener(tag, listener) } + fun invokeLoginInfo(){ + M_LISTENERS.forEach { + val listener = it.value + listener.invokeLoginInfo() + } + } } \ No newline at end of file