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

Merge branch '930' into dev_MogoAP_eagle-1030_211020_8.0.14

Browse Source
This commit is contained in:
liujing
2021-10-25 20:37:41 +08:00
parent 5025bfacc0 1098082c5e
commit 3e5a98a34e
16 changed files with 145 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/gradle.xml generated
View File

@@ -4,7 +4,7 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="testRunner" value="GRADLE" />
<option name="testRunner" value="PLATFORM" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
@@ -77,6 +77,7 @@
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
<option name="useQualifiedModuleNames" value="true" />
</GradleProjectSettings>
</option>
</component>

0
core/function-impl/mogo-core-function-check/src/main/res/drawable/check_close.png → core/function-impl/mogo-core-function-check/src/main/res/drawable/dark_clore_close.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

2
core/function-impl/mogo-core-function-check/src/main/res/layout/activity_check.xml
View File

@@ -22,7 +22,7 @@
android:layout_height="@dimen/dp_106"
android:layout_marginLeft="@dimen/dp_50"
android:layout_marginTop="@dimen/dp_50"
android:src="@drawable/check_close"
android:src="@drawable/dark_clore_close"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />

2
core/function-impl/mogo-core-function-check/src/main/res/layout/check_dialog.xml
View File

@@ -13,7 +13,7 @@
android:layout_height="@dimen/dp_106"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_30"
android:src="@drawable/check_close"
android:src="@drawable/dark_clore_close"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />

2
core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_list.xml
View File

@@ -13,7 +13,7 @@
android:layout_height="@dimen/dp_106"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_30"
android:src="@drawable/check_close"
android:src="@drawable/dark_clore_close"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />

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

@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="check_width">1900px</dimen>
<dimen name="check_height">730px</dimen>
<dimen name="check_item_space_vr">30px</dimen>
<dimen name="check_button_text_size">38px</dimen>
<dimen name="check_button_left">133px</dimen>
@@ -12,5 +14,4 @@
<dimen name="check_obu_start">1660px</dimen>
<dimen name="check_scan_width">1162px</dimen>
<dimen name="check_scan_height">570px</dimen>
</resources>

12
core/function-impl/mogo-core-function-check/src/main/res/values/dimens.xml
View File

@@ -2,4 +2,16 @@
<resources>
<dimen name="check_width">1900px</dimen>
<dimen name="check_height">730px</dimen>
<dimen name="check_item_space_vr">30px</dimen>
<dimen name="check_button_text_size">38px</dimen>
<dimen name="check_button_left">133px</dimen>
<dimen name="check_image_bottom">50px</dimen>
<dimen name="check_image_right">50px</dimen>
<dimen name="check_hard_ware_image_width">1452px</dimen>
<dimen name="check_hard_ware_image_height">715px</dimen>
<dimen name="check_little_btn_width">32px</dimen>
<dimen name="check_luyouqi_start">1078px</dimen>
<dimen name="check_obu_start">1660px</dimen>
<dimen name="check_scan_width">1162px</dimen>
<dimen name="check_scan_height">570px</dimen>
</resources>

5
core/function-impl/mogo-core-function-hmi/src/main/res/drawable/notice_connect.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/notice_blue" />
<corners android:radius="@dimen/dp_50" />
</shape>

5
core/function-impl/mogo-core-function-hmi/src/main/res/drawable/notice_dialog_check_background.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/notice_check_dialog_bg_color" />
<corners android:radius="@dimen/notice_dialog_check_bg_corner" />
</shape>

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 908 KiB

78
core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_check_with_accessory.xml Normal file
View File

@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="@dimen/module_push_dialog_check_accessory_width"
android:layout_height="@dimen/module_push_dialog_check_accessory_height"
android:background="@drawable/notice_dialog_check_background">
<ImageView
android:id="@+id/module_push_dialog_close"
android:layout_width="@dimen/dp_108"
android:layout_height="@dimen/dp_108"
android:layout_marginLeft="@dimen/dp_40"
android:layout_marginTop="@dimen/dp_40"
android:scaleType="fitXY"
android:src="@drawable/dark_clore_close"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/module_push_dialog_acc_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_54"
android:text="官方公告"
android:textColor="@android:color/white"
android:textSize="@dimen/dp_56"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/module_push_dialog_bottom_title"
android:layout_width="@dimen/module_push_dialog_check_acc_image_width"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_150"
android:layout_marginRight="@dimen/dp_150"
android:layout_marginBottom="@dimen/dp_56"
android:ellipsize="end"
android:maxLines="2"
android:gravity="left"
android:text=" 官方公告测试数据,当前测试数据属于查看UI状态,多于两行是怎么显示的,多余的内容是都是省略号显示的呢,看一下测试数据的"
android:textColor="#FFF"
android:textSize="@dimen/dp_50"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" />
<ImageView
android:id="@+id/back_image"
android:layout_width="@dimen/module_push_dialog_check_acc_image_width"
android:layout_height="@dimen/module_push_dialog_check_acc_image__height"
android:layout_marginLeft="@dimen/dp_150"
android:layout_marginTop="@dimen/dp_52"
android:layout_marginRight="@dimen/dp_150"
android:src="@drawable/notice_unsuccess_image"
app:layout_constraintBottom_toTopOf="@+id/module_push_dialog_bottom_title"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/module_push_dialog_acc_title" />
<TextView
android:id="@+id/notice_connect"
android:layout_width="@dimen/dp_310"
android:layout_height="@dimen/dp_100"
android:layout_marginBottom="@dimen/dp_110"
android:background="@drawable/notice_connect"
android:gravity="center"
android:text="连接"
android:textColor="#FFF"
android:textSize="@dimen/dp_42"
app:layout_constraintBottom_toBottomOf="@+id/back_image"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

5
core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/color.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="notice_blue">#2B6EFF</color>
<color name="notice_check_dialog_bg_color">#E63B4577</color>
</resources>

14
core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens.xml Normal file
View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="module_push_dialog_check_accessory_width">1700px</dimen>
<dimen name="module_push_dialog_check_accessory_height">1200px</dimen>
<dimen name="module_push_dialog_check_acc_image_width">1400px</dimen>
<dimen name="module_push_dialog_check_acc_image__height">788px</dimen>
<dimen name="notice_dialog_check_bg_corner">32px</dimen>
<dimen name="dp_42">42px</dimen>
<dimen name="dp_50">50px</dimen>
<dimen name="dp_52">52px</dimen>
<dimen name="dp_54">54px</dimen>
<dimen name="dp_56">56px</dimen>
</resources>

5
core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="notice_blue">#2B6EFF</color>
<color name="notice_check_dialog_bg_color">#E63B4577</color>
</resources>

14
core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml Normal file
View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="module_push_dialog_check_accessory_width">1700px</dimen>
<dimen name="module_push_dialog_check_accessory_height">1200px</dimen>
<dimen name="module_push_dialog_check_acc_image_width">1400px</dimen>
<dimen name="module_push_dialog_check_acc_image__height">788px</dimen>
<dimen name="notice_dialog_check_bg_corner">32px</dimen>
<dimen name="dp_42">42px</dimen>
<dimen name="dp_50">50px</dimen>
<dimen name="dp_52">52px</dimen>
<dimen name="dp_54">54px</dimen>
<dimen name="dp_56">56px</dimen>
</resources>

BIN
core/mogo-core-res/src/main/res/drawable/dark_clore_close.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB