美化质检问题界面及logo
This commit is contained in:
qiji4215
parent
b31f301ae6
commit
6dec79f763
app/src/main
collect-library/src/main/res/mipmap-hdpi
@ -36,7 +36,7 @@
|
||||
android:allowBackup="true"
|
||||
android:dataExtractionRules="@xml/data_extraction_rules"
|
||||
android:fullBackupContent="@xml/backup_rules"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:icon="@drawable/icon_logo"
|
||||
android:label="@string/app_name"
|
||||
android:largeHeap="true"
|
||||
android:requestLegacyExternalStorage="true"
|
||||
|
||||
BIN
app/src/main/res/drawable-xhdpi/icon_logo.png
Normal file
BIN
app/src/main/res/drawable-xhdpi/icon_logo.png
Normal file
Binary file not shown.
|
After 
(image error) Size: 6.3 KiB |
BIN
app/src/main/res/drawable-xhdpi/icon_save.png
Normal file
BIN
app/src/main/res/drawable-xhdpi/icon_save.png
Normal file
Binary file not shown.
|
After 
(image error) Size: 9.5 KiB |
BIN
app/src/main/res/drawable-xxhdpi/icon_logo.png
Normal file
BIN
app/src/main/res/drawable-xxhdpi/icon_logo.png
Normal file
Binary file not shown.
|
After 
(image error) Size: 12 KiB |
BIN
app/src/main/res/drawable-xxhdpi/icon_save.png
Normal file
BIN
app/src/main/res/drawable-xxhdpi/icon_save.png
Normal file
Binary file not shown.
|
After 
(image error) Size: 12 KiB |
@ -2,30 +2,30 @@
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_enabled="false">
|
||||
<shape>
|
||||
<stroke android:width="1.1dp" android:color="@color/cv_gray_153" />
|
||||
<solid android:color="@color/cv_gray_153" />
|
||||
<padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
|
||||
<solid android:color="@color/cv_gray_153" />
|
||||
<stroke android:width="1.1dp" android:color="@color/cv_gray_153" />
|
||||
</shape>
|
||||
</item>
|
||||
<item android:state_pressed="true">
|
||||
<shape>
|
||||
<stroke android:width="1.1dp" android:color="@color/white" />
|
||||
<solid android:color="@color/white" />
|
||||
<padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
|
||||
<solid android:color="@color/white" />
|
||||
<stroke android:width="1.1dp" android:color="@color/white" />
|
||||
</shape>
|
||||
</item>
|
||||
<item android:state_selected="true">
|
||||
<shape>
|
||||
<stroke android:width="1.1dp" android:color="@color/cvm_red" />
|
||||
<solid android:color="@color/cvm_red" />
|
||||
<padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
|
||||
<solid android:color="@color/cvm_red" />
|
||||
<stroke android:width="1.1dp" android:color="@color/cvm_red" />
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape>
|
||||
<stroke android:width="1.1dp" android:color="@color/btn_blue_solid" />
|
||||
<solid android:color="@color/transp" />
|
||||
<padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
|
||||
<solid android:color="@color/transp" />
|
||||
<stroke android:width="1.1dp" android:color="@color/btn_blue_solid" />
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
|
||||
BIN
app/src/main/res/drawable/icon_down_arrow.png
Normal file
BIN
app/src/main/res/drawable/icon_down_arrow.png
Normal file
Binary file not shown.
|
After 
(image error) Size: 235 B |
@ -40,7 +40,7 @@
|
||||
<androidx.core.widget.NestedScrollView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_marginTop="5dp"
|
||||
android:padding="10dp"
|
||||
app:layout_constraintBottom_toTopOf="@id/evaluation_camera"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
@ -52,65 +52,138 @@
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:padding="5dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal">
|
||||
|
||||
|
||||
<TextView
|
||||
style="@style/card_content_font_default"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="问题分类" />
|
||||
android:text="要素分类" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/evaluation_class_type"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="5dp"
|
||||
android:background="@drawable/fm_card_map_down_status_bg"
|
||||
style="@style/card_text_font_default"
|
||||
android:onClick="@{fragment::onClick}"
|
||||
android:text="@{viewModel.liveDataQsRecordBean.classType}" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:padding="5dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
style="@style/card_content_font_default"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="问题类型" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/evaluation_problem_type"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="5dp"
|
||||
android:background="@drawable/fm_card_map_down_status_bg"
|
||||
style="@style/card_text_font_default"
|
||||
android:onClick="@{fragment::onClick}"
|
||||
android:text="@{viewModel.liveDataQsRecordBean.problemType}" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:padding="5dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
style="@style/card_content_font_default"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="问题现象" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/evaluation_phenomenon"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="5dp"
|
||||
android:background="@drawable/fm_card_map_down_status_bg"
|
||||
style="@style/card_text_font_default"
|
||||
android:onClick="@{fragment::onClick}"
|
||||
android:text="@{viewModel.liveDataQsRecordBean.phenomenon}" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:padding="5dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal">
|
||||
|
||||
|
||||
<TextView
|
||||
style="@style/card_content_font_default"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="问题环节" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/evaluation_link"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="5dp"
|
||||
android:background="@drawable/fm_card_map_down_status_bg"
|
||||
style="@style/card_text_font_default"
|
||||
android:onClick="@{fragment::onClick}"
|
||||
android:text="@{viewModel.liveDataQsRecordBean.problemLink}" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:padding="5dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal">
|
||||
|
||||
|
||||
<TextView
|
||||
style="@style/card_content_font_default"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="问题原因" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/evaluation_cause"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="5dp"
|
||||
android:background="@drawable/fm_card_map_down_status_bg"
|
||||
style="@style/card_text_font_default"
|
||||
android:onClick="@{fragment::onClick}"
|
||||
android:text="@{viewModel.liveDataQsRecordBean.cause}" />
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:padding="5dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal">
|
||||
|
||||
|
||||
<TextView
|
||||
style="@style/card_content_font_default"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="备注信息" />
|
||||
android:text="问题描述" />
|
||||
|
||||
<com.navinfo.omqs.ui.widget.MyEditeText
|
||||
style="@style/card_text_font_default"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/fm_card_map_down_status_bg"
|
||||
android:gravity="start"
|
||||
android:hint="请输入备注信息"
|
||||
android:inputType="textMultiLine"
|
||||
@ -118,6 +191,9 @@
|
||||
android:maxLines="3"
|
||||
android:text="@={viewModel.liveDataQsRecordBean.description}" />
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
<item
|
||||
android:id="@+id/save"
|
||||
android:contentDescription="保存数据"
|
||||
android:icon="@drawable/baseline_save_24"
|
||||
android:icon="@drawable/icon_save"
|
||||
android:title="保存"
|
||||
app:showAsAction="ifRoom" />
|
||||
|
||||
|
||||
@ -163,6 +163,7 @@
|
||||
<color name="cvm_red">#FF3B30</color>
|
||||
<color name="btn_blue_solid">#108ee9</color>
|
||||
<color name="titleColor">#2631DD</color>
|
||||
<color name="contentColor">#000000</color>
|
||||
<!-- 一键连接对话框背景色 -->
|
||||
<color name="bg_gray2">#d1d1d1</color>
|
||||
<!-- 一键连接时间显示区域背景色 -->
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<resources>
|
||||
<string name="app_name">OMQualityInspection</string>
|
||||
<string name="app_name">LandScope</string>
|
||||
<string name="action_settings">Settings</string>
|
||||
<!-- Strings used for fragments for navigation -->
|
||||
<string name="personal_center">个人中心</string>
|
||||
|
||||
@ -32,6 +32,28 @@
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
</style>
|
||||
|
||||
<!-- 默认字体 -->
|
||||
<style name="card_content_font_default">
|
||||
<item name="android:gravity">center_vertical</item>
|
||||
<item name="android:textSize">@dimen/card_title_font_2size</item>
|
||||
<item name="android:textColor">@color/contentColor</item>
|
||||
<item name="android:padding">10dp</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
</style>
|
||||
|
||||
<!-- 默认显示内容字体 -->
|
||||
<style name="card_text_font_default">
|
||||
<item name="android:gravity">center_vertical</item>
|
||||
<item name="android:textSize">@dimen/card_title_font_2size</item>
|
||||
<item name="android:textColor">@color/titleColor</item>
|
||||
<item name="android:padding">10dp</item>
|
||||
<item name="android:drawableRight">@drawable/icon_down_arrow</item>
|
||||
<item name="android:background">@drawable/fm_card_map_down_status_bg</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
</style>
|
||||
|
||||
<!-- 默认字体 -->
|
||||
<style name="content_font_default_size_13sp">
|
||||
<item name="android:gravity">center_vertical</item>
|
||||
|
||||
Binary file not shown.
|
Before 
(image error) Size: 6.0 KiB After 
(image error) Size: 6.3 KiB
|
Loading…
x
Reference in New Issue
Block a user