xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
squallzhjch
2023-08-25 09:28:04 +08:00
parent 5b2fcbddd9
commit f4495ea202
15 changed files with 115 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/res/drawable-v24/baseline_edit_note_48_select_red.xml
View File

@@ -1,5 +0,0 @@
<vector android:height="24dp" android:tint="#E91E63"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M3,10h11v2H3V10zM3,8h11V6H3V8zM3,16h7v-2H3V16zM18.01,12.87l0.71,-0.71c0.39,-0.39 1.02,-0.39 1.41,0l0.71,0.71c0.39,0.39 0.39,1.02 0,1.41l-0.71,0.71L18.01,12.87zM17.3,13.58l-5.3,5.3V21h2.12l5.3,-5.3L17.3,13.58z"/>
</vector>

7
app/src/main/res/drawable/shape_oval_red_bg.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/red" />
</shape>

2
app/src/main/res/layout/activity_main.xml
View File

@@ -141,7 +141,7 @@
<ImageButton
android:id="@+id/main_activity_calc_distance"
style="@style/top_right_drawer_btns_style"
android:onClick="@{()->mainActivity.onClickCalcDistance()}"
android:onClick="@{()->mainActivity.measuringToolOn()}"
android:src="@drawable/icon_calc_disance" />
<ImageButton

3
app/src/main/res/layout/adapter_item.xml
View File

@@ -3,6 +3,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/selector_adapter_item_select_bg"
android:padding="5dp">
<TextView
@@ -10,6 +11,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="name"
android:textColor="@color/black"
android:textColor="@color/selector_black_blue_color"
android:textSize="16sp" />
</FrameLayout>

11
app/src/main/res/layout/adapter_task.xml
View File

@@ -49,4 +49,15 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@drawable/selector_task_link_edit_icon" />
<ImageView
android:id="@+id/task_badge"
android:layout_width="8dp"
android:layout_height="8dp"
android:layout_marginTop="10dp"
android:layout_marginRight="4dp"
android:visibility="gone"
android:layout_alignTop="@id/task_edit"
android:layout_alignRight="@id/task_edit"
android:background="@drawable/shape_oval_red_bg" />
</RelativeLayout>

47
app/src/main/res/layout/fragment_evaluation_result.xml
View File

@@ -44,29 +44,27 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/evaluation_bar_cancel"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginRight="10dp"
android:background="@color/transparent"
android:src="@drawable/icon_fragment_close"
android:visibility="gone"
app:layout_constraintRight_toLeftOf="@id/evaluation_bar_save"
app:layout_constraintTop_toTopOf="@id/evaluation_bar_save" />
<ImageButton
android:id="@+id/evaluation_bar_delete"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerInParent="true"
android:layout_marginRight="5dp"
android:background="@color/transparent"
android:src="@drawable/icon_delete"
app:layout_constraintRight_toLeftOf="@id/evaluation_bar_cancel"
app:layout_constraintTop_toTopOf="@id/evaluation_bar_save" />
app:layout_constraintRight_toLeftOf="@id/evaluation_bar_save"
app:layout_constraintTop_toTopOf="@id/evaluation_bar_save"
app:layout_constraintBottom_toBottomOf="@id/evaluation_bar_save" />
<ImageButton
android:id="@+id/evaluation_bar_measuring"
android:layout_width="40dp"
android:layout_height="40dp"
android:background="@color/transparent"
android:src="@drawable/measuring_tool_distance"
app:layout_constraintRight_toLeftOf="@id/evaluation_bar_delete"
app:layout_constraintTop_toTopOf="@id/evaluation_bar_save"
app:layout_constraintBottom_toBottomOf="@id/evaluation_bar_save"/>
<androidx.core.widget.NestedScrollView
android:layout_width="0dp"
@@ -86,6 +84,23 @@
android:layout_height="match_parent"
android:layout_marginBottom="7dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="7dp"
android:orientation="horizontal">
<TextView
style="@style/evaluation_fragment_title_text_style"
android:text="ID" />
<TextView
android:id="@+id/evaluation_id"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"

6
app/src/main/res/layout/fragment_sign_info.xml
View File

@@ -10,10 +10,12 @@
<TextView
android:id="@+id/sign_info_title"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/icon_main_moreinfo_text_left"
android:layout_toLeftOf="@id/sign_info_cancel"
android:drawablePadding="4dp"
android:gravity="center_vertical"
android:layout_marginRight="5dp"
android:text="电子眼"
android:textColor="@color/orange" />