yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.7.0] ui and interface

Browse Source
This commit is contained in:
EmArrow
2024-09-29 18:08:19 +08:00
parent c1ea86e509
commit c61acd26cd
13 changed files with 53 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml
View File

@@ -6,7 +6,7 @@
<com.mogo.eagle.core.function.hmi.map.MapContainerLayout <com.mogo.eagle.core.function.hmi.map.MapContainerLayout
android:id="@+id/mapContainerLayout" android:id="@+id/mapContainerLayout"
android:layout_width="1560dp" android:layout_width="1860dp"
android:layout_height="1534dp" android:layout_height="1534dp"
android:layout_marginTop="@dimen/dp_66" android:layout_marginTop="@dimen/dp_66"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@@ -35,22 +35,4 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
<com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugViewTrigger
android:layout_width="@dimen/dp_400"
android:layout_height="@dimen/dp_100"
android:longClickable="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<!--APP、MAP版本-->
<com.mogo.eagle.core.function.hmi.ui.widget.VersionNameView
android:id="@+id/viewVersionName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="45dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
View File

@@ -6,7 +6,7 @@
<com.mogo.eagle.core.function.hmi.map.MapContainerLayout <com.mogo.eagle.core.function.hmi.map.MapContainerLayout
android:id="@+id/mapContainerLayout" android:id="@+id/mapContainerLayout"
android:layout_width="1560dp" android:layout_width="1860dp"
android:layout_height="1533dp" android:layout_height="1533dp"
android:layout_marginTop="@dimen/dp_76" android:layout_marginTop="@dimen/dp_76"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

2
app/build.gradle
View File

@@ -8,7 +8,7 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-kapt'
apply from: rootProject.file('gradle/bytex/bytex.gradle') //apply from: rootProject.file('gradle/bytex/bytex.gradle')
Properties properties = new Properties() Properties properties = new Properties()
properties.load(project.rootProject.file("gradle.properties").newDataInputStream()) properties.load(project.rootProject.file("gradle.properties").newDataInputStream())

4
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/biz/DataCenterBizProvider.kt
View File

@@ -49,6 +49,10 @@ class DataCenterBizProvider:IDataCenterBizProvider {
CallerDataCenterBizListener.invokeLoginStatus(isLogin) CallerDataCenterBizListener.invokeLoginStatus(isLogin)
} }
override fun notifyOrderID(orderID: String) {
CallerDataCenterBizListener.invokeOrderID(orderID)
}
override fun onDestroy() { override fun onDestroy() {
} }

20
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml
View File

@@ -23,7 +23,7 @@
android:id="@+id/overMapView" android:id="@+id/overMapView"
android:layout_width="270dp" android:layout_width="270dp"
android:layout_height="270dp" android:layout_height="270dp"
android:layout_marginStart="1230dp" android:layout_marginStart="1530dp"
android:layout_marginTop="1204dp" android:layout_marginTop="1204dp"
app:bottomPadding="160" app:bottomPadding="160"
app:carDrawable="@drawable/taxt_u_p_map_car" app:carDrawable="@drawable/taxt_u_p_map_car"
@@ -197,4 +197,22 @@
app:pressed_enabled="false" app:pressed_enabled="false"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintEnd_toEndOf="parent" />
<com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugViewTrigger
android:layout_width="@dimen/dp_400"
android:layout_height="@dimen/dp_100"
android:longClickable="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<!--APP、MAP版本-->
<com.mogo.eagle.core.function.hmi.ui.widget.VersionNameView
android:id="@+id/viewVersionName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="45dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

8
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_version_name.xml
View File

@@ -8,8 +8,8 @@
android:id="@+id/tvAppVersionName" android:id="@+id/tvAppVersionName"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="@dimen/dp_28" android:textSize="@dimen/dp_23"
android:textColor="#FFBEC6EF" android:textColor="@color/color_80BEC6EF"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
/> />
@@ -17,8 +17,8 @@
android:id="@+id/tvMapVersionName" android:id="@+id/tvMapVersionName"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="@dimen/dp_28" android:textSize="@dimen/dp_23"
android:textColor="#FFBEC6EF" android:textColor="@color/color_80BEC6EF"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
/> />

1
core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
View File

@@ -27,6 +27,7 @@
<color name="color_D4D8DC">#D4D8DC</color> <color name="color_D4D8DC">#D4D8DC</color>
<color name="color_B2BED9">#B2BED9</color> <color name="color_B2BED9">#B2BED9</color>
<color name="color_FF1943">#FF1943</color> <color name="color_FF1943">#FF1943</color>
<color name="color_80BEC6EF">#80BEC6EF</color>
<color name="color_00FFFFFF">#00FFFFFF</color> <color name="color_00FFFFFF">#00FFFFFF</color>
<color name="color_FF1BB7FF">#FF1BB7FF</color> <color name="color_FF1BB7FF">#FF1BB7FF</color>
<color name="color_FF2EACFF">#FF2EACFF</color> <color name="color_FF2EACFF">#FF2EACFF</color>

2
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/IDataCenterBizListener.kt
View File

@@ -22,4 +22,6 @@ interface IDataCenterBizListener {
return false return false
} }
fun invokeAutopilotOrderId(orderID:String){}
} }

2
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IEagleBaseFunctionCall4Och.kt
View File

@@ -108,6 +108,6 @@ interface IEagleBaseFunctionCall4Och {
/** /**
* Och设置 启动自动驾驶附带的orderId * Och设置 启动自动驾驶附带的orderId
*/ */
fun setOchAutopilotOrderId(orderId:String?){} fun setOchAutopilotOrderId(orderId:String){}
} }

2
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/och/IOchFunctionCallNotify.kt
View File

@@ -34,4 +34,6 @@ interface IOchFunctionCallNotify {
// 登录状态变化 // 登录状态变化
fun notifyLoginStatus(isLogin: Boolean) fun notifyLoginStatus(isLogin: Boolean)
fun notifyOrderID(orderID:String)
} }

11
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/datacenter/CallerDataCenterBizListener.kt
View File

@@ -18,6 +18,9 @@ object CallerDataCenterBizListener : CallerBase<IDataCenterBizListener>() {
@Volatile @Volatile
private var inOrder: Boolean = false private var inOrder: Boolean = false
@Volatile
private var orderId: String = ""
private val isLoginStatus by lazy { AtomicBoolean(false) } private val isLoginStatus by lazy { AtomicBoolean(false) }
override fun doSomeAfterAddListener(tag: String, listener: IDataCenterBizListener) { override fun doSomeAfterAddListener(tag: String, listener: IDataCenterBizListener) {
@@ -26,6 +29,7 @@ object CallerDataCenterBizListener : CallerBase<IDataCenterBizListener>() {
listener.invokeLoginNo(loginNo) listener.invokeLoginNo(loginNo)
listener.invokeCarNo(no) listener.invokeCarNo(no)
listener.invokeOrderStatus(inOrder) listener.invokeOrderStatus(inOrder)
listener.invokeAutopilotOrderId(orderId)
} }
fun invokeLoginNo(loginNo: String?) { fun invokeLoginNo(loginNo: String?) {
@@ -84,4 +88,11 @@ object CallerDataCenterBizListener : CallerBase<IDataCenterBizListener>() {
fun isLoginStatus(): Boolean { fun isLoginStatus(): Boolean {
return isLoginStatus.get() return isLoginStatus.get()
} }
fun invokeOrderID(orderId: String) {
this.orderId = orderId
M_LISTENERS.forEach {
it.value.invokeAutopilotOrderId(orderId)
}
}
} }

4
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/datacenter/CallerDataCenterBizManager.kt
View File

@@ -48,4 +48,8 @@ object CallerDataCenterBizManager: IOchFunctionCallNotify {
dataCenterBizProviderApi?.notifyLoginStatus(isLogin) dataCenterBizProviderApi?.notifyLoginStatus(isLogin)
} }
override fun notifyOrderID(orderID: String) {
dataCenterBizProviderApi?.notifyOrderID(orderID)
}
} }

4
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/och/CallerEagleBaseFunctionCall4OchManager.kt
View File

@@ -124,7 +124,7 @@ object CallerEagleBaseFunctionCall4OchManager : IEagleBaseFunctionCall4Och {
CallerDataCenterBizManager.notifyOrderRemoval() CallerDataCenterBizManager.notifyOrderRemoval()
} }
override fun setOchAutopilotOrderId(orderId: String?) { override fun setOchAutopilotOrderId(orderId: String) {
CallerDataCenterBizManager.notifyOrderID(orderId)
} }
} }