tt/XiaoxintongSystemOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:4.9

Browse Source 
fix:
update:更新下单流程，增加备注，增加桌面图标
This commit is contained in:
Fanhuitong
2024-03-13 18:13:33 +08:00
parent 7cb6eecb3d
commit 5e9b850d6b
41 changed files with 945 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/res/drawable-hdpi/default_head.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.4 KiB

13
app/src/main/res/drawable/address_background.xml Normal file
View File

@@ -0,0 +1,13 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke
android:width="1px"
android:color="@color/action_bar_red" />
<corners android:radius="@dimen/dp_2" />
<padding
android:bottom="@dimen/dp_1"
android:left="@dimen/dp_2"
android:right="@dimen/dp_2"
android:top="@dimen/dp_1" />
</shape>

13
app/src/main/res/drawable/edittext_background.xml Normal file
View File

@@ -0,0 +1,13 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke
android:width="1px"
android:color="@color/black" />
<corners android:radius="@dimen/dp_2" />
<padding
android:bottom="@dimen/dp_4"
android:left="@dimen/dp_4"
android:right="@dimen/dp_4"
android:top="@dimen/dp_4" />
</shape>

2
app/src/main/res/layout-land/fragment_custom.xml
View File

@@ -33,7 +33,7 @@
android:layout_height="@dimen/dp_28"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/default_head"
android:src="@drawable/default_avatar"
app:is_circle="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"

2
app/src/main/res/layout-port/fragment_custom.xml
View File

@@ -33,7 +33,7 @@
android:layout_height="@dimen/dp_28"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/default_head"
android:src="@drawable/default_avatar"
app:is_circle="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"

60
app/src/main/res/layout/activity_address.xml Normal file
View File

@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
<layout 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"
tools:context=".activity.AddressActivity">
<data>
<variable
name="listener"
type="com.uiuios.aios.activity.AddressActivity.Listener" />
</data>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_exit"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_32"
android:onClick="@{listener.back}"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/imageView12"
android:layout_width="@dimen/dp_16"
android:layout_height="@dimen/dp_16"
android:layout_marginStart="@dimen/dp_4"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/back_black"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_6"
android:text="我的收货地址"
android:textColor="@color/black"
android:textSize="@dimen/sp_13"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/imageView12"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cl_exit" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

133
app/src/main/res/layout/activity_order.xml
View File

@@ -6,9 +6,15 @@
<data>
<import type="android.view.View" />
<variable
name="goodsInfo"
type="com.uiuios.aios.bean.GoodsInfo" />
<variable
name="addressInfo"
type="com.uiuios.aios.bean.AddressInfo" />
</data>
<androidx.constraintlayout.widget.ConstraintLayout
@@ -30,8 +36,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:textColor="@color/black"
android:text='@{goodsInfo.goods_name}'
android:textColor="@color/black"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -50,7 +56,7 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout16"
android:id="@+id/cl_address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_1"
@@ -71,21 +77,83 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_location"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:maxLines="2"
android:minLines="2"
android:paddingStart="@dimen/dp_8"
android:paddingEnd="@dimen/dp_32"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_16"
android:layout_marginBottom="@dimen/dp_8"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/imageView14"
app:layout_constraintStart_toEndOf="@+id/imageView13"
app:layout_constraintTop_toTopOf="parent"
tools:text="测试地址测试地址测试地址测试地址测试地址测试地址测试地址测试地址" />
app:layout_constraintStart_toEndOf="@id/imageView13"
app:layout_constraintTop_toTopOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout24"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:text="@{addressInfo.fullname}"
android:textColor="@color/black"
android:textSize="@dimen/sp_10"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="范辉同" />
<TextView
android:id="@+id/tv_phone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/sp_4"
android:ellipsize="end"
android:maxWidth="@dimen/dp_70"
android:maxLines="1"
android:text="@{addressInfo.tel}"
android:textColor="@color/black"
android:textSize="@dimen/sp_9"
app:layout_constraintBottom_toBottomOf="@id/tv_name"
app:layout_constraintStart_toEndOf="@id/tv_name"
app:layout_constraintTop_toTopOf="@id/tv_name"
tools:text="13220282310" />
<TextView
android:id="@+id/tv_default"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/sp_4"
android:background="@drawable/address_background"
android:text="默认"
android:textColor="@color/default_red"
android:textSize="@dimen/sp_7"
android:visibility="@{addressInfo.is_default==1?View.VISIBLE:View.GONE}"
app:layout_constraintBottom_toBottomOf="@id/tv_phone"
app:layout_constraintStart_toEndOf="@+id/tv_phone"
app:layout_constraintTop_toTopOf="@id/tv_phone" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/tv_address"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8"
android:maxLines="2"
android:textColor="@color/title_gray"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/constraintLayout24"
tools:text="广东省 深圳市 龙岗区 坂田街道 天安路15号杨英楼" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView
android:id="@+id/imageView14"
@@ -107,7 +175,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_4"
android:background="@color/white"
app:layout_constraintTop_toBottomOf="@+id/constraintLayout16">
app:layout_constraintTop_toBottomOf="@+id/cl_address">
<ImageView
android:id="@+id/iv_goods"
@@ -129,11 +197,11 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_8"
android:maxLines="1"
tools:text="券后￥8278"
android:textColor="@color/default_red"
android:textSize="@dimen/sp_13"
app:layout_constraintStart_toEndOf="@+id/iv_goods"
app:layout_constraintTop_toTopOf="@+id/iv_goods" />
app:layout_constraintTop_toTopOf="@+id/iv_goods"
tools:text="券后￥8278" />
<TextView
android:id="@+id/tv_original_price"
@@ -144,9 +212,9 @@
android:maxLines="1"
android:textColor="@color/title_gray"
android:textSize="@dimen/sp_9"
tools:text="券前￥8278"
app:layout_constraintStart_toEndOf="@+id/iv_goods"
app:layout_constraintTop_toBottomOf="@+id/tv_price" />
app:layout_constraintTop_toBottomOf="@+id/tv_price"
tools:text="券前￥8278" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout17"
@@ -219,6 +287,33 @@
app:layout_constraintBottom_toTopOf="@+id/cl_pay"
app:layout_constraintTop_toBottomOf="@+id/constraintLayout20">
<TextView
android:id="@+id/textView9"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"
android:text="订单备注"
android:textColor="@color/black"
android:textSize="@dimen/sp_11"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<EditText
android:id="@+id/et_remark"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_100"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_8"
android:background="@drawable/edittext_background"
android:textSize="@dimen/sp_10"
android:gravity="start"
android:singleLine="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView9" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout

106
app/src/main/res/layout/item_address.xml Normal file
View File

@@ -0,0 +1,106 @@
<?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"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white">
<ImageView
android:id="@+id/iv_avatar"
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginBottom="@dimen/dp_8"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/default_avatar"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginBottom="@dimen/dp_8"
app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/iv_avatar"
app:layout_constraintTop_toTopOf="@+id/iv_avatar">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout24"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="范辉同" />
<TextView
android:id="@+id/tv_phone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/sp_4"
android:ellipsize="end"
android:maxWidth="@dimen/dp_100"
android:maxLines="1"
android:textColor="@color/black"
android:textSize="@dimen/sp_11"
app:layout_constraintBottom_toBottomOf="@id/tv_name"
app:layout_constraintStart_toEndOf="@id/tv_name"
app:layout_constraintTop_toTopOf="@id/tv_name"
tools:text="13220282310" />
<TextView
android:id="@+id/tv_default"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/sp_4"
android:background="@drawable/address_background"
android:text="默认"
android:textColor="@color/default_red"
android:textSize="@dimen/sp_9"
app:layout_constraintBottom_toBottomOf="@id/tv_phone"
app:layout_constraintStart_toEndOf="@+id/tv_phone"
app:layout_constraintTop_toTopOf="@id/tv_phone" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/tv_address"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8"
android:maxLines="2"
android:textColor="@color/title_gray"
android:textSize="@dimen/sp_11"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/constraintLayout24"
tools:text="广东省 深圳市 龙岗区 坂田街道 天安路15号杨英楼 c栋 409 " />
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
android:background="@color/gray"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

23
app/src/main/res/values/bools.xml Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/* Copyright 2017, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<resources>
<bool name="notification_dots_enabled">false</bool>
<bool name="enable_install_shortcut_api">true</bool>
</resources>