diff --git a/.java-version b/.java-version new file mode 100644 index 0000000000..af797d5143 --- /dev/null +++ b/.java-version @@ -0,0 +1 @@ +11.0.16 diff --git a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt index b547098832..47f941268c 100644 --- a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt +++ b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt @@ -36,6 +36,7 @@ import com.mogo.och.common.module.biz.login.LoginStatusManager import com.mogo.och.common.module.biz.provider.CommonService import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager +import me.jessyan.autosize.utils.AutoSizeUtils /** * 网约车小巴业务实现入口 @@ -262,7 +263,7 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback { statusBarView.tag = "status_bar" val statusBarLP = FrameLayout.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, - ViewGroup.LayoutParams.WRAP_CONTENT, + AutoSizeUtils.dp2px(it, 72.0f), ) statusBarLP.topMargin = 0 statusBarLP.gravity = Gravity.TOP diff --git a/build.gradle b/build.gradle index 1bd7d0f15e..edb7a25099 100644 --- a/build.gradle +++ b/build.gradle @@ -6,9 +6,10 @@ buildscript { apply from: rootProject.file('gradle/ext.gradle') repositories { mavenLocal() - maven { url 'https://nexus.zhidaoauto.com/repository/maven-snapshot/' } - maven { url 'https://nexus.zhidaoauto.com/repository/maven-releases/' } - maven { url 'https://nexus.zhidaoauto.com/repository/maven-public/' } + maven { url 'http://127.0.0.1:9921/nexus/content/groups/zhidao_group/' } +// maven { url 'https://nexus.zhidaoauto.com/repository/maven-snapshot/' } +// maven { url 'https://nexus.zhidaoauto.com/repository/maven-releases/' } +// maven { url 'https://nexus.zhidaoauto.com/repository/maven-public/' } maven { url 'https://storage.zego.im/maven' } maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' } maven { url 'https://maven.aliyun.com/repository/public' } @@ -52,8 +53,9 @@ buildscript { allprojects { repositories { mavenLocal() - maven { url 'http://nexus.zhidaoauto.com/repository/maven-releases/' } - maven { url 'http://nexus.zhidaoauto.com/repository/maven-public/' } + maven { url 'http://127.0.0.1:9921/nexus/content/groups/zhidao_group/' } +// maven { url 'https://nexus.zhidaoauto.com/repository/maven-releases/' } +// maven { url 'https://nexus.zhidaoauto.com/repository/maven-public/' } maven { url 'https://storage.zego.im/maven' } maven { url 'https://maven.aliyun.com/repository/public' } maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/model/StatusModel.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/model/StatusModel.kt index cc0e2eeefa..0bef99c5a8 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/model/StatusModel.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/model/StatusModel.kt @@ -15,10 +15,10 @@ internal class StatusModel : ViewModel() { val DEFAULTS = Pair(null, ArrayList().also { it += OverViewStatus() it += FSMStatus(FSMStateCode.UnKnown, "") + it += RTKStatus("", -1) it += IpcStatus(CallerAutoPilotStatusListenerManager.isConnect()) it += CanStatus(false) // it += TracingStatus(UNKNOWN) - it += RTKStatus("", -1) // it += NetStatus(false) // it += GpsStatus(enabled = false, isGranted = false) it += SteerStatus(0f) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt index f98d70fe28..7d27a8bda0 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt @@ -61,7 +61,7 @@ internal class StatusView(private val model: StatusModel, ctx: Context): Constra itx.addItemDecoration( CommonDividerItemDecoration.Builder() .spanCountTBCare(false) - .horizontalInnerSpace(10.PX) + .horizontalInnerSpace(30.PX) .build() ) } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt index 0e0b0ccb6b..68e541a9da 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt @@ -9,8 +9,6 @@ import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.utilcode.kotlin.onClick -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA import com.zhjt.mogo_core_function_devatools.R import com.zhjt.mogo_core_function_devatools.R.drawable import com.zhjt.mogo_core_function_devatools.status.entity.CanStatus @@ -21,58 +19,53 @@ import com.zhjt.mogo_core_function_devatools.status.entity.IpcStatus import com.zhjt.mogo_core_function_devatools.status.entity.OverViewStatus import com.zhjt.mogo_core_function_devatools.status.entity.RTKStatus import com.zhjt.mogo_core_function_devatools.status.entity.Status -import com.zhjt.mogo_core_function_devatools.status.entity.TracingStatus -import com.zhjt.mogo_core_function_devatools.status.entity.TracingStatus.Tracing.MAP_DATA_EXIST -import com.zhjt.mogo_core_function_devatools.status.entity.TracingStatus.Tracing.MAP_DATA_NOT_EXIST -import com.zhjt.mogo_core_function_devatools.status.entity.TracingStatus.Tracing.MAP_TRA_TYPE -import com.zhjt.mogo_core_function_devatools.status.entity.TracingStatus.Tracing.ROUTE_FAILED -import com.zhjt.mogo_core_function_devatools.status.entity.TracingStatus.Tracing.ROUTE_LOADED -import com.zhjt.mogo_core_function_devatools.status.entity.TracingStatus.Tracing.TRACK_FINDED -import com.zhjt.mogo_core_function_devatools.status.entity.TracingStatus.Tracing.TRACK_LOADED -import com.zhjt.mogo_core_function_devatools.status.entity.TracingStatus.Tracing.TRACK_LOAD_FAIL -import com.zhjt.mogo_core_function_devatools.status.entity.TracingStatus.Tracing.TRACK_NOT_EXIST -import com.zhjt.mogo_core_function_devatools.status.entity.TracingStatus.Tracing.UNKNOWN import com.zhjt.mogo_core_function_devatools.status.ui.adapter.StatusAdapter.StatusViewHolder import me.jessyan.autosize.AutoSizeCompat -internal class StatusAdapter(val ctx: Context, var data: List): RecyclerView.Adapter() { +internal class StatusAdapter(val ctx: Context, var data: List) : RecyclerView.Adapter() { companion object { - const val TAG = "StatusAdapter" + private const val ITEM_TYPE_NORMAL = 1 + private const val ITEM_TYPE_OVER_VIEW = 2 } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): StatusViewHolder = - StatusViewHolder(LayoutInflater.from(ctx).inflate(R.layout.layout_status_bar_item, parent, false)) + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): StatusViewHolder { + if (viewType == ITEM_TYPE_NORMAL) { + return NormalViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.layout_status_bar_item, parent, false)) + } + return OverViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.layout_status_bar_over_item, parent, false)) + } override fun onBindViewHolder(holder: StatusViewHolder, position: Int) { AutoSizeCompat.autoConvertDensityOfGlobal(holder.itemView.resources) holder.bind(data[position]) } + override fun getItemViewType(position: Int): Int { + if (position < 0 || position >= data.size) { + return super.getItemViewType(position) + } + val status = data[position] + if (status is OverViewStatus) { + return ITEM_TYPE_OVER_VIEW + } + return ITEM_TYPE_NORMAL + } + override fun getItemCount(): Int = data.size - internal class StatusViewHolder(item: View) : RecyclerView.ViewHolder(item) { + internal abstract class StatusViewHolder(item: View) : RecyclerView.ViewHolder(item) { + abstract fun bind(status: Status) + } + + internal class NormalViewHolder(item: View) : StatusViewHolder(item) { private val iv: ImageView by lazy { itemView.findViewById(R.id.iv) } - fun bind(status: Status) { - if (status !is OverViewStatus) { - itemView.setOnClickListener(null) - itemView.isClickable = false - if (iv.drawable != null) { - iv.setImageDrawable(null) - } - } else { - if (iv.background != null) { - iv.background = null - } - itemView.onClick { - CallerHmiManager.showStatusSummaryDialog() - } - } - when(status) { + override fun bind(status: Status) { + when (status) { is IpcStatus -> { if (status.enabled) { iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_ipc_enable) @@ -80,6 +73,7 @@ internal class StatusAdapter(val ctx: Context, var data: List): Recycler iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_ipc_disable) } } + is CanStatus -> { if (status.enabled) { iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_can_enable) @@ -87,152 +81,94 @@ internal class StatusAdapter(val ctx: Context, var data: List): Recycler iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_can_disable) } } -// is NetStatus -> { -// if (status.enabled) { -// iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_net_enable) + +// is GpsStatus -> { +// if (status.enabled && status.isGranted) { +// iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_gps_enable) // } else { -// iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_net_disable) +// iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_gps_disable) // } // } - is GpsStatus -> { - if (status.enabled && status.isGranted) { - iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_gps_enable) - } else { - iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_gps_disable) - } - } - is TracingStatus -> { - when(status.state) { - MAP_DATA_NOT_EXIST, MAP_DATA_EXIST, MAP_TRA_TYPE, ROUTE_FAILED, TRACK_LOAD_FAIL, TRACK_NOT_EXIST, TRACK_FINDED, UNKNOWN -> { - iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_trace_unkown) - } - TRACK_LOADED -> { - iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_track_enable) - } - ROUTE_LOADED -> { - iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_route_enable) - } - } - } + +// is TracingStatus -> { +// when (status.state) { +// MAP_DATA_NOT_EXIST, MAP_DATA_EXIST, MAP_TRA_TYPE, ROUTE_FAILED, TRACK_LOAD_FAIL, TRACK_NOT_EXIST, TRACK_FINDED, UNKNOWN -> { +// iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_trace_unkown) +// } +// +// TRACK_LOADED -> { +// iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_track_enable) +// } +// +// ROUTE_LOADED -> { +// iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_route_enable) +// } +// } +// } + is RTKStatus -> { - when(status.desc) { - "RTK" -> - when(status.state) { - 0 -> iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_rtk_good) - 1 -> iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_rtk_not_credible) - 2 -> iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_rtk_inaccurate) - else -> iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_rtk_error) - } - "SLAM" -> - iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_slam_good) - "VSLAM" -> - iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_vslam_good) - "VAL" -> - iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_val_good) - else -> - iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_rtk_unknow) + when (status.desc) { + "RTK" -> when (status.state) { + 0 -> iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_rtk_good) + 1 -> iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_rtk_not_credible) + 2 -> iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_rtk_inaccurate) + else -> iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_rtk_error) + } + + "SLAM" -> iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_slam_good) + "VSLAM" -> iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_vslam_good) + "VAL" -> iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_val_good) + else -> iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_rtk_unknow) } } + is FSMStatus -> { when (status.state) { FSMStateCode.UnKnown -> { iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_fsm_not_connected) CallerHmiManager.dismissFSMStatusDetailWindow() } + FSMStateCode.NotExist -> { iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_fsm_not_exist) CallerHmiManager.dismissFSMStatusDetailWindow() } + FSMStateCode.ExistNormal -> { iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_fsm_normal) CallerHmiManager.dismissFSMStatusDetailWindow() } + FSMStateCode.ExistError -> { iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_fsm_error) CallerHmiManager.showFSMStatusDetailWindow("FSM异常：", "#FF3B3B", status.desc) } } } - is OverViewStatus -> { - if (status.hasException) { - iv.scaleType = ImageView.ScaleType.FIT_CENTER - iv.setImageResource(drawable.icon_red_warning) - } else { - iv.scaleType = ImageView.ScaleType.FIT_CENTER - iv.setImageResource(drawable.icon_grey_warning) - } - } + + else -> throw IllegalStateException() + } + } + } + + internal class OverViewHolder(item: View) : StatusViewHolder(item) { + + private val iv: ImageView by lazy { + itemView.findViewById(R.id.iv) + } + + init { + itemView.onClick { + CallerHmiManager.showStatusSummaryDialog() } } - private fun getText(status: Status): String = when (status) { - is CanStatus -> "CAN:${if (status.enabled) "状态正常" else "非正常连接"}" - is GpsStatus -> "GPS:${if (status.enabled) "状态正常" else "非正常连接"}" - is IpcStatus -> "工控机:${if (status.enabled) "状态正常" else "非正常连接"}" -// is NetStatus -> "WIFI:${ if (status.enabled) "${status.name}" else "非正常连接" }" - is RTKStatus -> when (status.desc) { - "RTK" -> - when (status.state) { - 0 -> "RTK定位，状态良好" - 1 -> "RTK定位，定位不可信" - 2 -> "RTK定位，误差增大到米级" - else -> "RTK定位，状态异常" - } - - "SLAM" -> - "SLAM定位，状态良好" - - else -> - "定位异常" - } - - is FSMStatus -> when (status.state) { - FSMStateCode.UnKnown -> { - "FSM:未知" - } - FSMStateCode.NotExist -> { - "FSM:无FSM模块" - } - FSMStateCode.ExistNormal -> { - "FSM:状态正常" - } - FSMStateCode.ExistError -> { - "FSM:状态异常" - } - } - - is TracingStatus -> { - val extra = status.state.extra - val extraDesc = - if (extra != null && extra.isNotEmpty()) extra.values.joinToString(",") else "" - CallerLogger.d( - "$M_DEVA$TAG", - "traceing_state: $status -> extra: $extraDesc :: extra: $extra" - ) - when (status.state) { - //"轨迹类型:${ if (status.state == TRACK_LOADED) "循迹" else if (status.state == ROUTE_LOADED) "自主算路" else "暂无轨迹" }" - MAP_TRA_TYPE -> { - "暂无轨迹" - } - - MAP_DATA_EXIST -> "地图数据存在,正在加载${if (extraDesc.isNotEmpty()) "\n[$extraDesc]" else ""}" - MAP_DATA_NOT_EXIST -> "地图数据不存在${if (extraDesc.isNotEmpty()) "\n[$extraDesc]" else ""}" - TRACK_FINDED -> "轨迹类型:循迹(已找到轨迹)${if (extraDesc.isNotEmpty()) "\n[$extraDesc]" else ""}" - TRACK_LOADED -> "轨迹类型:循迹(加载成功)${if (extraDesc.isNotEmpty()) "\n[$extraDesc]" else ""}" - TRACK_NOT_EXIST -> "轨迹类型:循迹(未找到轨迹)${if (extraDesc.isNotEmpty()) "\n[$extraDesc]" else ""}" - TRACK_LOAD_FAIL -> "轨迹类型:循迹(加载失败)${if (extraDesc.isNotEmpty()) "\n[$extraDesc]" else ""}" - ROUTE_LOADED -> "轨迹类型:自主算路(加载成功)${if (extraDesc.isNotEmpty()) "\n[$extraDesc]" else ""}" - ROUTE_FAILED -> "轨迹类型:自主算路(加载失败)${if (extraDesc.isNotEmpty()) "\n[$extraDesc]" else ""}" - UNKNOWN -> "暂无轨迹" - } - } - - is OverViewStatus -> { - "" - } - - else -> { - throw AssertionError() + override fun bind(status: Status) { + val over = status as OverViewStatus + if (over.hasException) { + iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_red_warning) + } else { + iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_grey_warning) } } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_default.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_default.png new file mode 100644 index 0000000000..2912895195 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_default.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_disable.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_disable.png index 7a40e74502..b340e706c6 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_disable.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_disable.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_enable.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_enable.png index 5a8ba8f113..73555b004c 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_enable.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_can_enable.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_default.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_default.png new file mode 100644 index 0000000000..c64eaa6aea Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_default.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_disable.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_disable.png index 8af610ac55..dbfc238d11 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_disable.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_disable.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_enable.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_enable.png index 679d995098..8616b95804 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_enable.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_ipc_enable.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_error.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_error.png index 34b284c771..b0737d833d 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_error.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_error.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_good.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_good.png index 389ca405d9..12b6f8bde5 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_good.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_good.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_inaccurate.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_inaccurate.png index a70bddcd7b..c40abd4e80 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_inaccurate.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_inaccurate.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_not_credible.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_not_credible.png index 18de44bf02..ec1d519ec0 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_not_credible.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_not_credible.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_unknow.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_unknow.png index 8b7e063f06..092021d58f 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_unknow.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_rtk_unknow.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_slam_good.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_slam_good.png index 7669036a6a..dd93b5dd0a 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_slam_good.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_slam_good.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_val_good.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_val_good.png index e44c976c38..e2da014afb 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_val_good.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_val_good.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_vslam_good.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_vslam_good.png index 8e633dea82..66996a6da4 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_vslam_good.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_dev_status_vslam_good.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_grey_warning.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_grey_warning.png index 3a94c8d5e4..e2675380ad 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_grey_warning.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_grey_warning.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_red_warning.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_red_warning.png index ad91fee6fb..03f3d54296 100644 Binary files a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_red_warning.png and b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable-xhdpi/icon_red_warning.png differ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar_item.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar_item.xml index d3a2d42858..5112fc0870 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar_item.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar_item.xml @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar_over_item.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar_over_item.xml new file mode 100644 index 0000000000..7faa8a0dfa --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar_over_item.xml @@ -0,0 +1,5 @@ + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DemoModeView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DemoModeView.kt index 393bed9ab7..6598d91282 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DemoModeView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/DemoModeView.kt @@ -24,7 +24,7 @@ class DemoModeView @JvmOverloads constructor( init { LayoutInflater.from(context).inflate(R.layout.view_demo_mode, this, true) - background = this.context.getDrawable(R.drawable.demo_mode) + background = this.context.getDrawable(R.drawable.icon_status_demo_close) setOnClickListener { HmiActionLog.hmiAction("SOP 演示模式开关", !FunctionBuildConfig.isDemoMode) FunctionBuildConfig.isDemoMode = !FunctionBuildConfig.isDemoMode @@ -50,9 +50,9 @@ class DemoModeView @JvmOverloads constructor( override fun updateFuncMode(tag: String, boolean: Boolean) { if(tag == FUNC_MODE_DEMO){ background = if(FunctionBuildConfig.isDemoMode){ - this.context.getDrawable(R.drawable.demo_mode_open) + this.context.getDrawable(R.drawable.icon_status_demo_open) }else{ - this.context.getDrawable(R.drawable.demo_mode) + this.context.getDrawable(R.drawable.icon_status_demo_close) } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RainModeView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RainModeView.kt index 141144dcab..09a4ad98fb 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RainModeView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RainModeView.kt @@ -25,7 +25,7 @@ class RainModeView @JvmOverloads constructor( init { LayoutInflater.from(context).inflate(R.layout.view_demo_mode, this, true) - background = this.context.getDrawable(R.drawable.rain_mode) + background = this.context.getDrawable(R.drawable.icon_status_yutian_close) setOnClickListener { HmiActionLog.hmiAction("SOP 雨天模式开关", !FunctionBuildConfig.isRainMode) FunctionBuildConfig.isRainMode = !FunctionBuildConfig.isRainMode @@ -48,9 +48,9 @@ class RainModeView @JvmOverloads constructor( if(tag == FUNC_MODE_RAIN){ ThreadUtils.runOnUiThread { background = if(FunctionBuildConfig.isRainMode){ - this.context.getDrawable(R.drawable.rain_mode_open) + this.context.getDrawable(R.drawable.icon_status_yutian_open) }else{ - this.context.getDrawable(R.drawable.rain_mode) + this.context.getDrawable(R.drawable.icon_status_yutian_close) } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/StatusBarView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/StatusBarView.kt index 21b51ec854..87dae58fdd 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/StatusBarView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/StatusBarView.kt @@ -2,10 +2,13 @@ package com.mogo.eagle.core.function.hmi.ui.widget import android.annotation.SuppressLint import android.content.Context +import android.graphics.Color +import android.graphics.drawable.ColorDrawable import android.util.AttributeSet import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.FrameLayout import android.widget.LinearLayout import androidx.core.content.ContextCompat import com.mogo.eagle.core.data.config.FunctionBuildConfig @@ -21,12 +24,10 @@ import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.kotlin.scope import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils -import com.mogo.eagle.core.utilcode.util.BarUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import kotlinx.android.synthetic.main.view_status_bar.view.routeDownloadFailMark -import kotlinx.android.synthetic.main.view_status_bar.view.routeDownloadStatus -import kotlinx.android.synthetic.main.view_status_bar.view.routeDownloadStatusRoot +import kotlinx.android.synthetic.main.view_status_bar.view.ll_status_download +import kotlinx.android.synthetic.main.view_status_bar.view.route_download_status import kotlinx.android.synthetic.main.view_status_bar.view.status_container import kotlinx.android.synthetic.main.view_status_bar.view.viewProgressTv import kotlinx.android.synthetic.main.view_status_bar.view.viewStatusBarLeft @@ -34,6 +35,7 @@ import kotlinx.android.synthetic.main.view_status_bar.view.viewStatusBarRight import kotlinx.android.synthetic.main.view_status_bar.view.viewTextClock import kotlinx.coroutines.Runnable import kotlinx.coroutines.launch +import me.jessyan.autosize.utils.AutoSizeUtils import java.util.concurrent.CopyOnWriteArrayList import java.util.concurrent.atomic.AtomicLong @@ -41,7 +43,7 @@ class StatusBarView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : LinearLayout(context, attrs, defStyleAttr), IMoGoSkinModeChangeListener, IViewControlListener, +) : FrameLayout(context, attrs, defStyleAttr), IMoGoSkinModeChangeListener, IViewControlListener, IMoGoAutopilotStatusListener { companion object { @@ -49,8 +51,8 @@ class StatusBarView @JvmOverloads constructor( } init { - orientation = HORIZONTAL LayoutInflater.from(context).inflate(R.layout.view_status_bar, this, true) + background = ColorDrawable(Color.parseColor("#A6000000")) // 黑色的65% } private val rightViewList = CopyOnWriteArrayList() @@ -60,12 +62,6 @@ class StatusBarView @JvmOverloads constructor( override fun onAttachedToWindow() { super.onAttachedToWindow() - post { - val params: ViewGroup.LayoutParams = getLayoutParams() - params.height = BarUtils.getStatusBarHeight() - layoutParams = params - } - //添加view控制 CallerHmiViewControlListenerManager.addListener(TAG, this) // 添加换肤监听 @@ -76,44 +72,40 @@ class StatusBarView @JvmOverloads constructor( CallerAutoPilotStatusListenerManager.addListener(TAG, this) updateStatusBarLeftView(true, FUNC_MODE_DEMO, DemoModeView(this.context)) updateStatusBarLeftView(true, FUNC_MODE_RAIN, RainModeView(this.context)) - routeDownloadStatusRoot?.visibility = View.GONE + route_download_status?.visibility = View.GONE CallerDevaToolsManager.registerRouteDownloadListener(TAG) { state -> when (state) { 0 -> { - routeDownloadStatusRoot?.visibility = View.GONE + route_download_status?.visibility = View.GONE } 1 -> { - routeDownloadStatusRoot?.visibility = View.VISIBLE - routeDownloadStatus?.background = ContextCompat.getDrawable( + route_download_status?.visibility = View.VISIBLE + route_download_status?.background = ContextCompat.getDrawable( context, - R.drawable.bg_autopilot_route_download_start + R.drawable.icon_status_route_download_start ) - routeDownloadFailMark?.visibility = View.GONE } 2 -> { - routeDownloadStatusRoot?.visibility = View.VISIBLE - routeDownloadStatus?.background = ContextCompat.getDrawable( + route_download_status?.visibility = View.VISIBLE + route_download_status?.background = ContextCompat.getDrawable( context, - R.drawable.bg_autopilot_route_download_success + R.drawable.icon_status_route_download_complete ) - routeDownloadFailMark?.visibility = View.GONE UiThreadHandler.postDelayed(Runnable { - routeDownloadStatusRoot?.visibility = View.GONE + route_download_status?.visibility = View.GONE }, 3000) } 3 -> { - routeDownloadStatusRoot?.visibility = View.VISIBLE - routeDownloadStatus?.background = ContextCompat.getDrawable( + route_download_status?.visibility = View.VISIBLE + route_download_status?.background = ContextCompat.getDrawable( context, - R.drawable.bg_autopilot_route_download_failed + R.drawable.icon_status_route_download_failed ) - routeDownloadFailMark?.visibility = View.VISIBLE } } - } } } @@ -131,12 +123,12 @@ class StatusBarView @JvmOverloads constructor( super.onAutopilotRouteLineId(lineId) if (lineId != this.lineId.get()) { this.lineId.set(lineId) - routeDownloadStatusRoot?.scope?.launch { - if ((routeDownloadStatusRoot?.visibility == View.VISIBLE) && AppIdentityModeUtils.isDriver( + route_download_status?.scope?.launch { + if ((route_download_status?.visibility == View.VISIBLE) && AppIdentityModeUtils.isDriver( FunctionBuildConfig.appIdentityMode ) ) { - routeDownloadStatusRoot?.visibility = View.GONE + route_download_status?.visibility = View.GONE } } } @@ -167,8 +159,10 @@ class StatusBarView @JvmOverloads constructor( if (leftViewList.contains(tag)) { return } + val params = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT) + params.marginStart = AutoSizeUtils.dp2px(context, 30.0f) + viewStatusBarLeft.addView(viewGroup, leftViewList.size, params) leftViewList.add(0, tag) - viewStatusBarLeft.addView(viewGroup, 0) } else { leftViewList.forEachIndexed { index, s -> if (s == tag) { @@ -182,10 +176,10 @@ class StatusBarView @JvmOverloads constructor( @SuppressLint("SetTextI18n") override fun updateStatusBarDownloadView(insert: Boolean, tag: String, progress: Int) { if (insert) { - viewProgressTv.visibility = VISIBLE + ll_status_download.visibility = VISIBLE viewProgressTv.text = "$progress%" } else { - viewProgressTv.visibility = GONE + ll_status_download.visibility = GONE } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/WifiStateView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/WifiStateView.kt index b879aa8f0d..bbfae1d269 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/WifiStateView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/WifiStateView.kt @@ -8,6 +8,7 @@ import android.net.wifi.WifiManager import android.os.Handler import android.os.Message import android.util.AttributeSet +import android.util.Log import android.util.TypedValue import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout @@ -82,11 +83,12 @@ class WifiStateView @JvmOverloads constructor( resources.getDimension(R.dimen.dp_35) ) a.recycle() - viewStatusBarTag.setTextSize(TypedValue.COMPLEX_UNIT_PX,AutoSizeUtils.dp2px(context,txtSize).toFloat()) +// viewStatusBarTag.setTextSize(TypedValue.COMPLEX_UNIT_PX,AutoSizeUtils.dp2px(context,txtSize).toFloat()) wifiManager = context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager? wifiHandler = WifiHandler(this) val wifiInfo = wifiManager!!.connectionInfo + Log.d(TAG, "wifi-info : $wifiInfo, ssid->: ${wifiInfo.ssid}") wifiName = wifiInfo.ssid.replace("\"","") } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_mofang_ipc_disconnected.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_mofang_ipc_disconnected.png index 2cf8ccad2f..208f1e633e 100644 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_mofang_ipc_disconnected.png and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_mofang_ipc_disconnected.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_mofang_low_power.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_mofang_low_power.png index b51fb85979..ecc1edfcca 100644 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_mofang_low_power.png and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_mofang_low_power.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_mofang_normal_power.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_mofang_normal_power.png index 335b753ea8..d7dce15d7d 100644 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_mofang_normal_power.png and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_mofang_normal_power.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/demo_mode.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/demo_mode.png deleted file mode 100644 index 380b81e942..0000000000 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/demo_mode.png and /dev/null differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/demo_mode_open.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/demo_mode_open.png deleted file mode 100644 index b32c8ec113..0000000000 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/demo_mode_open.png and /dev/null differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/icon_status_demo_close.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/icon_status_demo_close.png new file mode 100644 index 0000000000..b68595a055 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/icon_status_demo_close.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/icon_status_demo_open.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/icon_status_demo_open.png new file mode 100644 index 0000000000..2109d883a7 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/icon_status_demo_open.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/icon_status_yutian_close.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/icon_status_yutian_close.png new file mode 100644 index 0000000000..e95fe9156a Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/icon_status_yutian_close.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/icon_status_yutian_open.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/icon_status_yutian_open.png new file mode 100644 index 0000000000..19484c6503 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/icon_status_yutian_open.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/rain_mode.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/rain_mode.png deleted file mode 100644 index a098a5a1c7..0000000000 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/rain_mode.png and /dev/null differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/rain_mode_open.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/rain_mode_open.png deleted file mode 100644 index 4fe095671e..0000000000 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/rain_mode_open.png and /dev/null differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_battery_group.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_battery_group.xml index fb3306d80a..0b94157c6f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_battery_group.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_battery_group.xml @@ -3,7 +3,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center" - android:layout_marginLeft="@dimen/dp_10" android:orientation="horizontal"> - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_bar.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_bar.xml index dceb83a185..4e8bf3f9cf 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_bar.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_bar.xml @@ -3,113 +3,115 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="@dimen/dp_72" - tools:parentTag="android.widget.LinearLayout"> - - - - - - - - + tools:background="#A6000000" + tools:parentTag="android.widget.FrameLayout"> - - - - - - - + - + android:layout_gravity="center" + android:layout_marginStart="@dimen/dp_61" + android:format12Hour="HH:mm" + android:format24Hour="HH:mm" + android:textColor="#ffffff" + android:textSize="@dimen/dp_45" + android:textStyle="bold" /> - - - - - - - - + + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_marginStart="@dimen/dp_30" /> + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_wifi_state.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_wifi_state.xml index f7fe62dd7c..15ae97a3a0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_wifi_state.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_wifi_state.xml @@ -2,27 +2,33 @@ - - + android:layout_width="wrap_content" + android:layout_height="wrap_content" + tools:background="#A6000000" + tools:layout_height="@dimen/dp_72"> + app:layout_constraintStart_toStartOf="parent" + tools:ignore="MissingConstraints" + tools:src="@drawable/wifi_light_state_five" /> + + \ No newline at end of file diff --git a/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_download_guide.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_download_guide.png index b4e5dbfcdf..4ff8e35a95 100644 Binary files a/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_download_guide.png and b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_download_guide.png differ diff --git a/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_grey_warning.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_grey_warning.png new file mode 100644 index 0000000000..6783e27c82 Binary files /dev/null and b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_grey_warning.png differ diff --git a/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_red_warning.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_red_warning.png new file mode 100644 index 0000000000..d2c79b6590 Binary files /dev/null and b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_red_warning.png differ diff --git a/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_status_bar_logo.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_status_bar_logo.png new file mode 100644 index 0000000000..b0d44704b1 Binary files /dev/null and b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_status_bar_logo.png differ diff --git a/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_status_route_download_complete.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_status_route_download_complete.png new file mode 100644 index 0000000000..f9bb3e0ddc Binary files /dev/null and b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_status_route_download_complete.png differ diff --git a/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_status_route_download_failed.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_status_route_download_failed.png new file mode 100644 index 0000000000..2df85fe783 Binary files /dev/null and b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_status_route_download_failed.png differ diff --git a/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_status_route_download_start.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_status_route_download_start.png new file mode 100644 index 0000000000..ebf2c4cc52 Binary files /dev/null and b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_status_route_download_start.png differ