diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
index 024bb68d79..9f3240688d 100644
--- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
+++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
@@ -228,9 +228,10 @@
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
index 88f23f3945..f7ee5267fc 100644
--- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
+++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
@@ -120,9 +120,10 @@
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt
index 8eb8f56460..12d2acb53f 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt
@@ -34,6 +34,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener
import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
import com.mogo.eagle.core.function.call.hmi.CallerHmiFloatViewManager
import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
+import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
import com.mogo.eagle.core.function.call.setting.CallerRequestActivityHandleManager
import com.mogo.eagle.core.function.call.startup.CallerStartUpManager.initStageTwo
import com.mogo.eagle.core.function.hmi.R
@@ -356,6 +357,7 @@ open class MainActivity : MvpActivity(), MainView,
super.onRequestPermissionsResult(requestCode, permissions, grantResults)
if (requestCode == MainPresenter.MOGO_PERMISSION_REQUEST_CODE) {
var isAllGranted = true
+ var isLocationGranted = true
// 判断是否所有的权限都已经授予了
val reasong = StringBuffer()
grantResults.forEachIndexed { index, grant ->
@@ -377,6 +379,7 @@ open class MainActivity : MvpActivity(), MainView,
Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS,
Manifest.permission.ACCESS_FINE_LOCATION,
Manifest.permission.ACCESS_COARSE_LOCATION -> {
+ isLocationGranted = false
if(!reasong.contains("定位")){
reasong.append("定位、")
}
@@ -385,6 +388,9 @@ open class MainActivity : MvpActivity(), MainView,
}
}
}
+ if (isLocationGranted) {
+ CallerMapUIServiceManager.getGDLocationServer()?.start(context!!)
+ }
if (isAllGranted) {
isFirst = false
} else {
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_hmi_nor_test_light.9.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_hmi_nor_test_light.9.png
new file mode 100644
index 0000000000..81acc4e8c0
Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_hmi_nor_test_light.9.png differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml
index 4ced93074a..18c4abd984 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml
@@ -4,25 +4,24 @@
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- android:background="@drawable/bg_light">
+ android:background="@drawable/bg_hmi_nor_test_light">
+ app:layout_constraintLeft_toLeftOf="@+id/roadCrossLivePlayer"/>