Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
This commit is contained in:
squallzhjch
BIN
app/src/main/res/drawable-xhdpi/icon_version.png
Normal file
BIN
app/src/main/res/drawable-xhdpi/icon_version.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 431 B |
BIN
app/src/main/res/drawable-xxhdpi/icon_version.png
Normal file
BIN
app/src/main/res/drawable-xxhdpi/icon_version.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 431 B |
@@ -1,107 +1,135 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<com.navinfo.omqs.ui.widget.LeftDeleteView 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="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/selector_adapter_item_select_bg"
|
||||
android:paddingLeft="8dp"
|
||||
android:paddingTop="6dp"
|
||||
android:paddingRight="8dp"
|
||||
android:paddingBottom="8dp"
|
||||
tools:context="com.navinfo.omqs.ui.fragment.tasklist.TaskListAdapter">
|
||||
tools:context="com.navinfo.omqs.ui.fragment.tasklist.TaskListAdapter"
|
||||
app:deleteBtnWidth="64"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/task_list_head"
|
||||
android:layout_width="16dp"
|
||||
android:layout_height="16dp"
|
||||
android:layout_alignTop="@id/task_name"
|
||||
android:layout_marginLeft="6dp"
|
||||
android:layout_marginTop="2dp"
|
||||
android:layout_marginRight="6dp"
|
||||
android:background="@drawable/selector_task_head" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/task_name"
|
||||
<RelativeLayout
|
||||
android:id="@+id/task_item_layout"
|
||||
android:paddingLeft="8dp"
|
||||
android:paddingTop="6dp"
|
||||
android:paddingRight="8dp"
|
||||
android:paddingBottom="8dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_toRightOf="@id/task_list_head"
|
||||
android:text="任务名称"
|
||||
android:textColor="#15141F"
|
||||
android:textSize="14sp" />
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/task_list_head"
|
||||
android:layout_width="16dp"
|
||||
android:layout_height="16dp"
|
||||
android:layout_alignTop="@id/task_name"
|
||||
android:layout_marginLeft="6dp"
|
||||
android:layout_marginTop="2dp"
|
||||
android:layout_marginRight="6dp"
|
||||
android:background="@drawable/selector_task_head" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/task_name"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_toRightOf="@id/task_list_head"
|
||||
android:text="任务名称"
|
||||
android:textColor="#15141F"
|
||||
android:textSize="14sp" />
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/task_data_version"
|
||||
style="@style/map_size_font_style"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/task_name"
|
||||
android:layout_alignLeft="@id/task_name"
|
||||
android:layout_marginTop="5dp"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:text="版本号"
|
||||
android:textColor="@color/gray_121"
|
||||
android:textSize="13sp" />
|
||||
<TextView
|
||||
android:id="@+id/task_data_version"
|
||||
style="@style/map_size_font_style"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/task_name"
|
||||
android:layout_alignLeft="@id/task_name"
|
||||
android:layout_marginTop="5dp"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:text="版本号"
|
||||
android:textColor="@color/gray_121"
|
||||
android:textSize="13sp" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/task_city_name"
|
||||
style="@style/map_size_font_style"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/task_data_version"
|
||||
android:layout_alignLeft="@id/task_name"
|
||||
android:text="省市名称"
|
||||
android:textColor="@color/gray_121"
|
||||
android:textSize="13sp" />
|
||||
<TextView
|
||||
android:id="@+id/task_city_name"
|
||||
style="@style/map_size_font_style"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/task_data_version"
|
||||
android:layout_alignLeft="@id/task_name"
|
||||
android:text="省市名称"
|
||||
android:textColor="@color/gray_121"
|
||||
android:textSize="13sp" />
|
||||
|
||||
<com.navinfo.omqs.ui.widget.TextProgressButtonBar
|
||||
android:id="@+id/task_download_btn"
|
||||
android:layout_width="75dp"
|
||||
android:layout_height="22dp"
|
||||
android:layout_alignBottom="@id/task_city_name"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginTop="5dp"
|
||||
app:backgroundcolor="#888FB3"
|
||||
app:text="下载"
|
||||
app:textSize="@dimen/card_title_font_2size"
|
||||
app:textcolor="@color/white" />
|
||||
<com.navinfo.omqs.ui.widget.TextProgressButtonBar
|
||||
android:id="@+id/task_download_btn"
|
||||
android:layout_width="75dp"
|
||||
android:layout_height="22dp"
|
||||
android:layout_alignBottom="@id/task_city_name"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginTop="5dp"
|
||||
app:backgroundcolor="#888FB3"
|
||||
app:text="下载"
|
||||
app:textSize="@dimen/card_title_font_2size"
|
||||
app:textcolor="@color/white" />
|
||||
|
||||
<com.navinfo.omqs.ui.widget.TextProgressButtonBar
|
||||
android:id="@+id/task_upload_btn"
|
||||
android:layout_width="75dp"
|
||||
android:layout_height="22dp"
|
||||
android:layout_alignBottom="@id/task_city_name"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginTop="5dp"
|
||||
android:visibility="gone"
|
||||
app:backgroundcolor="#888FB3"
|
||||
app:text="未上传"
|
||||
app:textSize="@dimen/card_title_font_2size"
|
||||
app:textcolor="@color/white" />
|
||||
<com.navinfo.omqs.ui.widget.TextProgressButtonBar
|
||||
android:id="@+id/task_upload_btn"
|
||||
android:layout_width="75dp"
|
||||
android:layout_height="22dp"
|
||||
android:layout_alignBottom="@id/task_city_name"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginTop="5dp"
|
||||
android:visibility="gone"
|
||||
app:backgroundcolor="#888FB3"
|
||||
app:text="未上传"
|
||||
app:textSize="@dimen/card_title_font_2size"
|
||||
app:textcolor="@color/white" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/task_status"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:layout_toLeftOf="@id/task_download_btn"
|
||||
android:clickable="true"
|
||||
android:focusable="false"
|
||||
android:shadowColor="@android:color/transparent"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="@dimen/card_title_font_2size" />
|
||||
<TextView
|
||||
android:id="@+id/task_status"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:layout_toLeftOf="@id/task_download_btn"
|
||||
android:clickable="true"
|
||||
android:focusable="false"
|
||||
android:shadowColor="@android:color/transparent"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="@dimen/card_title_font_2size" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/task_progress_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignTop="@id/task_download_btn"
|
||||
android:layout_alignBottom="@id/task_download_btn"
|
||||
android:layout_toLeftOf="@id/task_download_btn"
|
||||
android:gravity="center"
|
||||
android:visibility="invisible" />
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/task_delete_layout"
|
||||
android:background="@color/red"
|
||||
android:layout_width="64dp"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<TextView
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_centerInParent="true"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:focusable="false"
|
||||
android:enabled="false"
|
||||
android:text="关闭"
|
||||
android:textColor="#15141F"
|
||||
android:textSize="@dimen/left_pannel_title_font" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
</com.navinfo.omqs.ui.widget.LeftDeleteView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/task_progress_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignTop="@id/task_download_btn"
|
||||
android:layout_alignBottom="@id/task_download_btn"
|
||||
android:layout_toLeftOf="@id/task_download_btn"
|
||||
android:gravity="center"
|
||||
android:visibility="invisible" />
|
||||
</RelativeLayout>
|
||||
@@ -31,8 +31,7 @@
|
||||
android:paddingRight="@dimen/eight"
|
||||
android:paddingTop="@dimen/eight"
|
||||
android:text="title"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="@dimen/card_title_font_2size" />
|
||||
android:textColor="@color/black" />
|
||||
|
||||
<View
|
||||
android:id="@+id/title_divider"
|
||||
@@ -82,7 +81,7 @@
|
||||
android:paddingTop="@dimen/twenty"
|
||||
android:text="提示内容"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="@dimen/card_title_font_3size" />
|
||||
android:textSize="@dimen/card_title_font_2size" />
|
||||
</RelativeLayout>
|
||||
|
||||
|
||||
|
||||
@@ -29,6 +29,10 @@
|
||||
<item
|
||||
android:icon="@drawable/ic_baseline_sim_card_download_24"
|
||||
android:title="备份数据" />
|
||||
<item
|
||||
android:id="@+id/personal_center_menu_version"
|
||||
android:icon="@drawable/ic_baseline_layers_24"
|
||||
android:title="版本：ONE_QE_V1.1.0_20230630_A" />
|
||||
</group>
|
||||
<group android:checkableBehavior="single">
|
||||
<item android:title="小标题">
|
||||
|
||||
@@ -9,4 +9,10 @@
|
||||
<attr name="textSize" format="dimension" />
|
||||
<attr name="text" format="string" />
|
||||
</declare-styleable>
|
||||
|
||||
//自定义删除按钮的宽度
|
||||
<declare-styleable name="LeftDeleteView">
|
||||
<attr name="deleteBtnWidth" format="float"/>
|
||||
</declare-styleable>
|
||||
|
||||
</resources>
|
||||
Reference in New Issue
Block a user