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

Merge branch 'dev_MogoAP_eagle-930_210926_8.0.12' into dev/dev_eagle_architecture_upgrade2

Browse Source
This commit is contained in:
董宏宇
2021-10-20 20:03:08 +08:00
parent 4c68b698dd a823d8aee3
commit 6c82338fde
16 changed files with 87 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml
View File

@@ -15,7 +15,9 @@
android:paddingLeft="@dimen/dp_40" android:paddingLeft="@dimen/dp_40"
android:paddingTop="@dimen/dp_32" android:paddingTop="@dimen/dp_32"
android:text="模块名称" android:text="模块名称"
android:textColor="#FFF"
android:textSize="@dimen/dp_38" android:textSize="@dimen/dp_38"
android:textStyle="bold"
app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintHorizontal_weight="1" app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
@@ -30,7 +32,9 @@
android:paddingLeft="@dimen/dp_40" android:paddingLeft="@dimen/dp_40"
android:paddingTop="@dimen/dp_32" android:paddingTop="@dimen/dp_32"
android:text="运行状态" android:text="运行状态"
android:textColor="#FFF"
android:textSize="@dimen/dp_38" android:textSize="@dimen/dp_38"
android:textStyle="bold"
app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintHorizontal_weight="1" app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toRightOf="@+id/title_one" app:layout_constraintLeft_toRightOf="@+id/title_one"
@@ -45,7 +49,9 @@
android:paddingLeft="@dimen/dp_40" android:paddingLeft="@dimen/dp_40"
android:paddingTop="@dimen/dp_32" android:paddingTop="@dimen/dp_32"
android:text="模块名称" android:text="模块名称"
android:textColor="#FFF"
android:textSize="@dimen/dp_38" android:textSize="@dimen/dp_38"
android:textStyle="bold"
app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintHorizontal_weight="1" app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toRightOf="@+id/title_two" app:layout_constraintLeft_toRightOf="@+id/title_two"
@@ -60,7 +66,9 @@
android:paddingLeft="@dimen/dp_40" android:paddingLeft="@dimen/dp_40"
android:paddingTop="@dimen/dp_32" android:paddingTop="@dimen/dp_32"
android:text="运行状态" android:text="运行状态"
android:textColor="#FFF"
android:textSize="@dimen/dp_38" android:textSize="@dimen/dp_38"
android:textStyle="bold"
app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintHorizontal_weight="1" app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toRightOf="@+id/title_thr" app:layout_constraintLeft_toRightOf="@+id/title_thr"

4
core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
View File

@@ -64,8 +64,8 @@
<com.mogo.eagle.core.function.hmi.ui.widget.CheckStatusView <com.mogo.eagle.core.function.hmi.ui.widget.CheckStatusView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_380" android:layout_marginLeft="@dimen/module_hmi_check_left"
android:layout_marginBottom="@dimen/dp_42" android:layout_marginBottom="@dimen/dp_38"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />

6
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_status.xml
View File

@@ -8,13 +8,13 @@
<!--车辆检测入口--> <!--车辆检测入口-->
<TextView <TextView
android:id="@+id/moduleHmiCheck" android:id="@+id/moduleHmiCheck"
android:layout_width="@dimen/dp_128" android:layout_width="@dimen/module_hmi_check_size"
android:layout_height="@dimen/dp_128" android:layout_height="@dimen/module_hmi_check_size"
android:background="@drawable/module_ext_check" android:background="@drawable/module_ext_check"
android:gravity="center" android:gravity="center"
android:text="检测" android:text="检测"
android:textColor="#fff" android:textColor="#fff"
android:textSize="@dimen/module_hmi_btn_text_size" android:textSize="@dimen/dp_38"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent" /> app:layout_constraintRight_toRightOf="parent" />

58
core/mogo-core-res/src/main/function-hmi-res/drawable/module_ext_check.xml
View File

@@ -1,14 +1,50 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <layer-list xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval"> android:shape="oval">
<size <!-- 边 -->
android:width="@dimen/module_hmi_check_size" <item>
android:height="@dimen/module_hmi_check_size" /> <shape android:shape="oval">
<!--//填充--> <padding
<solid android:color="@color/module_switch_map_bg" /> android:bottom="1dp"
<!--//描边--> android:left="1dp"
<stroke android:right="1dp"
android:width="2px" android:top="1dp" />
android:color="@color/module_switch_map_bg" /> <solid android:color="#20151D45" />
</shape>
</item>
<item>
<shape android:shape="oval">
<padding
android:bottom="2dp"
android:left="2dp"
android:right="2dp"
android:top="2dp" />
<solid android:color="#30151D45" />
</shape>
</item>
<item>
<shape android:shape="oval">
<padding
android:bottom="2dp"
android:left="2dp"
android:right="2dp"
android:top="2dp" />
<solid android:color="#50151D45" />
</shape>
</item>
</shape> <!-- 中心背景 -->
<item>
<shape
android:shape="oval"
android:useLevel="false">
<size
android:width="@dimen/module_hmi_check_size"
android:height="@dimen/module_hmi_check_size" />
<!-- 实心 -->
<solid android:color="@color/module_switch_map_bg" />
</shape>
</item>
</layer-list>

3
core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml
View File

@@ -27,7 +27,8 @@
<dimen name="module_hmi_autopilot_status_bg_sm_radius">30px</dimen> <dimen name="module_hmi_autopilot_status_bg_sm_radius">30px</dimen>
<dimen name="module_hmi_autopilot_status_bg_big_radius">70px</dimen> <dimen name="module_hmi_autopilot_status_bg_big_radius">70px</dimen>
<dimen name="module_hmi_check_size">128px</dimen> <dimen name="module_hmi_check_size">138px</dimen>
<dimen name="module_hmi_check_left">368px</dimen>
<dimen name="module_hmi_btn_size">60px</dimen> <dimen name="module_hmi_btn_size">60px</dimen>
<dimen name="module_hmi_btn_text_size">44px</dimen> <dimen name="module_hmi_btn_text_size">44px</dimen>

3
core/mogo-core-res/src/main/res/values/dimens.xml
View File

@@ -27,7 +27,8 @@
<dimen name="module_hmi_autopilot_status_bg_sm_radius">20px</dimen> <dimen name="module_hmi_autopilot_status_bg_sm_radius">20px</dimen>
<dimen name="module_hmi_autopilot_status_bg_big_radius">50px</dimen> <dimen name="module_hmi_autopilot_status_bg_big_radius">50px</dimen>
<dimen name="module_hmi_check_size">128px</dimen> <dimen name="module_hmi_check_size">138px</dimen>
<dimen name="module_hmi_check_left">368px</dimen>
<dimen name="module_hmi_btn_size">38px</dimen> <dimen name="module_hmi_btn_size">38px</dimen>
<dimen name="module_hmi_btn_text_size">33px</dimen> <dimen name="module_hmi_btn_text_size">33px</dimen>

1
modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
View File

@@ -34,7 +34,6 @@
android:background="@drawable/module_switch_map_bg" android:background="@drawable/module_switch_map_bg"
android:elevation="@dimen/dp_10" android:elevation="@dimen/dp_10"
android:padding="@dimen/dp_20" android:padding="@dimen/dp_20"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"> app:layout_constraintLeft_toLeftOf="parent">

4
modules/mogo-module-push/src/main/res/drawable/module_push_item_background.xml
View File

@@ -3,8 +3,8 @@
android:shape="rectangle"> android:shape="rectangle">
<gradient <gradient
android:angle="135" android:angle="135"
android:endColor="#33000000" android:endColor="#80000000"
android:startColor="#33000000" android:startColor="#80000000"
android:type="linear" /> android:type="linear" />
<corners android:radius="@dimen/module_push_ui_bkg_corner" /> <corners android:radius="@dimen/module_push_ui_bkg_corner" />
</shape> </shape>

2
modules/mogo-module-push/src/main/res/layout/module_push_dialog_check.xml
View File

@@ -25,6 +25,8 @@
android:layout_marginTop="@dimen/module_push_dialog_title_margin" android:layout_marginTop="@dimen/module_push_dialog_title_margin"
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textSize="@dimen/module_push_dialog_title_size" android:textSize="@dimen/module_push_dialog_title_size"
android:text="官方公告"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

27
modules/mogo-module-push/src/main/res/layout/module_push_item.xml
View File

@@ -25,6 +25,8 @@
android:layout_marginLeft="@dimen/module_push_ui_app_icon_leftMargin" android:layout_marginLeft="@dimen/module_push_ui_app_icon_leftMargin"
android:layout_marginTop="@dimen/module_push_ui_app_icon_topMargin" android:layout_marginTop="@dimen/module_push_ui_app_icon_topMargin"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@+id/module_push_image" app:layout_constraintLeft_toRightOf="@+id/module_push_image"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginTop="@dimen/module_push_ui_app_icon_goneTopMargin"> app:layout_goneMarginTop="@dimen/module_push_ui_app_icon_goneTopMargin">
@@ -42,36 +44,29 @@
android:textSize="@dimen/module_push_ui_title_textSize" android:textSize="@dimen/module_push_ui_title_textSize"
app:layout_constrainedWidth="true" app:layout_constrainedWidth="true"
tools:text="官方公告" /> tools:text="官方公告" />
</LinearLayout>
<RelativeLayout
android:id="@+id/module_push_rl_content"
android:layout_width="@dimen/module_push_ui_content_width"
android:layout_height="@dimen/module_push_ui_content_height"
android:layout_marginTop="@dimen/module_push_ui_content_marginTop"
android:layout_marginBottom="@dimen/module_push_ui_content_marginBottom"
app:layout_constraintLeft_toLeftOf="@id/module_push_app_icon_title"
app:layout_constraintTop_toBottomOf="@id/module_push_app_icon_title">
<TextView <TextView
android:id="@+id/module_push_content" android:id="@+id/module_push_content"
android:layout_width="wrap_content" android:layout_width="@dimen/module_push_ui_content_width"
android:layout_height="match_parent" android:layout_height="@dimen/module_push_ui_content_height"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="3" android:layout_marginTop="@dimen/module_push_ui_content_topMargin"
android:gravity="top|left"
android:maxLines="2"
android:text="这是测试数据,当前测试数据是为了查看换行的显示效果,如果最多3行呢,怎么显示的呢"
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textSize="@dimen/module_push_ui_title_text_size" /> android:textSize="@dimen/module_push_ui_title_text_size" />
</LinearLayout>
</RelativeLayout>
<View <View
android:id="@+id/module_push_line" android:id="@+id/module_push_line"
android:layout_width="@dimen/module_push_line_width" android:layout_width="@dimen/module_push_line_width"
android:layout_height="@dimen/module_push_line_height" android:layout_height="@dimen/module_push_line_height"
android:layout_marginLeft="@dimen/module_push_line_margin_left" android:layout_marginLeft="@dimen/dp_100"
android:background="@color/module_push_item_line_color" android:background="@color/module_push_item_line_color"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@+id/module_push_rl_content" app:layout_constraintLeft_toRightOf="@+id/module_push_app_icon_title"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView

1
modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml
View File

@@ -58,6 +58,7 @@
<dimen name="module_push_ui_image_marLeft">8px</dimen> <dimen name="module_push_ui_image_marLeft">8px</dimen>
<dimen name="module_push_ui_app_icon_leftMargin">12px</dimen> <dimen name="module_push_ui_app_icon_leftMargin">12px</dimen>
<dimen name="module_push_ui_app_icon_topMargin">16px</dimen> <dimen name="module_push_ui_app_icon_topMargin">16px</dimen>
<dimen name="module_push_ui_content_topMargin">6px</dimen>
<dimen name="module_push_ui_app_icon_goneTopMargin">19px</dimen> <dimen name="module_push_ui_app_icon_goneTopMargin">19px</dimen>
<dimen name="module_push_ui_app_icon_size">30px</dimen> <dimen name="module_push_ui_app_icon_size">30px</dimen>
<dimen name="module_push_ui_title_textSize">16px</dimen> <dimen name="module_push_ui_title_textSize">16px</dimen>

1
modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml
View File

@@ -58,6 +58,7 @@
<dimen name="module_push_ui_image_marLeft">8px</dimen> <dimen name="module_push_ui_image_marLeft">8px</dimen>
<dimen name="module_push_ui_app_icon_leftMargin">12px</dimen> <dimen name="module_push_ui_app_icon_leftMargin">12px</dimen>
<dimen name="module_push_ui_app_icon_topMargin">16px</dimen> <dimen name="module_push_ui_app_icon_topMargin">16px</dimen>
<dimen name="module_push_ui_content_topMargin">6px</dimen>
<dimen name="module_push_ui_app_icon_goneTopMargin">19px</dimen> <dimen name="module_push_ui_app_icon_goneTopMargin">19px</dimen>
<dimen name="module_push_ui_app_icon_size">30px</dimen> <dimen name="module_push_ui_app_icon_size">30px</dimen>
<dimen name="module_push_ui_title_textSize">16px</dimen> <dimen name="module_push_ui_title_textSize">16px</dimen>

3
modules/mogo-module-push/src/main/res/values-xhdpi-2560x1440/dimens.xml
View File

@@ -7,6 +7,7 @@
<dimen name="module_push_ui_image_corner">30px</dimen> <dimen name="module_push_ui_image_corner">30px</dimen>
<dimen name="module_push_ui_app_icon_leftMargin">21px</dimen> <dimen name="module_push_ui_app_icon_leftMargin">21px</dimen>
<dimen name="module_push_ui_app_icon_topMargin">34px</dimen> <dimen name="module_push_ui_app_icon_topMargin">34px</dimen>
<dimen name="module_push_ui_content_topMargin">20px</dimen>
<dimen name="module_push_ui_app_icon_goneTopMargin">33px</dimen> <dimen name="module_push_ui_app_icon_goneTopMargin">33px</dimen>
<dimen name="module_push_line_width">2px</dimen> <dimen name="module_push_line_width">2px</dimen>
<dimen name="module_push_line_height">120px</dimen> <dimen name="module_push_line_height">120px</dimen>
@@ -17,7 +18,7 @@
<dimen name="module_push_title_mix_width">394px</dimen> <dimen name="module_push_title_mix_width">394px</dimen>
<dimen name="module_push_ui_title_textSize">42px</dimen> <dimen name="module_push_ui_title_textSize">42px</dimen>
<dimen name="module_push_ui_content_width">567px</dimen> <dimen name="module_push_ui_content_width">567px</dimen>
<dimen name="module_push_ui_content_height">100px</dimen> <dimen name="module_push_ui_content_height">120px</dimen>
<dimen name="module_push_ui_content_marginTop">20px</dimen> <dimen name="module_push_ui_content_marginTop">20px</dimen>
<dimen name="module_push_ui_content_marginBottom">34px</dimen> <dimen name="module_push_ui_content_marginBottom">34px</dimen>
<dimen name="module_push_ui_title_text_size">34px</dimen> <dimen name="module_push_ui_title_text_size">34px</dimen>

1
modules/mogo-module-push/src/main/res/values-xhdpi/dimens.xml
View File

@@ -58,6 +58,7 @@
<dimen name="module_push_ui_image_marLeft">17px</dimen> <dimen name="module_push_ui_image_marLeft">17px</dimen>
<dimen name="module_push_ui_app_icon_leftMargin">21px</dimen> <dimen name="module_push_ui_app_icon_leftMargin">21px</dimen>
<dimen name="module_push_ui_app_icon_topMargin">30px</dimen> <dimen name="module_push_ui_app_icon_topMargin">30px</dimen>
<dimen name="module_push_ui_content_topMargin">20px</dimen>
<dimen name="module_push_ui_app_icon_goneTopMargin">33px</dimen> <dimen name="module_push_ui_app_icon_goneTopMargin">33px</dimen>
<dimen name="module_push_ui_app_icon_size">50px</dimen> <dimen name="module_push_ui_app_icon_size">50px</dimen>
<dimen name="module_push_ui_title_textSize">30px</dimen> <dimen name="module_push_ui_title_textSize">30px</dimen>

2
modules/mogo-module-push/src/main/res/values/colors.xml
View File

@@ -4,7 +4,7 @@
<color name="module_push_item_title_textColor">#FFFFFF</color> <color name="module_push_item_title_textColor">#FFFFFF</color>
<color name="module_push_item_content_textColor">#B2FFFFFF</color> <color name="module_push_item_content_textColor">#B2FFFFFF</color>
<color name="module_push_item_time_textColor">#999999</color> <color name="module_push_item_time_textColor">#999999</color>
<color name="module_push_item_line_color">#B3FFFFFF</color> <color name="module_push_item_line_color">#FFF</color>
<color name="module_push_check_color">#5A8EFD</color> <color name="module_push_check_color">#5A8EFD</color>
<color name="module_push_check_dialog_bg_color">#E63B4577</color> <color name="module_push_check_dialog_bg_color">#E63B4577</color>
</resources> </resources>

3
modules/mogo-module-push/src/main/res/values/dimens.xml
View File

@@ -58,6 +58,7 @@
<dimen name="module_push_ui_image_marLeft">8px</dimen> <dimen name="module_push_ui_image_marLeft">8px</dimen>
<dimen name="module_push_ui_app_icon_leftMargin">12px</dimen> <dimen name="module_push_ui_app_icon_leftMargin">12px</dimen>
<dimen name="module_push_ui_app_icon_topMargin">16px</dimen> <dimen name="module_push_ui_app_icon_topMargin">16px</dimen>
<dimen name="module_push_ui_content_topMargin">6px</dimen>
<dimen name="module_push_ui_app_icon_goneTopMargin">19px</dimen> <dimen name="module_push_ui_app_icon_goneTopMargin">19px</dimen>
<dimen name="module_push_ui_app_icon_size">30px</dimen> <dimen name="module_push_ui_app_icon_size">30px</dimen>
<dimen name="module_push_ui_title_textSize">16px</dimen> <dimen name="module_push_ui_title_textSize">16px</dimen>
@@ -102,7 +103,7 @@
<dimen name="module_push_ui_content_marginBottom">34px</dimen> <dimen name="module_push_ui_content_marginBottom">34px</dimen>
<dimen name="module_push_ui_content_width">567px</dimen> <dimen name="module_push_ui_content_width">567px</dimen>
<dimen name="module_push_ui_content_height">100px</dimen> <dimen name="module_push_ui_content_height">120px</dimen>
<dimen name="module_push_line_width">2px</dimen> <dimen name="module_push_line_width">2px</dimen>
<dimen name="module_push_line_height">120px</dimen> <dimen name="module_push_line_height">120px</dimen>