From ce79c18d09b138d53b06d89d8166cb2a3e423ab3 Mon Sep 17 00:00:00 2001 From: donghongyu-pc Date: Fri, 25 Oct 2024 17:51:52 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.2]=201=E3=80=81=E5=8D=87=E7=BA=A7=E6=8D=A2?= =?UTF-8?q?=E8=82=A4=E6=A1=86=E6=9E=B6SDK=EF=BC=8C=E5=A2=9E=E5=8A=A0=20app?= =?UTF-8?q?:isUseSkin=3D"true"=20=E5=B1=9E=E6=80=A7=E7=94=A8=E6=9D=A5?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E6=8D=A2=E8=82=A4=EF=BC=8C=E9=98=B2=E6=AD=A2?= =?UTF-8?q?=E6=8D=A2=E8=82=A4=E5=AF=B9=E4=BB=A3=E7=A0=81=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=9A=84=E6=95=B0=E6=8D=AE=E3=80=81=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E9=80=A0=E6=88=90=E5=86=B2=E5=88=B7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/charter/fragment/DriverM1Fragment.kt | 8 +++++++- .../res/layout/charter_p_devices_fragment.xml | 3 ++- ...harter_p_novice_guidance_welcome_fragment.xml | 6 ++++-- .../main/res/layout/charter_p_order_fragment.xml | 3 ++- .../main/res/layout/charter_p_order_loading.xml | 1 + .../biz_login_passenger_view_1080x1920.xml | 3 ++- .../biz_login_passenger_view_1920x1080.xml | 3 ++- .../biz_login_passenger_view_2560x1600.xml | 3 ++- .../biz/src/main/res/layout/biz_login_view.xml | 1 + .../com/mogo/och/common/module/utils/QRUtils.kt | 4 ++-- .../main/res/layout/activity_video_player.xml | 3 ++- .../och/offline/fragment/ShuttleFragment.java | 10 +++++++++- .../com/mogo/och/weaknet/ui/qr/QrOpenView.kt | 8 +++++++- .../m2/layout/shuttle_p_m2_view_status_bar.xml | 3 ++- .../src/main/res/layout/taxt_p_bottom_bar.xml | 1 + .../passenger/ui/video/RecyclerVideoAdapter.java | 5 ++++- .../ui/msgbox/adapter/MMsgBoxBubbleAdapter.kt | 9 +++++++-- .../hmi/ui/msgbox/adapter/MMsgBoxListAdapter.kt | 16 ++++++++++++---- .../hmi/ui/widget/ColdStartAgainWindow.kt | 1 - .../src/main/res/layout/item_bus_box_notice.xml | 1 + .../main/res/layout/item_bus_box_operation.xml | 1 + .../src/main/res/layout/item_m_box_notice.xml | 1 + .../src/main/res/layout/item_m_box_operation.xml | 1 + .../main/res/layout/item_m_msg_box_notice.xml | 1 + .../main/res/layout/item_m_msg_box_operation.xml | 1 + .../main/res/layout/item_m_msg_box_summary.xml | 1 + .../main/res/layout/item_m_msg_list_notice.xml | 1 + .../res/layout/item_m_msg_list_operation.xml | 1 + .../main/res/layout/item_m_msg_list_summary.xml | 1 + .../src/main/res/layout/item_msg_box_notice.xml | 1 + .../src/main/res/layout/item_msg_box_summary.xml | 1 + .../main/res/layout/item_msg_bubble_notice.xml | 1 + .../main/res/layout/item_msg_bubble_summary.xml | 1 + .../layout/item_passenger_msg_box_summary.xml | 1 + .../layout/item_passenger_msg_list_notice.xml | 1 + .../layout/item_passenger_msg_list_summary.xml | 1 + .../res/layout/module_main_activity_main.xml | 3 ++- .../src/main/res/layout/road_video_dialog.xml | 1 + .../src/main/res/layout/view_car_info_tab.xml | 1 + .../src/main/res/layout/view_status_bar.xml | 4 +++- .../main/res/layout/window_cold_start_again.xml | 4 ++-- gradle.properties | 2 +- 42 files changed, 96 insertions(+), 27 deletions(-) diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt index 6872a4ffb3..134387c6b0 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt @@ -18,10 +18,12 @@ import com.mogo.eagle.core.data.temp.EventLogout import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.eagle.core.utilcode.util.ImageUtils import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.createQRCodeWithPicture import com.mogo.och.common.module.wigets.BindQRCodeDialog import com.mogo.och.common.module.wigets.OCHCommitDialog +import com.mogo.skin.utils.SkinResources import kotlinx.android.synthetic.main.charter_fragment_driver_m1.driverm1StationName1Tv import kotlinx.android.synthetic.main.charter_fragment_driver_m1.driverm1StationName2Tv import kotlinx.android.synthetic.main.charter_fragment_driver_m1.driverm1_line_name @@ -131,8 +133,12 @@ class DriverM1Fragment : CharterBaseFragment + android:layout_height="wrap_content" + app:isUseSkin="true"/> + android:layout_height="wrap_content" + app:isUseSkin="true"/> + android:layout_height="wrap_content" + app:isUseSkin="true"/> + app:layout_constraintTop_toBottomOf="@+id/iv_loading_wait_driver" + app:isUseSkin="true"/> diff --git a/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1080x1920.xml b/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1080x1920.xml index 52a9ffc56e..3c3ec1ee8c 100644 --- a/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1080x1920.xml +++ b/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1080x1920.xml @@ -5,7 +5,8 @@ android:id="@+id/biz_cl_passenger_main" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/biz_login_passenger_1080x1920"> + android:background="@drawable/biz_login_passenger_1080x1920" + app:isUseSkin="true"> + android:background="@drawable/biz_login_passenger_1920x1080" + app:isUseSkin="true"> + android:background="@drawable/biz_login_passenger_2560x1600" + app:isUseSkin="true"> diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/QRUtils.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/QRUtils.kt index c6c1b37c5a..38f310068d 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/QRUtils.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/QRUtils.kt @@ -104,8 +104,8 @@ fun addLogo(bmQr: Bitmap, bmCenter:Bitmap) :Bitmap?{ try { var canvas = Canvas(bitmap) canvas.drawBitmap(bmQr, 0f, 0f, null) - canvas.drawBitmap(bmCenter, ((bmQrWidth-bmCenterWidth)/2-bmCenterWidth/2).toFloat(), - ((bmQrHeight-bmCenterHeight)/2-bmCenterHeight/2).toFloat(), null) + canvas.drawBitmap(bmCenter, (bmQrWidth/2-bmCenterWidth/2).toFloat(), + (bmQrHeight/2-bmCenterHeight/2).toFloat(), null) canvas.save() canvas.restore() diff --git a/OCH/common/common/src/main/res/layout/activity_video_player.xml b/OCH/common/common/src/main/res/layout/activity_video_player.xml index 6a04f38ead..6ccc3550b8 100644 --- a/OCH/common/common/src/main/res/layout/activity_video_player.xml +++ b/OCH/common/common/src/main/res/layout/activity_video_player.xml @@ -4,7 +4,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/road_video_bg"> + android:background="@drawable/road_video_bg" + app:isUseSkin="true" > + android:layout_height="@dimen/dp_25" + app:isUseSkin="true"/> diff --git a/OCH/taxi/pcommon/src/main/res/layout/taxt_p_bottom_bar.xml b/OCH/taxi/pcommon/src/main/res/layout/taxt_p_bottom_bar.xml index 9c490d554a..5374450d04 100644 --- a/OCH/taxi/pcommon/src/main/res/layout/taxt_p_bottom_bar.xml +++ b/OCH/taxi/pcommon/src/main/res/layout/taxt_p_bottom_bar.xml @@ -124,6 +124,7 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:bottomShowIcon = "false" + app:isUseSkin="true" android:layout_width="wrap_content" android:layout_height="match_parent"/> diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/RecyclerVideoAdapter.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/RecyclerVideoAdapter.java index 490a9eecec..c895d429ae 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/RecyclerVideoAdapter.java +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/RecyclerVideoAdapter.java @@ -1,6 +1,7 @@ package com.mogo.och.unmanned.passenger.ui.video; import android.content.Context; +import android.graphics.drawable.Drawable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -14,6 +15,7 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.och.common.module.wigets.media.MediaItem; import com.mogo.och.unmanned.passenger.bean.TaxiPassengerVideoPlay; import com.mogo.och.unmanned.taxi.passenger.R; +import com.mogo.skin.utils.SkinResources; import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack; import java.util.List; @@ -71,9 +73,10 @@ public class RecyclerVideoAdapter extends RecyclerView.Adapter() { @@ -66,11 +67,15 @@ class MMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView.Adapter is BubbleNoticeHolder -> { data?.let { val noticeFrCloudMsg = it[position].msgBoxBean.bean as NoticeFrCloudMsg + + val placeholderDrawable = + SkinResources.getInstance().getDrawable(R.drawable.icon_passenger_operation) + if(noticeFrCloudMsg.type == 0){ val noticeNormalData = noticeFrCloudMsg.noticeNormalData holder.tvMNoticeTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat()) holder.tvMNoticeContent.text = noticeNormalData?.content - GlideApp.with(activity).load(noticeNormalData?.imageUrl).placeholder(R.drawable.icon_passenger_operation) + GlideApp.with(activity).load(noticeNormalData?.imageUrl).placeholder(placeholderDrawable) .optionalTransform( GlideRoundedCornersTransform( 20f, @@ -85,7 +90,7 @@ class MMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView.Adapter val noticeTrafficStylePushData = noticeFrCloudMsg.trafficPushData holder.tvMNoticeTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat()) holder.tvMNoticeContent.text = noticeTrafficStylePushData?.content - GlideApp.with(activity).load(noticeTrafficStylePushData?.poiImgUrl).placeholder(R.drawable.icon_passenger_operation) + GlideApp.with(activity).load(noticeTrafficStylePushData?.poiImgUrl).placeholder(placeholderDrawable) .optionalTransform( GlideRoundedCornersTransform( 20f, diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MMsgBoxListAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MMsgBoxListAdapter.kt index ac948a48ae..0681822011 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MMsgBoxListAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MMsgBoxListAdapter.kt @@ -10,15 +10,20 @@ import androidx.core.content.res.ResourcesCompat import androidx.recyclerview.widget.RecyclerView import com.mogo.eagle.core.data.enums.DataSourceType import com.mogo.eagle.core.data.enums.EventTypeEnumNew -import com.mogo.eagle.core.data.msgbox.* +import com.mogo.eagle.core.data.msgbox.MsgBoxBean +import com.mogo.eagle.core.data.msgbox.MsgBoxType +import com.mogo.eagle.core.data.msgbox.NoticeFrCloudMsg +import com.mogo.eagle.core.data.msgbox.OperationMsg +import com.mogo.eagle.core.data.msgbox.V2XMsg import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxEventListenerManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.ui.widget.ExpandableTextView +import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp import com.mogo.eagle.core.utilcode.mogo.glide.transform.GlideRoundedCornersTransform import com.mogo.eagle.core.utilcode.util.TimeUtils import com.mogo.eagle.core.utilcode.util.TimeUtils.getHourMinFormat -import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp +import com.mogo.skin.utils.SkinResources class MMsgBoxListAdapter(private val activity: Activity): RecyclerView.Adapter() { @@ -60,11 +65,14 @@ class MMsgBoxListAdapter(private val activity: Activity): RecyclerView.Adapter { data?.let { val noticeFrCloudMsg = it[position].bean as NoticeFrCloudMsg + val placeholderDrawable = + SkinResources.getInstance().getDrawable(R.drawable.icon_notice_default) + if(noticeFrCloudMsg.type == 0){ val noticeNormalData = noticeFrCloudMsg.noticeNormalData holder.tvMNoticeTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat()) holder.tvMNoticeContent.text = noticeNormalData?.content - GlideApp.with(activity).load(noticeNormalData?.imageUrl).placeholder(R.drawable.icon_notice_default) + GlideApp.with(activity).load(noticeNormalData?.imageUrl).placeholder(placeholderDrawable) .optionalTransform( GlideRoundedCornersTransform( 20f, @@ -79,7 +87,7 @@ class MMsgBoxListAdapter(private val activity: Activity): RecyclerView.Adapter + app:layout_constraintTop_toTopOf="parent" + app:isUseSkin="true" /> + android:contentDescription="@null" + app:isUseSkin="true"/> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/window_cold_start_again.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/window_cold_start_again.xml index bf60752ba5..5aff769366 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/window_cold_start_again.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/window_cold_start_again.xml @@ -10,13 +10,13 @@ android:id="@+id/svp_cold_start" android:layout_width="match_parent" android:layout_height="match_parent" + app:isUseSkin="true" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + android:layout_height="match_parent" /> \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 4c0bce9973..c78645b073 100644 --- a/gradle.properties +++ b/gradle.properties @@ -80,7 +80,7 @@ MOGO_LOCATION_VERSION=1.4.7.42 # 远程通讯模块 MOGO_TELEMATIC_VERSION=1.4.7.42 # 动态换肤SDK -MOGO_SKIN_VERSION=1.4.7.49.14-debug +MOGO_SKIN_VERSION=1.4.7.49.18-debug ######## MogoAiCloudSDK Version ######## # 自研地图 MAP_SDK_VERSION=3.4.1.18