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

修改页面bug

Browse Source
This commit is contained in:
md
2021-07-26 21:12:53 +08:00
parent 7339f6ad1d
commit e8537942fc
44 changed files with 455 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/color/test_color_selector.xml
View File

@@ -3,6 +3,8 @@
<item android:state_pressed="true"
android:color="#ff0000ff"/> <!-- pressed 看下的颜色-->
<item android:state_focused="true"
android:color="#D8D7D7"/> <!-- focused -->
android:color="#ff000000"/> <!-- focused -->
<item android:state_enabled="false"
android:color="@color/colorGray"/> <!-- focused -->
<item android:color="#ff000000"/> <!-- default 默认颜色 -->
</selector>

BIN
app/src/main/res/drawable-hdpi/graycharge.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/src/main/res/drawable-hdpi/grayother.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
app/src/main/res/drawable-hdpi/graypoi.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
app/src/main/res/drawable-hdpi/grayroad.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

30
app/src/main/res/drawable-hdpi/ic_launcher_foreground.xml Normal file
View File

@@ -0,0 +1,30 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="85.84757"
android:endY="92.4963"
android:startX="42.9492"
android:startY="49.59793"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
</vector>

0
app/src/main/res/drawable/icon_add_bg.png → app/src/main/res/drawable-hdpi/icon_add_bg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 165 B

After

Width:  |  Height:  |  Size: 165 B

0
app/src/main/res/drawable/icon_del_bg.png → app/src/main/res/drawable-hdpi/icon_del_bg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 126 B

After

Width:  |  Height:  |  Size: 126 B

0
app/src/main/res/drawable/marker_charge_bg1.png → app/src/main/res/drawable-hdpi/marker_charge_bg1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

0
app/src/main/res/drawable/marker_other_bg1.png → app/src/main/res/drawable-hdpi/marker_other_bg1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

0
app/src/main/res/drawable/marker_poi_bg1.png → app/src/main/res/drawable-hdpi/marker_poi_bg1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
app/src/main/res/drawable/marker_poi_video_bg1.png → app/src/main/res/drawable-hdpi/marker_poi_video_bg1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

8
app/src/main/res/drawable/selector_hui_bg.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/shape_red_radius_bg_disable" android:state_checked="true" />
<item android:drawable="@drawable/shape_red_radius_bg_disable" android:state_selected="true" />
<item android:drawable="@drawable/shape_red_radius_bg_disable" android:state_pressed="true" />
<item android:drawable="@drawable/shape_red_radius_bg_disable" android:state_enabled="false"/>
<item android:drawable="@drawable/shape_hui_bg" />
</selector>

8
app/src/main/res/drawable/selector_red_bg.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/shape_red_radius_bg_disable" android:state_checked="true" />
<item android:drawable="@drawable/shape_red_radius_bg_disable" android:state_selected="true" />
<item android:drawable="@drawable/shape_red_radius_bg_disable" android:state_pressed="true" />
<item android:drawable="@drawable/shape_red_radius_bg_disable" android:state_enabled="false"/>
<item android:drawable="@drawable/shape_radius_bg" />
</selector>

4
app/src/main/res/drawable/shap_red_bg.xml Normal file
View File

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

5
app/src/main/res/drawable/shape_hui_bg.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=" #EFEDED" />
</shape>

5
app/src/main/res/drawable/shape_radius_bg.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/colorPrimaryBlue" />
</shape>

36
app/src/main/res/layout/charging_pile_fragment.xml
View File

@@ -144,12 +144,14 @@
android:layout_width="150dp"
android:layout_height="wrap_content"
android:text="对所有车辆开放"
android:textColor="@color/test_color_selector"
/>
<CheckBox
android:id="@+id/check_button2"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:text="对环卫车开放"
android:textColor="@color/test_color_selector"
/>
</LinearLayout>
@@ -163,12 +165,14 @@
android:layout_width="150dp"
android:layout_height="wrap_content"
android:text="对公交车开放"
android:textColor="@color/test_color_selector"
/>
<CheckBox
android:id="@+id/check_button4"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:text="对出租车开放"
android:textColor="@color/test_color_selector"
/>
</LinearLayout>
@@ -182,6 +186,7 @@
android:id="@+id/check_button5"
android:layout_width="250dp"
android:layout_height="40dp"
android:textColor="@color/test_color_selector"
android:text="对除环卫,公交,出租,品牌,之外的其他 特种车辆开放"
/>
</LinearLayout>
@@ -313,7 +318,7 @@
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginTop="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:layout_alignParentLeft="true"
android:layout_marginRight="5dp"
android:layout_marginBottom="10dp">
@@ -338,6 +343,7 @@
<ImageView
android:id="@+id/iv_panorama"
android:layout_centerInParent="true"
android:scaleType="fitXY"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
@@ -348,7 +354,7 @@
android:layout_height="100dp"
android:layout_marginTop="10dp"
android:layout_centerHorizontal="true"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:layout_marginRight="5dp"
android:layout_marginBottom="10dp">
<ImageView
@@ -372,6 +378,7 @@
<ImageView
android:id="@+id/iv_coding"
android:layout_centerInParent="true"
android:scaleType="fitXY"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
@@ -428,7 +435,7 @@
android:layout_height="100dp"
android:layout_alignParentLeft="true"
android:layout_marginTop="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:layout_marginRight="5dp"
android:layout_marginBottom="10dp">
<ImageView
@@ -453,6 +460,7 @@
android:id="@+id/iv_equipment"
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:scaleType="fitXY"
android:layout_height="match_parent"
/>
</RelativeLayout>
@@ -461,7 +469,7 @@
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginTop="10dp"
android:background="#EFEDED"
android:background="@drawable/selector_hui_bg"
android:layout_centerHorizontal="true"
android:layout_marginRight="5dp"
android:layout_marginBottom="10dp">
@@ -487,6 +495,7 @@
android:id="@+id/iv_facility"
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:scaleType="fitXY"
android:layout_height="match_parent"
/>
</RelativeLayout>
@@ -495,7 +504,7 @@
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginTop="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:visibility="gone"
android:layout_alignParentRight="true"
android:layout_centerHorizontal="true"
@@ -520,6 +529,7 @@
android:layout_below="@id/image_scutcheon"
/>
<ImageView
android:scaleType="fitXY"
android:id="@+id/iv_scutcheon"
android:layout_centerInParent="true"
android:layout_width="match_parent"
@@ -532,7 +542,7 @@
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginTop="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:visibility="gone"
android:layout_centerHorizontal="true"
android:layout_marginRight="5dp"
@@ -560,6 +570,7 @@
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
/>
</RelativeLayout>
<RelativeLayout
@@ -612,7 +623,7 @@
android:id="@+id/rl_usable"
android:layout_width="100dp"
android:layout_height="match_parent"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:layout_alignParentLeft="true"
>
<ImageView
@@ -637,6 +648,7 @@
<ImageView
android:id="@+id/iv_usable"
android:layout_width="match_parent"
android:scaleType="fitXY"
android:layout_height="match_parent" />
</RelativeLayout>
<RelativeLayout
@@ -644,7 +656,7 @@
android:layout_width="100dp"
android:layout_centerHorizontal="true"
android:layout_height="match_parent"
android:background="#EFEDED">
android:background="@drawable/selector_hui_bg">
<ImageView
android:id="@+id/image_available"
android:layout_centerHorizontal="true"
@@ -668,6 +680,7 @@
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
/>
</RelativeLayout>
<RelativeLayout
@@ -675,7 +688,7 @@
android:layout_width="100dp"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:background="#03A9F4">
android:background="@drawable/selector_red_bg">
<ImageView
android:id="@+id/image_parking"
android:layout_centerHorizontal="true"
@@ -699,6 +712,7 @@
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
/>
</RelativeLayout>
@@ -707,7 +721,7 @@
android:id="@+id/rl_number"
android:layout_width="100dp"
android:layout_height="100dp"
android:background="#EFEDED"
android:background="@drawable/selector_hui_bg"
android:layout_marginTop="10dp"
android:layout_alignParentLeft="true"
>
@@ -731,6 +745,7 @@
/>
<ImageView
android:scaleType="fitXY"
android:id="@+id/iv_number"
android:layout_width="match_parent"
android:layout_height="match_parent" />
@@ -771,6 +786,7 @@
android:background="@color/white"
android:hint="任务描述"
android:textSize="15sp"
android:textColor="@color/test_color_selector"
/>
</LinearLayout>

26
app/src/main/res/layout/charging_station_fragment.xml
View File

@@ -111,7 +111,7 @@
android:layout_toEndOf="@id/tv_name"
android:layout_toStartOf="@id/tv_examine"
android:textSize="15sp"
android:textColor="#333" />
android:textColor="@color/test_color_selector" />
<TextView
android:id="@+id/tv_examine"
android:layout_width="wrap_content"
@@ -137,7 +137,7 @@
android:id="@+id/tv_site"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="地址*"
android:text="地址"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:textColor="#333"
@@ -157,7 +157,7 @@
android:background="@color/white"
android:hint="地址"
android:textSize="15sp"
android:textColor="#333" />
android:textColor="@color/test_color_selector" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/linear_phone"
@@ -302,7 +302,7 @@
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp">
<ImageView
@@ -326,6 +326,7 @@
<ImageView
android:id="@+id/iv_panorama"
android:layout_centerInParent="true"
android:scaleType="fitXY"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
@@ -336,7 +337,7 @@
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp">
<ImageView
@@ -360,6 +361,7 @@
<ImageView
android:id="@+id/iv_name"
android:layout_centerInParent="true"
android:scaleType="fitXY"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
@@ -370,7 +372,7 @@
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp">
<ImageView
@@ -394,6 +396,7 @@
<ImageView
android:id="@+id/iv_internal"
android:layout_centerInParent="true"
android:scaleType="fitXY"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
@@ -410,7 +413,7 @@
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp">
<ImageView
@@ -436,6 +439,7 @@
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
/>
</RelativeLayout>
<RelativeLayout
@@ -444,7 +448,7 @@
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp">
<ImageView
@@ -470,9 +474,11 @@
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_null"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
@@ -510,7 +516,7 @@
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:padding="3dp"
android:background="@drawable/shape_red_radius_bg"
android:background="@drawable/selector_red_radius_bg"
android:orientation="horizontal"
app:layout_constraintTop_toTopOf="@+id/tv_03"
app:layout_constraintBottom_toBottomOf="@+id/tv_03"
@@ -590,7 +596,7 @@
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/shape_red_radius_bg"
android:background="@drawable/selector_red_radius_bg"
android:text="保存本地"
android:textColor="@color/white" />

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

@@ -8,13 +8,14 @@
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_width="280dp"
android:layout_height="wrap_content"
android:text="众包录像 测试3"
android:textColor="#333"
android:layout_margin="20dp"
android:textSize="18sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView

18
app/src/main/res/layout/fragment_message.xml
View File

@@ -13,6 +13,7 @@
android:background="#fff"
android:paddingTop="@dimen/top_pind_sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
@@ -21,24 +22,27 @@
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:padding="10dp"
android:src="@drawable/ic_arrow_left" />
<!-- style="@style/text_style_toolbar_title"-->
<TextView
android:id="@+id/tv_message"
style="@style/text_style_toolbar_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginLeft="50dp"
android:text="消息"
android:textColor="#000" />
<TextView
android:id="@+id/tv_read"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="全部已读"
android:layout_marginTop="10dp"
android:textColor="@color/black"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"/>
android:layout_marginTop="20dp"
android:layout_marginRight="10dp"
android:text="全部已读"
android:textColor="@color/black" />
</RelativeLayout>
<com.jcodecraeer.xrecyclerview.XRecyclerView
android:id="@+id/message_recycler"

48
app/src/main/res/layout/fragment_other.xml
View File

@@ -150,6 +150,7 @@
android:layout_marginLeft="15dp"
android:background="@null"
android:hint="任务名称"
android:textColor="@color/test_color_selector"
android:textSize="12sp" />
</LinearLayout>
@@ -184,7 +185,7 @@
android:layout_width="150dp"
android:layout_height="100dp"
android:layout_margin="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:gravity="center">
<ImageView
@@ -217,7 +218,7 @@
android:layout_width="150dp"
android:layout_height="100dp"
android:layout_margin="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:gravity="center">
<ImageView
@@ -256,37 +257,38 @@
app:layout_constraintLeft_toLeftOf="@+id/tv_other_picture"
app:layout_constraintTop_toBottomOf="@id/ll_image_picture" />
<!-- <LinearLayout-->
<!-- android:id="@+id/linear_describe"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- -->
<!-- -->
<!-- android:layout_marginEnd="10dp"-->
<!-- -->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@id/tv_03">-->
<LinearLayout
android:id="@+id/linear_describe"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:background="@drawable/underline"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_03">
<EditText
android:id="@+id/edit_other_describe"
android:layout_width="320dp"
android:layout_height="100dp"
android:layout_marginTop="10dp"
android:background="@drawable/underline"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:background="@color/white"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="top"
android:hint="任务描述"
android:paddingTop="10dp"
android:paddingLeft="10dp"
android:paddingTop="10dp"
android:paddingBottom="30dp"
app:layout_constraintLeft_toLeftOf="@+id/tv_03"
app:layout_constraintTop_toBottomOf="@+id/tv_03"
android:textColor="@color/test_color_selector"
android:textSize="15sp"
/>
<!-- </LinearLayout>-->
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
@@ -299,7 +301,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/edit_other_describe">
app:layout_constraintTop_toBottomOf="@id/linear_describe">
<Button
android:id="@+id/btn_other_local"
@@ -307,7 +309,7 @@
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/shape_red_radius_bg"
android:background="@drawable/selector_red_radius_bg"
android:text="保存本地"
android:textColor="@color/white" />

44
app/src/main/res/layout/fragment_road.xml
View File

@@ -56,6 +56,7 @@
android:layout_width="200dp"
android:gravity="center_vertical"
android:layout_height="match_parent"
android:textSize="14sp"
android:background="@null" />
</LinearLayout>
@@ -91,11 +92,13 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="@color/test_color_selector"
android:text="车行" />
<RadioButton
android:id="@+id/rb_bicycle"
android:layout_width="0dp"
android:textColor="@color/test_color_selector"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="自行车" />
@@ -103,6 +106,7 @@
<RadioButton
android:id="@+id/rb_walking"
android:layout_width="0dp"
android:textColor="@color/test_color_selector"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="步行" />
@@ -110,6 +114,7 @@
<RadioButton
android:id="@+id/rb_manual"
android:layout_width="0dp"
android:textColor="@color/test_color_selector"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="手动" />
@@ -170,17 +175,36 @@
android:text="03.描述"
android:textColor="@color/black"
android:textSize="16sp" />
<LinearLayout
android:id="@+id/linear_describe"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:background="@drawable/underline"
app:layout_constraintTop_toBottomOf="@id/tv_03"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<EditText
android:id="@+id/et_desc"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="30dp"
android:layout_margin="2dp"
android:gravity="top"
android:paddingLeft="10dp"
android:paddingTop="10dp"
android:focusable="true"
android:focusableInTouchMode="true"
android:background="@color/white"
android:hint="任务描述"
android:textSize="15sp"
android:textColor="@color/test_color_selector"
<EditText
android:id="@+id/et_desc"
android:layout_width="320dp"
android:layout_height="100dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:background="@drawable/road_shape"
android:hint="任务描述"
android:paddingLeft="10dp"
android:paddingBottom="50dp" />
/>
</LinearLayout>
</LinearLayout>
<LinearLayout

10
app/src/main/res/layout/fragment_stay_submit.xml
View File

@@ -9,7 +9,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_stay_type"
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_height="70dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -63,14 +63,14 @@
android:id="@+id/tv_stay_result"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="15dp"
android:layout_margin="10dp"
android:text="筛选结果"
android:textSize="25sp"
android:textStyle="bold" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="300dp">
android:layout_height="280dp">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/stay_xrv"
@@ -97,7 +97,7 @@
style="@style/CheckBoxTheme"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="15dp"
android:layout_margin="10dp"
android:text="全选"
android:textSize="17sp" />
@@ -105,7 +105,7 @@
android:id="@+id/tv_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="15dp"
android:layout_margin="10dp"
android:text="删除"
android:textColor="@color/colorPrimaryBlue"
android:textSize="18sp" />

33
app/src/main/res/layout/item_filter.xml
View File

@@ -1,44 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<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="match_parent"
android:layout_height="wrap_content">
<!-- android:lines="1"-->
<TextView
android:id="@+id/tv_name"
android:layout_width="300dp"
android:layout_width="260dp"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:text="测试彼此"
android:textColor="#333"
android:textSize="15sp"
android:lines="1"
app:layout_constraintRight_toLeftOf="@+id/tv_money"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<TextView
android:id="@+id/tv_form"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="道路"
android:padding="5dp"
android:textColor="#00BCD4"
android:background="@drawable/underline"
android:textSize="12sp"
android:layout_marginTop="5dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="5dp"
android:background="@drawable/underline"
android:padding="5dp"
android:text="道路"
android:textColor="#00BCD4"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_name"/>
app:layout_constraintTop_toBottomOf="@+id/tv_name" />
<TextView
android:id="@+id/tv_task_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:padding="5dp"
android:background="@drawable/underline"
android:padding="5dp"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="@+id/tv_form"
app:layout_constraintStart_toEndOf="@+id/tv_form"
@@ -63,9 +61,10 @@
android:layout_marginRight="10dp"
android:text="￥3.5"
android:textColor="#000"
android:textSize="20sp"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintLeft_toRightOf="@+id/tv_name"
app:layout_constraintTop_toTopOf="parent" />
<TextView

24
app/src/main/res/layout/poi_fragment.xml
View File

@@ -139,7 +139,7 @@
android:id="@+id/tv_site"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="地址*"
android:text="地址"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:textColor="#333"
@@ -156,10 +156,11 @@
android:layout_centerVertical="true"
android:layout_marginLeft="18dp"
android:layout_toRightOf="@id/tv_site"
android:textColor="@color/test_color_selector"
android:background="@color/white"
android:hint="poi地址"
android:textSize="15sp"
android:textColor="#333" />
/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/linear_phone"
@@ -261,7 +262,8 @@
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp">
<ImageView
@@ -284,6 +286,7 @@
/>
<ImageView
android:id="@+id/iv_panorama"
android:scaleType="fitXY"
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -295,7 +298,7 @@
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:background="#03A9F4"
android:background="@drawable/selector_red_bg"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp">
<ImageView
@@ -318,6 +321,7 @@
/>
<ImageView
android:id="@+id/iv_name"
android:scaleType="fitXY"
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -329,7 +333,7 @@
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:background="#EFEDED"
android:background="@drawable/selector_hui_bg"
android:layout_marginRight="5dp"
android:layout_marginBottom="10dp">
<ImageView
@@ -352,6 +356,7 @@
/>
<ImageView
android:id="@+id/iv_internal"
android:scaleType="fitXY"
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -369,7 +374,7 @@
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:background="#EFEDED"
android:background="@drawable/selector_hui_bg"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp">
<ImageView
@@ -392,6 +397,7 @@
/>
<ImageView
android:id="@+id/iv_card"
android:scaleType="fitXY"
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -403,7 +409,7 @@
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:background="#EFEDED"
android:background="@drawable/selector_hui_bg"
android:layout_marginRight="5dp"
android:layout_marginBottom="10dp">
<ImageView
@@ -426,6 +432,7 @@
/>
<ImageView
android:id="@+id/iv_else"
android:scaleType="fitXY"
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -475,6 +482,7 @@
android:background="@color/white"
android:hint="任务描述"
android:textSize="15sp"
android:textColor="@color/test_color_selector"
/>
@@ -499,7 +507,7 @@
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/shape_red_radius_bg"
android:background="@drawable/selector_red_radius_bg"
android:text="保存本地"
android:textColor="@color/white" />

43
app/src/main/res/layout/poi_video_fragment.xml
View File

@@ -84,11 +84,13 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="@color/test_color_selector"
android:text="车行"/>
<RadioButton
android:id="@+id/rb_bicycle"
android:layout_width="0dp"
android:layout_weight="1"
android:textColor="@color/test_color_selector"
android:layout_height="wrap_content"
android:text="自行车"/>
<RadioButton
@@ -96,11 +98,13 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="@color/test_color_selector"
android:text="步行"/>
<RadioButton
android:id="@+id/rb_manual"
android:layout_width="0dp"
android:layout_weight="1"
android:textColor="@color/test_color_selector"
android:layout_height="wrap_content"
android:text="手动"/>
</RadioGroup>
@@ -205,17 +209,36 @@
android:text="04.描述"
android:textColor="@color/black"
android:textSize="16sp" />
<LinearLayout
android:id="@+id/linear_describe"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:background="@drawable/underline"
app:layout_constraintTop_toBottomOf="@id/tv_03"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<EditText
android:id="@+id/et_desc"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="30dp"
android:layout_margin="2dp"
android:gravity="top"
android:paddingLeft="10dp"
android:paddingTop="10dp"
android:focusable="true"
android:focusableInTouchMode="true"
android:background="@color/white"
android:hint="任务描述"
android:textSize="15sp"
android:textColor="@color/test_color_selector"
<EditText
android:id="@+id/et_desc"
android:layout_width="320dp"
android:layout_height="100dp"
android:layout_marginTop="10dp"
android:background="@drawable/road_shape"
android:hint="任务描述"
android:paddingLeft="10dp"
android:layout_marginLeft="10dp"
android:paddingBottom="50dp" />
/>
</LinearLayout>
</LinearLayout>
<LinearLayout

4
app/src/main/res/values/styles.xml
View File

@@ -81,7 +81,7 @@
<!-- ‘我的-用户资料’方框设置-->
<style name="user_style">
<item name="android:background">@drawable/user_rz</item>
<item name="android:background">@drawable/selector_red_bg</item>
</style>
<!-- ‘我的-用户资料’字体设置-->
<style name="user_text_style">
@@ -122,7 +122,7 @@
<item name="android:textStyle">bold</item>
</style>
<style name="user_data_style">
<item name="android:background">@drawable/user_style</item>
<item name="android:background">@drawable/selector_red_radius_bg</item>
<item name="android:textColor">@color/white</item>
</style>