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

解决冲突

Browse Source
This commit is contained in:
wds
2021-08-10 14:50:29 +08:00
parent 9a4917d3ec 450815c05c
commit c03b3cb597
18 changed files with 248 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,7 +83,7 @@
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintTop_toTopOf="@+id/btn_switch"
android:background="@color/whiteAlpha50"
android:padding="@dimen/default_widget_padding"
android:format="00:00:00"

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

@@ -90,7 +90,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<TextView
android:id="@+id/tv_name"
android:id="@+id/tv_name_pic"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="名称*"
@@ -108,11 +108,11 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="18dp"
android:layout_toRightOf="@id/tv_name"
android:layout_toRightOf="@id/tv_name_pic"
android:background="@color/white"
android:hint="名称"
android:singleLine="true"
android:layout_toEndOf="@id/tv_name"
android:layout_toEndOf="@id/tv_name_pic"
android:layout_toStartOf="@id/tv_examine"
android:textSize="15sp"
android:textColor="@color/test_color_selector" />

57
app/src/main/res/layout/fragment_forget_paw.xml
View File

@@ -62,10 +62,13 @@
<EditText
android:id="@+id/et_forgetPaw_phone"
android:layout_width="300dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:background="@null"
android:digits="1234567890"
android:hint="11为手机号码"
android:maxLength="11"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:textColorHint="@color/colorTransparent"
@@ -76,11 +79,13 @@
app:layout_constraintTop_toBottomOf="@id/forgetPaw_phone" />
<View
android:layout_width="300dp"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/colorHui"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_phone"
app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_phone" />
app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_phone"/>
<TextView
android:id="@+id/forgetPaw_note"
@@ -95,42 +100,36 @@
<EditText
android:id="@+id/et_forgetPaw_note"
android:layout_width="200dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:hint="6为短信验证"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:layout_marginLeft="20dp"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
android:textSize="15sp"
android:theme="@style/MyEditText"
app:layout_constraintLeft_toLeftOf="@id/forgetPaw_note"
app:layout_constraintRight_toLeftOf="@+id/forgetPaw_get_note"
app:layout_constraintTop_toBottomOf="@id/forgetPaw_note" />
<View
android:layout_width="300dp"
android:layout_height="1dp"
android:background="@color/colorHui"
app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_note"
app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_note" />
<TextView
android:id="@+id/forgetPaw_get_note"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="40dp"
android:text="获取短信验证码"
android:textColor="@color/colorWhite"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="@id/et_forgetPaw_note"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintRight_toRightOf="@+id/tv_view"
app:layout_constraintTop_toTopOf="@id/et_forgetPaw_note" />
<TextView
android:layout_width="300dp"
<View
android:id="@+id/tv_view"
android:layout_width="match_parent"
android:layout_height="1dp"
android:textColor="@color/colorWhite"
android:layout_marginRight="20dp"
android:layout_marginLeft="20dp"
android:background="@color/colorHui"
app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_note"
app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_note" />
@@ -143,16 +142,17 @@
android:text="密码"
android:textColor="@color/colorWhite"
android:textSize="14sp"
app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_note"
app:layout_constraintLeft_toLeftOf="@id/forgetPaw_note"
app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_note" />
<EditText
android:id="@+id/et_forgetPaw_paw"
android:layout_width="300dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:hint="6-20位密码"
android:paddingTop="10dp"
android:layout_marginLeft="20dp"
android:paddingBottom="10dp"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
@@ -162,9 +162,11 @@
app:layout_constraintTop_toBottomOf="@id/forgetPaw_paw" />
<View
android:layout_width="300dp"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/colorHui"
android:layout_marginRight="20dp"
android:layout_marginLeft="20dp"
app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_paw"
app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_paw" />
@@ -181,7 +183,7 @@
<EditText
android:id="@+id/et_forgetPaw_confirm_paw"
android:layout_width="300dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:hint="请再次输入一遍密码"
@@ -189,14 +191,17 @@
android:paddingBottom="10dp"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
android:layout_marginLeft="20dp"
android:textSize="15sp"
android:theme="@style/MyEditText"
app:layout_constraintLeft_toLeftOf="@id/forgetPaw_confirm_paw"
app:layout_constraintTop_toBottomOf="@id/forgetPaw_confirm_paw" />
<View
android:layout_width="300dp"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginRight="20dp"
android:layout_marginLeft="20dp"
android:background="@color/colorHui"
app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_confirm_paw"
app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_confirm_paw" />
@@ -204,9 +209,11 @@
<Button
android:id="@+id/btn_forgetPaw"
style="@style/login_style"
android:layout_width="300dp"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginTop="20dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="50dp"
android:gravity="center"
android:text="提交"
app:layout_constraintLeft_toLeftOf="parent"

42
app/src/main/res/layout/fragment_register.xml
View File

@@ -74,18 +74,23 @@
<EditText
android:id="@+id/et_register_phone"
android:layout_width="300dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="11为手机号码"
android:layout_marginLeft="35dp"
style="@style/register_hint_style"
android:digits="1234567890"
android:maxLength="11"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
android:theme="@style/MyEditText"
app:layout_constraintLeft_toLeftOf="@id/register_phone"
app:layout_constraintTop_toBottomOf="@id/register_phone" />
<View
android:layout_width="300dp"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="35dp"
android:layout_marginRight="50dp"
android:background="@color/colorHui"
app:layout_constraintTop_toBottomOf="@id/et_register_phone"
app:layout_constraintLeft_toLeftOf="@id/et_register_phone"/>
@@ -102,11 +107,10 @@
<EditText
android:id="@+id/et_register_note"
style="@style/register_hint_style"
android:layout_width="200dp"
android:layout_width="250dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:hint="6为短信验证"
android:hint="6位短信验证"
style="@style/register_hint_style"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
android:theme="@style/MyEditText"
@@ -115,8 +119,10 @@
<View
android:id="@+id/view3"
android:layout_width="300dp"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="35dp"
android:layout_marginRight="50dp"
android:background="@color/colorHui"
app:layout_constraintTop_toBottomOf="@id/et_register_note"
app:layout_constraintLeft_toLeftOf="@id/et_register_note"/>
@@ -129,7 +135,7 @@
android:textColor="@color/colorWhite"
app:layout_constraintTop_toTopOf="@id/et_register_note"
app:layout_constraintBottom_toBottomOf="@id/et_register_note"
app:layout_constraintRight_toRightOf="@id/et_register_phone"
app:layout_constraintRight_toRightOf="@id/view3"
/>
<TextView
android:id="@+id/register_referrer"
@@ -154,9 +160,11 @@
app:layout_constraintLeft_toLeftOf="@id/register_referrer"
app:layout_constraintTop_toBottomOf="@id/register_referrer"/>
<View
android:layout_width="300dp"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/colorHui"
android:layout_marginLeft="35dp"
android:layout_marginRight="50dp"
app:layout_constraintTop_toBottomOf="@id/et_register_referrer"
app:layout_constraintLeft_toLeftOf="@id/et_register_referrer"/>
<TextView
@@ -176,15 +184,18 @@
android:layout_height="wrap_content"
android:hint="6-20位密码"
style="@style/register_hint_style"
android:maxLength="20"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
android:theme="@style/MyEditText"
app:layout_constraintLeft_toLeftOf="@id/register_paw"
app:layout_constraintTop_toBottomOf="@id/register_paw"/>
<View
android:layout_width="300dp"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/colorHui"
android:layout_marginLeft="35dp"
android:layout_marginRight="50dp"
app:layout_constraintTop_toBottomOf="@id/et_register_paw"
app:layout_constraintLeft_toLeftOf="@id/et_register_paw"/>
<TextView
@@ -203,6 +214,7 @@
android:layout_width="300dp"
android:layout_height="wrap_content"
android:hint="请再次输入一遍密码"
android:maxLength="20"
style="@style/register_hint_style"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
@@ -210,9 +222,12 @@
app:layout_constraintLeft_toLeftOf="@id/register_confirm_paw"
app:layout_constraintTop_toBottomOf="@id/register_confirm_paw"/>
<View
android:layout_width="300dp"
android:id="@+id/view_paw"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/colorHui"
android:layout_marginLeft="35dp"
android:layout_marginRight="50dp"
app:layout_constraintTop_toBottomOf="@id/et_register_confirm_paw"
app:layout_constraintLeft_toLeftOf="@id/et_register_confirm_paw"/>
<ImageView
@@ -239,16 +254,19 @@
android:text="已有账号,去登录"
android:textColor="@color/colorWhite"
app:layout_constraintTop_toTopOf="@id/iv_register_check"
app:layout_constraintRight_toRightOf="@id/et_register_confirm_paw"
app:layout_constraintRight_toRightOf="@id/view_paw"
app:layout_constraintBottom_toBottomOf="@id/iv_register_check"/>
<Button
android:id="@+id/btn_register"
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_marginTop="20dp"
android:gravity="center"
style="@style/login_style"
android:text="注册"
android:layout_marginLeft="35dp"
android:layout_marginRight="35dp"
app:layout_constraintLeft_toLeftOf="@id/iv_register_check"
app:layout_constraintTop_toBottomOf="@id/iv_register_check"/>

28
app/src/main/res/layout/gathering_fragment.xml
View File

@@ -109,15 +109,19 @@
android:layout_height="1dp"
android:background="#2196F3" />
<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_creditNumbers"
android:layout_width="100dp"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
android:gravity="center"
android:text="银行卡号:"
android:textColor="#333"
@@ -125,18 +129,18 @@
<EditText
android:id="@+id/et_bank_num"
android:layout_width="200dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="100dp"
android:layout_marginRight="50dp"
android:background="@null"
android:hint="银行卡号"
android:digits="1234567890"
android:maxLength="19"
android:textSize="16sp" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="60dp"
android:layout_height="match_parent">
android:textSize="16sp"
app:layout_constraintTop_toTopOf="@+id/tv_creditNumbers"
app:layout_constraintLeft_toRightOf="@+id/tv_creditNumbers"
/>
<ImageView
android:id="@+id/gathering_camera"
@@ -145,11 +149,13 @@
android:layout_marginBottom="10dp"
android:src="@drawable/ic_baseline_camera"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
app:layout_constraintLeft_toRightOf="@+id/et_bank_num"
app:layout_constraintTop_toTopOf="parent"
/>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:layout_width="match_parent"

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

@@ -316,7 +316,7 @@
android:layout_height="20dp"
/>
<TextView
android:id="@+id/tv_name"
android:id="@+id/tv_poi_name_pic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"