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

解决冲突

Browse Source
This commit is contained in:
wds
2021-06-03 18:18:40 +08:00
parent a2304731c3 7b77c7874a
commit c4c3184600
22 changed files with 168 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/drawable/ic_baseline_arrow_forward.xml
View File

@@ -1,5 +1,5 @@
<vector android:alpha="0.91" android:height="20dp"
android:tint="#919191" android:viewportHeight="24"
android:tint="#919191" android:viewportHeight="22"
android:viewportWidth="24" android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M5.88,4.12L13.76,12l-7.88,7.88L8,22l10,-10L8,2z"/>
</vector>

6
app/src/main/res/drawable/map_down_shape.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="2dp"/>
<size android:width="200dp" android:height="50dp"/>
<stroke android:color="#F3E7C5" android:width="1dp"/>
</shape>

2
app/src/main/res/drawable/text_color.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size android:width="3dp" android:height="6dp"/>
<size android:width="1.5dp" android:height="3dp"/>
<solid android:color="@color/colorBack" />
</shape>

4
app/src/main/res/layout/activity_login.xml
View File

@@ -45,7 +45,7 @@
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:hint="ID/手机号"
android:hint=" ID/手机号"
android:paddingBottom="20dp"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
@@ -69,7 +69,7 @@
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:hint="请输入密码"
android:hint=" 请输入密码"
android:paddingBottom="15dp"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"

17
app/src/main/res/layout/issue_problem_item.xml
View File

@@ -1,16 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:orientation="vertical">
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="?android:attr/selectableItemBackground"
android:orientation="vertical"
android:paddingTop="15dp">
<TextView
android:id="@+id/tv_issue_title"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_height="30dp"
android:layout_marginLeft="15dp"
android:background="?android:attr/selectableItemBackground"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:textSize="16sp" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

14
app/src/main/res/layout/map_download_fragment.xml
View File

@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/rl_map_download"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#1BA5F1"
android:paddingTop="@dimen/top_pind_sp"
android:orientation="horizontal"
android:paddingTop="@dimen/top_pind_sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -20,13 +21,12 @@
android:layout_height="45dp"
android:layout_alignParentLeft="true"
android:layout_marginLeft="15dp"
android:src="@drawable/icon_arrow"
/>
android:src="@drawable/icon_arrow" />
<TextView
android:id="@+id/tv_download"
android:layout_width="wrap_content"
style="@style/text_style_toolbar_title"
android:layout_width="match_parent"
android:layout_toRightOf="@id/iv_find_task"
android:text="下载离线地图" />
</LinearLayout>
@@ -65,6 +65,6 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/linearLayout2" />
app:layout_constraintTop_toBottomOf="@+id/linearLayout2"/>
</androidx.constraintlayout.widget.ConstraintLayout>

9
app/src/main/res/layout/mine_fragment.xml
View File

@@ -159,7 +159,7 @@
android:drawableRight="@drawable/ic_baseline_arrow_forward"
android:gravity="center"
android:text="LV.1"
android:textSize="18sp" />
android:textSize="16sp" />
</RelativeLayout>
<View
@@ -182,15 +182,16 @@
android:layout_alignParentLeft="true"
style="@style/main_text_style" />
<TextView
android:layout_width="60dp"
android:layout_height="30dp"
android:layout_width="45dp"
android:layout_height="20dp"
android:text="new"
android:gravity="center"
android:gravity="center_horizontal"
android:layout_centerVertical="true"
style="@style/main_outLogin_style"
android:layout_toLeftOf="@id/image_view"
/>
<ImageView
android:id="@+id/image_view"
android:layout_width="wrap_content"

5
app/src/main/res/layout/user_attestation_fragment.xml
View File

@@ -17,8 +17,9 @@
<ImageView
android:id="@+id/iv_attestation"
android:layout_width="wrap_content"
android:layout_height="45dp"
android:layout_width="50dp"
android:layout_height="50dp"
android:padding="15dp"
android:layout_alignParentLeft="true"
android:layout_marginLeft="15dp"
android:src="@drawable/ic_baseline_arrow" />

12
app/src/main/res/layout/user_data_fragment.xml
View File

@@ -17,12 +17,12 @@
<ImageView
android:id="@+id/iv_user"
android:layout_width="wrap_content"
android:layout_height="45dp"
android:layout_width="50dp"
android:layout_height="50dp"
android:padding="15dp"
android:layout_alignParentLeft="true"
android:layout_marginLeft="15dp"
android:src="@drawable/icon_arrow"
/>
android:src="@drawable/icon_arrow" />
<TextView
android:id="@+id/tv_user"
@@ -74,18 +74,17 @@
style="@style/user_style"
android:layout_width="70dp"
android:layout_height="30dp"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:text="去认证"
android:textColor="#fff" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#F1F0F0" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="0dp"
@@ -112,7 +111,6 @@
android:layout_centerVertical="true"
/>
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"

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

@@ -47,7 +47,7 @@
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_margin="20dp"
android:background="#fff"
android:background="@mipmap/white_bg"
app:layout_constraintEnd_toEndOf="@+id/linear_hint"
app:layout_constraintStart_toStartOf="@+id/linear_hint"
app:layout_constraintTop_toBottomOf="@+id/rl_withdraw">