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

version:4.6

Browse Source 
fix:
update:优化订单页，增加快递详情页
This commit is contained in:
Fanhuitong
2024-03-08 09:25:39 +08:00
parent efab2b236b
commit 3f6723f64a
31 changed files with 900 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.5 KiB

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

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 内部颜色 -->
<solid android:color="@color/alarm_background_color" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_4" />
<padding
android:bottom="@dimen/dp_4"
android:left="@dimen/dp_8"
android:right="@dimen/dp_8"
android:top="@dimen/dp_4" />
</shape>

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

@@ -3,6 +3,6 @@
<!-- <solid android:color="#FFFFFF" />-->
<stroke
android:width="3px"
android:color="#EA4F77" />
android:color="@color/action_bar_red" />
<corners android:radius="@dimen/dp_4" />
</shape>

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

@@ -0,0 +1,106 @@
<?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.ExpressActivity">
<data>
</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/constraintLayout18"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<com.shehuan.niv.NiceImageView
android:id="@+id/iv_company"
android:layout_width="@dimen/dp_16"
android:layout_height="@dimen/dp_16"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginBottom="@dimen/dp_8"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
app:is_circle="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_express_no"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_8"
android:maxLines="1"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/iv_company"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:scrollbars="none"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/constraintLayout18">
<com.uiuios.aios.view.TimelineLayout
android:id="@+id/timeline_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:orientation="vertical"
app:line_margin_left="25dp"
app:line_margin_top="8dp" />
</ScrollView>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_nodata"
android:layout_width="match_parent"
android:layout_height="0dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/constraintLayout18">
<ImageView
android:id="@+id/imageView"
android:layout_width="@dimen/dp_100"
android:layout_height="@dimen/dp_100"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/icon_list_nodata"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.45" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8"
android:maxLines="1"
android:text="没有数据"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
app:layout_constraintEnd_toEndOf="@+id/imageView"
app:layout_constraintStart_toStartOf="@+id/imageView"
app:layout_constraintTop_toBottomOf="@+id/imageView" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

11
app/src/main/res/layout/activity_goods.xml
View File

@@ -78,10 +78,12 @@
android:id="@+id/tabLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/constraintLayout"
app:tabIndicatorColor="@color/action_bar_red"
app:tabIndicatorFullWidth="false"
app:tabSelectedTextColor="@color/action_bar_red"
app:tabTextAppearance="@style/TabLayoutTextStyle"
app:tabTextColor="@color/black"
app:tabSelectedTextColor="@color/red"
app:layout_constraintTop_toBottomOf="@+id/constraintLayout" />
app:tabTextColor="@color/black" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_nodata"
@@ -98,7 +100,7 @@
android:layout_height="@dimen/dp_100"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/nodata"
android:src="@drawable/icon_list_nodata"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -109,6 +111,7 @@
android:layout_marginTop="@dimen/dp_8"
android:maxLines="1"
android:text="没有数据"
android:textSize="@dimen/sp_12"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/iv1" />

37
app/src/main/res/layout/activity_information.xml
View File

@@ -14,23 +14,34 @@
android:layout_height="match_parent"
android:background="@color/gray">
<com.google.android.material.tabs.TabLayout
android:id="@+id/tabLayout"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_bar"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:background="@color/action_bar_red"
app:layout_constraintTop_toTopOf="parent"
app:tabSelectedTextColor="@color/white"
app:tabIndicatorColor="@color/white"
app:tabTextAppearance="@style/InformationTextStyle"
app:tabTextColor="@color/noti_text_gray" />
android:background="@color/action_bar_red"
android:layout_height="wrap_content">
<com.google.android.material.tabs.TabLayout
android:id="@+id/tabLayout"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
app:tabIndicatorFullWidth="false"
android:layout_marginBottom="@dimen/dp_4"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tabIndicatorColor="@color/white"
app:tabSelectedTextColor="@color/white"
app:tabTextAppearance="@style/InformationTextStyle"
app:tabTextColor="@color/noti_text_gray" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_video"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tabLayout" />
app:layout_constraintTop_toBottomOf="@+id/cl_bar" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_nodata"
@@ -38,7 +49,7 @@
android:layout_height="0dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tabLayout">
app:layout_constraintTop_toBottomOf="@+id/cl_bar">
<ImageView
android:id="@+id/imageView"
@@ -46,7 +57,7 @@
android:layout_height="@dimen/dp_100"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/icon_nodata"
android:src="@drawable/icon_list_nodata"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
@@ -57,11 +68,11 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_8"
android:maxLines="1"
android:text="没有数据"
android:textColor="@color/black"
android:textSize="@dimen/sp_14"
android:textSize="@dimen/sp_12"
app:layout_constraintEnd_toEndOf="@+id/imageView"
app:layout_constraintStart_toStartOf="@+id/imageView"
app:layout_constraintTop_toBottomOf="@+id/imageView" />

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

@@ -117,7 +117,7 @@
android:layout_marginTop="@dimen/dp_8"
android:layout_marginBottom="@dimen/dp_8"
android:adjustViewBounds="true"
app:error="@{@drawable/he999}"
app:error="@{@drawable/goods_placeholder}"
app:imageUrl="@{goodsInfo.img}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"

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

@@ -23,6 +23,7 @@
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/iv_exit"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:layout_marginStart="@dimen/dp_16"
@@ -52,8 +53,10 @@
android:id="@+id/tabLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:tabIndicatorColor="@color/action_bar_red"
app:layout_constraintTop_toBottomOf="@+id/constraintLayout21"
app:tabSelectedTextColor="@color/red"
app:tabSelectedTextColor="@color/action_bar_red"
app:tabIndicatorFullWidth="false"
app:tabTextAppearance="@style/TabLayoutTextStyle"
app:tabTextColor="@color/black">
@@ -94,8 +97,46 @@
android:id="@+id/rv_order"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@color/gray"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tabLayout" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_nodata"
android:layout_width="match_parent"
android:layout_height="0dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tabLayout">
<ImageView
android:id="@+id/imageView"
android:layout_width="@dimen/dp_100"
android:layout_height="@dimen/dp_100"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/icon_list_nodata"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.45" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8"
android:maxLines="1"
android:text="没有数据"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
app:layout_constraintEnd_toEndOf="@+id/imageView"
app:layout_constraintStart_toStartOf="@+id/imageView"
app:layout_constraintTop_toBottomOf="@+id/imageView" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

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

@@ -58,7 +58,7 @@
android:layout_marginTop="@dimen/dp_16"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
app:error="@{@drawable/he999}"
app:error="@{@drawable/goods_placeholder}"
app:imageUrl="@{wxpayBean.goods_img}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -94,7 +94,7 @@
android:id="@+id/tv_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_32"
android:layout_marginTop="@dimen/dp_16"
android:text="@{wxpayBean.price}"
android:textColor="@color/red"
android:textSize="@dimen/sp_18"
@@ -103,7 +103,6 @@
app:layout_constraintTop_toBottomOf="@+id/textView13"
tools:text="100.00" />
<ImageView
android:id="@+id/iv_wx_qrcode"
android:layout_width="@dimen/dp_100"

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

@@ -11,6 +11,7 @@
android:layout_width="@dimen/dp_140"
android:layout_height="@dimen/dp_100"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_16"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
app:corner_radius="@dimen/dp_8"
@@ -21,10 +22,13 @@
android:id="@+id/tv_consult_title"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_8"
android:textSize="@dimen/sp_11"
android:textColor="@color/black"
android:maxLines="3"
android:ellipsize="end"
android:textSize="@dimen/sp_15"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/tv_time"
app:layout_constraintEnd_toStartOf="@+id/nv_consult"
app:layout_constraintStart_toStartOf="parent"
@@ -35,12 +39,22 @@
android:id="@+id/tv_time"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_8"
android:layout_marginStart="@dimen/dp_8"
android:textSize="@dimen/sp_8"
android:textColor="@color/gray"
android:maxLines="1"
app:layout_constraintBottom_toBottomOf="parent"
android:textColor="@color/title_gray"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="@+id/nv_consult"
app:layout_constraintEnd_toStartOf="@+id/nv_consult"
app:layout_constraintStart_toStartOf="parent" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
android:background="@color/noti_color"
app:layout_constraintTop_toBottomOf="@+id/tv_time" />
</androidx.constraintlayout.widget.ConstraintLayout>

53
app/src/main/res/layout/item_order.xml
View File

@@ -11,6 +11,8 @@
android:background="@color/white"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="@dimen/dp_4"
app:layout_constraintTop_toTopOf="parent">
<TextView
@@ -75,34 +77,71 @@
app:layout_constraintTop_toBottomOf="@+id/tv_unit_price"
tools:text="1" />
<View
android:id="@+id/view1"
android:layout_width="match_parent"
android:layout_height="@dimen/sp_1"
android:background="@color/gray"
app:layout_constraintTop_toBottomOf="@+id/iv_goods" />
<TextView
android:id="@+id/tv_paid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_4"
android:layout_marginEnd="@dimen/dp_16"
android:maxLines="1"
android:textColor="@color/black"
android:textSize="@dimen/sp_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/iv_goods"
app:layout_constraintTop_toBottomOf="@+id/view1"
tools:text="实付：￥0元" />
<View
android:id="@+id/view2"
android:layout_width="match_parent"
android:layout_height="@dimen/sp_1"
android:layout_marginTop="@dimen/dp_4"
android:background="@color/gray"
app:layout_constraintTop_toBottomOf="@+id/tv_paid" />
<TextView
android:id="@+id/tv_express_info"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
android:background="@drawable/express_background"
android:maxLines="1"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="@+id/tv_express"
app:layout_constraintEnd_toStartOf="@+id/tv_express"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_express"
tools:text="物流信息" />
<TextView
android:id="@+id/tv_express"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/dp_16"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
android:layout_marginBottom="@dimen/dp_8"
android:background="@drawable/check_express_bg"
android:maxLines="1"
android:text="查看物流"
android:textColor="@color/black"
android:textSize="@dimen/sp_14"
android:background="@drawable/check_express_bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="@dimen/dp_8"
app:layout_constraintTop_toBottomOf="@+id/tv_paid"
android:text="查看物流" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/view2" />
<View
android:id="@+id/view3"
android:layout_width="match_parent"
android:layout_height="@dimen/sp_1"
android:background="@color/gray"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

58
app/src/main/res/layout/item_timeline.xml Normal file
View File

@@ -0,0 +1,58 @@
<?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:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:paddingStart="@dimen/dp_32"
android:paddingEnd="@dimen/dp_32">
<TextView
android:id="@+id/tv_action_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_marginTop="@dimen/dp_8"
android:textColor="@color/action_bar_red"
android:textSize="@dimen/sp_10"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="完成" />
<TextView
android:id="@+id/tv_action"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8"
android:ellipsize="end"
android:maxLines="2"
android:minLines="2"
android:textColor="@color/black"
android:textSize="@dimen/sp_10"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_action_status"
tools:text="测试一" />
<TextView
android:id="@+id/tv_action_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/tv_action"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginBottom="@dimen/dp_8"
android:textColor="#8e8e8e"
android:textSize="@dimen/sp_10"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_action"
tools:text="2017年3月8日16:49:12" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/lightGray"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

17
app/src/main/res/values/attrs.xml
View File

@@ -50,4 +50,21 @@
<attr name="tbAnimate" format="reference|boolean" />
<attr name="tbAsDefaultOn" format="reference|boolean" />
</declare-styleable>
<declare-styleable name="TimelineLayout">
<!--时间轴左偏移值-->
<attr name="line_margin_left" format="dimension"/>
<!--时间轴上偏移值-->
<attr name="line_margin_top" format="dimension"/>
<!--线宽-->
<attr name="line_stroke_width" format="dimension"/>
<!--线的颜色-->
<attr name="line_color" format="color"/>
<!--点的大小-->
<attr name="point_size" format="dimension"/>
<!--点的颜色-->
<attr name="point_color" format="color"/>
<!--图标-->
<attr name="icon_src" format="reference"/>
</declare-styleable>
</resources>