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

Merge remote-tracking branch 'origin/dev_robotaxi-d_240705_6.5.0' into dev_robotaxi-d_240705_6.5.0

Browse Source
This commit is contained in:
xuxinchao
2024-07-19 15:33:34 +08:00
parent 0e94b8bd65 7ceba4fee2
commit 27a2fd83ca
5 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
View File

@@ -228,9 +228,10 @@
<!-- 地图marker点击触发路侧直播 -->
<com.mogo.eagle.core.function.hmi.ui.camera.RoadCrossLiveView
android:layout_width="@dimen/dp_660"
android:layout_height="@dimen/dp_480"
android:layout_marginTop="@dimen/dp_400"
android:layout_width="@dimen/dp_590"
android:layout_height="@dimen/dp_408"
android:layout_marginTop="@dimen/dp_425"
android:layout_marginEnd="@dimen/dp_29"
android:visibility="gone"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />

7
OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
View File

@@ -120,9 +120,10 @@
<!-- 地图marker点击触发路侧直播 -->
<com.mogo.eagle.core.function.hmi.ui.camera.RoadCrossLiveView
android:layout_width="@dimen/dp_660"
android:layout_height="@dimen/dp_480"
android:layout_marginTop="@dimen/dp_400"
android:layout_width="@dimen/dp_590"
android:layout_height="@dimen/dp_408"
android:layout_marginTop="@dimen/dp_425"
android:layout_marginEnd="@dimen/dp_29"
android:visibility="gone"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />

6
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt
View File

@@ -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?, MainPresenter?>(), 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?, MainPresenter?>(), 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?, MainPresenter?>(), MainView,
}
}
}
if (isLocationGranted) {
CallerMapUIServiceManager.getGDLocationServer()?.start(context!!)
}
if (isAllGranted) {
isFirst = false
} else {

BIN
core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_hmi_nor_test_light.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

15
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml
View File

@@ -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">
<TextView
android:text="@string/road_cross_live_tip"
android:textColor="@color/color_131415"
android:textSize="@dimen/dp_28"
android:layout_marginStart="@dimen/dp_34"
android:layout_marginTop="@dimen/dp_28"
android:layout_marginTop="@dimen/dp_23"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"/>
app:layout_constraintLeft_toLeftOf="@+id/roadCrossLivePlayer"/>
<ImageView
android:id="@+id/roadCrossLiveClose"
android:layout_width="@dimen/dp_50"
android:layout_height="@dimen/dp_50"
android:scaleType="center"
android:layout_marginTop="@dimen/dp_14"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_14"
android:src="@drawable/bg_close_nor_light"
app:layout_constraintRight_toRightOf="parent"
@@ -33,7 +32,7 @@
android:id="@+id/roadCrossLiveBg"
android:layout_width="@dimen/dp_498"
android:layout_height="@dimen/dp_280"
android:layout_margin="@dimen/dp_87"
android:layout_margin="@dimen/dp_80"
android:background="@drawable/bg_road_cross_live_light_empty"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
@@ -55,7 +54,7 @@
android:id="@+id/roadCrossLivePlayer"
android:layout_width="@dimen/dp_498"
android:layout_height="@dimen/dp_280"
android:layout_margin="@dimen/dp_87"
android:layout_margin="@dimen/dp_80"
android:visibility="visible"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
@@ -66,7 +65,7 @@
style="?android:attr/progressBarStyleSmall"
android:layout_width="@dimen/dp_55"
android:layout_height="@dimen/dp_55"
android:layout_marginTop="@dimen/dp_210"
android:layout_marginTop="@dimen/dp_190"
android:visibility="visible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"