diff --git a/OCH/README.md b/OCH/README.md index 8b20c7f940..cb815d880b 100644 --- a/OCH/README.md +++ b/OCH/README.md @@ -1,7 +1,13 @@ # 网约车(Online Car Hailing) -1. mogo-och-bus：Bus司机端（Bus） -2. mogo-och-bus-passenger：Bus乘客端（BusPassenger） -3. mogo-och-taxi：Taxi司机端（Taxi） -4. mogo-och-taxi-passenger：Taxi乘客端（TaxiPassenger） -5. mogo-och-noop：空实现，用于独立鹰眼打包 -6. mogo-och-sweeper: 清扫车（Sweeper） \ No newline at end of file +1. mogo-och-bus： 公交车模式司机端 +2. mogo-och-bus-passenger： 公交车模式乘客端 +3. mogo-och-charter 包车模式司机端 +4. mogo-och-charter-passenger 包车模式乘客端 +5. mogo-och-common-module 公用代码 +6. mogo-och-data 数据 +7. mogo-och-noop： 空实现，用于独立鹰眼打包 +8. mogo-och-shuttle 接驳模式司机端 +9. mogo-och-shuttle-passenger 接驳模式乘客屏 +10. mogo-och-sweeper: 清扫车 +11. mogo-och-taxi： 出租车模式司机端 +12. mogo-och-taxi-passenger： 出租车乘客端 \ No newline at end of file diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml index 608ac59429..06f31d335e 100644 --- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml +++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml @@ -161,4 +161,13 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toLeftOf="@+id/bus_p_route_panel" /> + + \ No newline at end of file diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt index b7e352c7b8..8d12623b3f 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt +++ b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt @@ -177,7 +177,7 @@ class PM2DrivingInfoFragment : context?.let { auto_tv.setTextColor(ContextCompat.getColor(it,R.color.m2_p_white_color)) } context?.let { auto_tv.background = ContextCompat.getDrawable(it,R.drawable.auto_button_bg) } }else{ - context?.let { auto_tv.setTextColor(ContextCompat.getColor(it,R.color.m2_button_auto_tv_color)) } + context?.let { auto_tv.setTextColor(ContextCompat.getColor(it,R.color.shuttle_color_7094ad)) } context?.let { auto_tv.background = ContextCompat.getDrawable(it,R.drawable.bg_p_m2_auto) } } } diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt index 959ab497d2..9408aba57d 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt +++ b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt @@ -20,7 +20,7 @@ class AdvanceGSYVideoPlayer: StandardGSYVideoPlayer { init { hideWidget() - GSYVideoType.setShowType(GSYVideoType.SCREEN_MATCH_FULL) + GSYVideoType.setShowType(GSYVideoType.SCREEN_TYPE_16_9) GSYVideoType.setRenderType(GSYVideoType.GLSURFACE) } diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt index 3a5693e80a..932ad16fe8 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt +++ b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt @@ -30,6 +30,11 @@ class AdvanceVideoView @JvmOverloads constructor( private var videoRelativeLayout: RelativeLayout? = null private var cacheImage: ImageView? = null + private var connerTopLeft: ImageView? = null + private var connerTopRight: ImageView? = null + private var connerBottomLeft: ImageView? = null + private var connerBottomRight: ImageView? = null + private var videoViewPlayer: AdvanceGSYVideoPlayer? = null private var gsyVideoOptionBuilder: GSYVideoOptionBuilder? = null private var mOnCompletionListener: GSYSampleCallBack? = null @@ -57,24 +62,56 @@ class AdvanceVideoView @JvmOverloads constructor( private fun initVideoView() { videoRelativeLayout = RelativeLayout(context) - addView(videoRelativeLayout, LayoutParams(-1, -1)) + val outLayout = LayoutParams(-1, -1) + addView(videoRelativeLayout,outLayout) if (videoViewPlayer === null) { //视频播放控件 videoViewPlayer = AdvanceGSYVideoPlayer(context) } - var layoutParams = LayoutParams(-1, -1) + val layoutParams = LayoutParams(-1, -1) //设置videoview占满父view播放 layoutParams.addRule(ALIGN_PARENT_LEFT) layoutParams.addRule(ALIGN_PARENT_RIGHT) layoutParams.addRule(ALIGN_PARENT_TOP) layoutParams.addRule(ALIGN_PARENT_BOTTOM) - val dp2px = AutoSizeUtils.dp2px(context, 16f) - videoRelativeLayout?.outlineProvider = TextureVideoViewOutlineProvider(dp2px.toFloat()) - videoRelativeLayout?.clipToOutline = true videoRelativeLayout?.addView(videoViewPlayer, layoutParams) + + val imageSize = AutoSizeUtils.dp2px(context, 25f) + if(connerTopLeft==null){ + connerTopLeft = ImageView(context) + connerTopLeft?.setImageResource(R.drawable.m2_video_top_left) + } + val layoutParentTopLeft = LayoutParams(imageSize, imageSize) + layoutParentTopLeft.addRule(ALIGN_PARENT_TOP) + layoutParentTopLeft.addRule(ALIGN_PARENT_LEFT) + videoRelativeLayout?.addView(connerTopLeft, layoutParentTopLeft) + if(connerTopRight==null){ + connerTopRight = ImageView(context) + connerTopRight?.setImageResource(R.drawable.m2_video_top_right) + } + val layoutParentTopRight = LayoutParams(imageSize, imageSize) + layoutParentTopRight.addRule(ALIGN_PARENT_TOP) + layoutParentTopRight.addRule(ALIGN_PARENT_RIGHT) + videoRelativeLayout?.addView(connerTopRight, layoutParentTopRight) + if(connerBottomLeft==null){ + connerBottomLeft = ImageView(context) + connerBottomLeft?.setImageResource(R.drawable.m2_video_bottom_left) + } + val layoutParentBottomLeft = LayoutParams(imageSize, imageSize) + layoutParentBottomLeft.addRule(ALIGN_PARENT_BOTTOM) + layoutParentBottomLeft.addRule(ALIGN_PARENT_LEFT) + videoRelativeLayout?.addView(connerBottomLeft, layoutParentBottomLeft) + if(connerBottomRight==null){ + connerBottomRight = ImageView(context) + connerBottomRight?.setImageResource(R.drawable.m2_video_bottom_right) + } + val layoutParentBottomRight = LayoutParams(imageSize, imageSize) + layoutParentBottomRight.addRule(ALIGN_PARENT_RIGHT) + layoutParentBottomRight.addRule(ALIGN_PARENT_BOTTOM) + videoRelativeLayout?.addView(connerBottomRight, layoutParentBottomRight) } fun setVideoPath(path: String,cacheImageUrl: String) { diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/amap_custom_corner_m2.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/amap_custom_corner_m2.png new file mode 100644 index 0000000000..fd161d3dd6 Binary files /dev/null and b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/amap_custom_corner_m2.png differ diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/bg_driving_info_image.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/bg_driving_info_image.png new file mode 100644 index 0000000000..a829d5b88d Binary files /dev/null and b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/bg_driving_info_image.png differ diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_amap_arrived_road.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_amap_arrived_road.png new file mode 100644 index 0000000000..f4d80f4cc7 Binary files /dev/null and b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_amap_arrived_road.png differ diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_amap_arriving_road.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_amap_arriving_road.png new file mode 100644 index 0000000000..a9aae488fb Binary files /dev/null and b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_amap_arriving_road.png differ diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_car_icon.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_car_icon.png index b3a0641e34..b9c841cc83 100644 Binary files a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_car_icon.png and b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_car_icon.png differ diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_sky_bg.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_sky_bg.png index c28959514e..3cc04452cc 100644 Binary files a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_sky_bg.png and b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_sky_bg.png differ diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_left.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_left.png new file mode 100644 index 0000000000..539077b16b Binary files /dev/null and b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_left.png differ diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_right.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_right.png new file mode 100644 index 0000000000..7b76bef075 Binary files /dev/null and b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_right.png differ diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_left.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_left.png new file mode 100644 index 0000000000..8c3e9278f8 Binary files /dev/null and b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_left.png differ diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_right.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_right.png new file mode 100644 index 0000000000..7e245de50c Binary files /dev/null and b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_right.png differ diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_card_split.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_card_split.png index 6bd8fb0f60..5446226be7 100644 Binary files a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_card_split.png and b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_card_split.png differ diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_line_name.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_line_name.png index e395ed8419..beed2f2ad2 100644 Binary files a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_line_name.png and b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_line_name.png differ diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml index 66b8f6175e..2dbbcac38a 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml +++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml @@ -19,17 +19,28 @@ app:mapStylePath="@string/m2_over_map_style_path" app:resetDrawableMarginBottom="@dimen/dp_54" app:resetDrawableMarginRight="@dimen/dp_34" + app:compassDrawable="@drawable/amap_custom_corner_m2" + app:arrivedDrawable="@drawable/m2_amap_arrived_road" + app:unArrivedDrawable="@drawable/m2_amap_arriving_road" + app:mapTilt="0" + app:leftPadding="200" app:startPointDrawable="@drawable/m2_map_start_icon" /> - + + - - + app:layout_constraintWidth_percent="0.5"/> + app:layout_constraintTop_toTopOf="@+id/viewTextClockHouerMin" + app:layout_constraintBottom_toBottomOf="@+id/viewTextClockHouerMin"/> diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml index b14a3b9ec8..a40c28419a 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml +++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml @@ -41,10 +41,10 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" android:layout_marginTop="@dimen/dp_61" - android:layout_marginStart="@dimen/dp_20" - android:layout_marginEnd="@dimen/dp_20" + android:layout_marginStart="@dimen/dp_25" + android:layout_marginEnd="@dimen/dp_25" app:blurRadius="@dimen/dp_15" - app:shadowColor="#80000000" + app:shadowColor="#802F3E67" app:shadowRadius="@dimen/dp_16" app:shadow_position="outer" app:xOffset="0dp" @@ -54,8 +54,8 @@ - + + \ No newline at end of file diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml index 3d073b442c..ec59b620fe 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml +++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml @@ -35,4 +35,5 @@ #B9E7C0 #43CEFE #1466FB + #7094AD \ No newline at end of file diff --git a/app/config/tempConfig.json b/app/config/tempConfig.json index 9bb07020f0..edfa2e2ead 100644 --- a/app/config/tempConfig.json +++ b/app/config/tempConfig.json @@ -67,7 +67,7 @@ "shuttlepassengerm2": { "ads": [ { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1678946244305/dalim2.mp4", + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210902933/erhaim2.mp4", "type": 1, "cacheImgPath": "", "title": "1" @@ -143,7 +143,7 @@ "shuttlepassengerm2": { "ads": [ { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1678946244305/dalim2.mp4", + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210902933/erhaim2.mp4", "type": 1, "cacheImgPath": "", "title": "1" @@ -155,7 +155,7 @@ "shuttlepassenger": { "ads": [ { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774847276/yangmadao_video.mp4", + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210971943/yangmadou.mp4", "type": 1, "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774790614/yangmadao_photo.jpg", "title": "1" @@ -165,7 +165,7 @@ "shuttlepassengerm2": { "ads": [ { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1678946244305/dalim2.mp4", + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210902933/erhaim2.mp4", "type": 1, "cacheImgPath": "", "title": "1" diff --git a/app/productFlavors/fOchShuttlePassengerM2.gradle b/app/productFlavors/fOchShuttlePassengerM2.gradle index 4fdff5c50d..e72a315ff1 100644 --- a/app/productFlavors/fOchShuttlePassengerM2.gradle +++ b/app/productFlavors/fOchShuttlePassengerM2.gradle @@ -31,7 +31,7 @@ project.android.productFlavors { buildConfigField 'int', 'GPS_PROVIDER', "1" // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Passenger_M2\"" + buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Shuttle_Passenger_M2\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\"" // 构建的是否是演示（美化）模式 diff --git a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt index 47d371c370..9554e1abcb 100644 --- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt @@ -96,11 +96,14 @@ object ConfigStartUp { HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache } else if (AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)) { HdMapBuildConfig.currentCarVrIconRes = R.raw.huanwei - } else if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)){ + } + if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)){ HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache - } else if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)){ + } + if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)){ HdMapBuildConfig.currentCarVrIconRes = R.raw.m1 - }else if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) { + } + if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) { HdMapBuildConfig.currentCarVrIconRes = R.raw.m2 } diff --git a/gradle.properties b/gradle.properties index 9a78d0c850..0df229aa87 100644 --- a/gradle.properties +++ b/gradle.properties @@ -63,7 +63,7 @@ BIZCONFIG_VERSION=1.3.2 SERVICE_BIZ_VERSION=1.2.4 ################ 外部依赖引用 ################ # loglib -LOGLIB_VERSION=1.5.22 +LOGLIB_VERSION=1.5.25 ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION MOGO_NETWORK_VERSION=1.4.6.6 diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java index ed9fa04b01..db7f17f988 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java @@ -143,6 +143,9 @@ public class AMapWrapper implements IMogoMap { if (!checkAMap()) { return; } + if(optionsArrayList == null || optionsArrayList.size() == 0){ + return; + } ArrayList markerOptionsArrayList = new ArrayList<>(); optionsArrayList.forEach((s, trackedObject) -> { MarkerSimpleData markerOptions = ObjectUtils.fromAiData(trackedObject);