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

merge code

Browse Source
This commit is contained in:
qiji4215
2023-05-05 16:58:03 +08:00
parent af79ae4146
commit 6b1ac4df9b
19 changed files with 184 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/res/layout/adapter_sound_list.xml
View File

@@ -1,21 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout 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="@color/ivory"
android:background="@color/white"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:paddingRight="10dp"
android:paddingBottom="5dp"
tools:context="com.navinfo.omqs.ui.fragment.evaluationresult.SoundListAdapter">
<LinearLayout
<RelativeLayout
android:id="@+id/rl_sound_content"
android:layout_alignParentRight="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bg_select_sound_xml"
android:background="@drawable/selector_bg_video_button"
android:gravity="center_vertical"
android:minWidth="50dp"
android:orientation="horizontal"
@@ -26,20 +27,22 @@
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="6dp"
android:gravity="left|center"
android:layout_alignParentLeft="true"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:lineSpacingExtra="2dp"
android:text=""
android:textColor="@color/font_blue_reg"
android:textColor="@color/white"
android:textSize="15sp" />
<ImageView
android:id="@+id/iv_sound_anim"
android:paddingLeft="10dp"
android:layout_alignParentRight="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/sound_anim" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</RelativeLayout>

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

@@ -26,14 +26,38 @@
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/evaluation_bar"
style="@style/card_title_font_default"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/white"
app:menu="@menu/evaluation_bar_mean"
app:title="Mark" />
android:layout_height="match_parent">
<TextView
android:padding="10dp"
android:id="@+id/evaluation_bar"
style="@style/card_title_font_default"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="Mark" />
<ImageButton
android:id="@+id/evaluation_bar_save"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_alignParentRight="true"
android:background="@drawable/icon_save" />
<ImageButton
android:id="@+id/evaluation_bar_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:layout_centerInParent="true"
android:layout_toLeftOf="@+id/evaluation_bar_save"
android:background="@drawable/btn_delete_xml" />
</RelativeLayout>
</com.google.android.material.appbar.AppBarLayout>