Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
ShenghuoquanBusiness
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bp
ShenghuoquanBusiness
Commits
c55f8794
Commit
c55f8794
authored
Sep 09, 2021
by
yinjiacheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add 商户订单订单详情UI
parent
e904089b
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
213 additions
and
1 deletion
+213
-1
ClassMapUtil.kt
...om/yidian/shenghuoquan/bmerchantorder/app/ClassMapUtil.kt
+2
-1
MerchantOrderDetailActivity.kt
...ghuoquan/bmerchantorder/ui/MerchantOrderDetailActivity.kt
+28
-0
MerchantOrderDetailViewModel.kt
.../bmerchantorder/viewmodel/MerchantOrderDetailViewModel.kt
+11
-0
b_merchant_order_icon_order_status_closed.webp
...ble-xxhdpi/b_merchant_order_icon_order_status_closed.webp
+0
-0
b_merchant_order_icon_order_status_finished.webp
...e-xxhdpi/b_merchant_order_icon_order_status_finished.webp
+0
-0
b_merchant_order_icon_order_status_on_refund.webp
...-xxhdpi/b_merchant_order_icon_order_status_on_refund.webp
+0
-0
b_merchant_order_icon_order_status_refunded.webp
...e-xxhdpi/b_merchant_order_icon_order_status_refunded.webp
+0
-0
b_merchant_order_icon_order_status_wait_pay.webp
...e-xxhdpi/b_merchant_order_icon_order_status_wait_pay.webp
+0
-0
b_merchant_order_icon_order_status_wait_write_off.webp
...pi/b_merchant_order_icon_order_status_wait_write_off.webp
+0
-0
b_merchant_order_icon_phone.webp
...main/res/drawable-xxhdpi/b_merchant_order_icon_phone.webp
+0
-0
b_merchant_order_shape_stroke_1_color_999999_corner_22.xml
..._merchant_order_shape_stroke_1_color_999999_corner_22.xml
+10
-0
bmerchantorder_activity_merchant_order_detail.xml
.../layout/bmerchantorder_activity_merchant_order_detail.xml
+22
-0
bmerchantorder_layout_merchant_order_detail_buyer_info.xml
...merchantorder_layout_merchant_order_detail_buyer_info.xml
+92
-0
bmerchantorder_layout_merchant_order_detail_order_status.xml
...rchantorder_layout_merchant_order_detail_order_status.xml
+44
-0
strings.xml
Components/BMerchantOrder/src/main/res/values/strings.xml
+4
-0
No files found.
Components/BMerchantOrder/src/main/java/com/yidian/shenghuoquan/bmerchantorder/app/ClassMapUtil.kt
View file @
c55f8794
...
...
@@ -2,6 +2,7 @@ package com.yidian.shenghuoquan.bmerchantorder.app
import
com.yidian.bcommon.constant.XRouterPathConstants
import
com.yidian.shenghuoquan.bmerchantorder.ui.MerchantOrderCenterActivity
import
com.yidian.shenghuoquan.bmerchantorder.ui.MerchantOrderDetailActivity
/**
...
...
@@ -13,7 +14,7 @@ object ClassMapUtil {
XRouterPathConstants
.
Companion
.
MERCHANT_ORDER_CENTER_ACTIVITY
to
MerchantOrderCenterActivity
::
class
.
java
,
// XRouterPathConstants.Companion.MERCHANT_ORDER_LIST_ACTIVITY to OrderDetailActivity::class.java,
// XRouterPathConstants.Companion.MERCHANT_ORDER_SEARCH_ACTIVITY to SelectPickupPointActivity::class.java,
// XRouterPathConstants.Companion.MERCHANT_ORDER_DETAILS_ACTIVITY to OrderList
Activity::class.java,
XRouterPathConstants
.
Companion
.
MERCHANT_ORDER_DETAILS_ACTIVITY
to
MerchantOrderDetail
Activity
::
class
.
java
,
)
}
Components/BMerchantOrder/src/main/java/com/yidian/shenghuoquan/bmerchantorder/ui/MerchantOrderDetailActivity.kt
0 → 100644
View file @
c55f8794
package
com.yidian.shenghuoquan.bmerchantorder.ui
import
androidx.activity.viewModels
import
com.yidian.bcommon.constant.XRouterPathConstants
import
com.yidian.bcommon.mvvm.BaseMvvmActivity
import
com.yidian.shenghuoquan.bmerchantorder.R
import
com.yidian.shenghuoquan.bmerchantorder.databinding.BmerchantorderActivityMerchantOrderDetailBinding
import
com.yidian.shenghuoquan.bmerchantorder.viewmodel.MerchantOrderDetailViewModel
import
com.yidian.xpage.XPageViewProtocol
/**
* author: yinjiacheng
* date: 2021/9/8 13:55
* description: 商户订单详情页
*/
class
MerchantOrderDetailActivity
:
BaseMvvmActivity
<
BmerchantorderActivityMerchantOrderDetailBinding
,
MerchantOrderDetailViewModel
>(),
XPageViewProtocol
{
override
fun
getXPageName
():
String
{
return
XRouterPathConstants
.
MERCHANT_ORDER_DETAILS_ACTIVITY
}
override
val
layoutId
:
Int
=
R
.
layout
.
bmerchantorder_activity_merchant_order_detail
override
val
vm
:
MerchantOrderDetailViewModel
by
viewModels
()
override
fun
initView
()
{
}
}
Components/BMerchantOrder/src/main/java/com/yidian/shenghuoquan/bmerchantorder/viewmodel/MerchantOrderDetailViewModel.kt
0 → 100644
View file @
c55f8794
package
com.yidian.shenghuoquan.bmerchantorder.viewmodel
import
com.yidian.bcommon.mvvm.BaseViewModel
/**
* author: yinjiacheng
* date: 2021/9/8 13:56
* description: 商户订单详情页
*/
class
MerchantOrderDetailViewModel
:
BaseViewModel
()
{
}
Components/BMerchantOrder/src/main/res/drawable-xxhdpi/b_merchant_order_icon_order_status_closed.webp
0 → 100644
View file @
c55f8794
File added
Components/BMerchantOrder/src/main/res/drawable-xxhdpi/b_merchant_order_icon_order_status_finished.webp
0 → 100644
View file @
c55f8794
File added
Components/BMerchantOrder/src/main/res/drawable-xxhdpi/b_merchant_order_icon_order_status_on_refund.webp
0 → 100644
View file @
c55f8794
File added
Components/BMerchantOrder/src/main/res/drawable-xxhdpi/b_merchant_order_icon_order_status_refunded.webp
0 → 100644
View file @
c55f8794
File added
Components/BMerchantOrder/src/main/res/drawable-xxhdpi/b_merchant_order_icon_order_status_wait_pay.webp
0 → 100644
View file @
c55f8794
File added
Components/BMerchantOrder/src/main/res/drawable-xxhdpi/b_merchant_order_icon_order_status_wait_write_off.webp
0 → 100644
View file @
c55f8794
File added
Components/BMerchantOrder/src/main/res/drawable-xxhdpi/b_merchant_order_icon_phone.webp
0 → 100644
View file @
c55f8794
File added
Components/BMerchantOrder/src/main/res/drawable/b_merchant_order_shape_stroke_1_color_999999_corner_22.xml
0 → 100644
View file @
c55f8794
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:shape=
"rectangle"
>
<stroke
android:width=
"1dp"
android:color=
"@color/color_999999"
/>
<corners
android:radius=
"22dp"
/>
</shape>
\ No newline at end of file
Components/BMerchantOrder/src/main/res/layout/bmerchantorder_activity_merchant_order_detail.xml
0 → 100644
View file @
c55f8794
<?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"
>
<data>
</data>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:fitsSystemWindows=
"true"
>
<com.yidian.bcommon.widget.CommonTopBarView
android:id=
"@+id/bv_top_bar"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
app:CommonTopBarView_title_text=
"订单详情"
app:layout_constraintTop_toTopOf=
"parent"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
Components/BMerchantOrder/src/main/res/layout/bmerchantorder_layout_merchant_order_detail_buyer_info.xml
0 → 100644
View file @
c55f8794
<?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"
>
<data>
</data>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:paddingStart=
"@dimen/dp16"
android:paddingTop=
"@dimen/dp20"
android:paddingEnd=
"@dimen/dp16"
android:paddingBottom=
"@dimen/dp20"
>
<TextView
android:id=
"@+id/tv_buyer_info"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/b_merchant_order_buyer_info"
android:textColor=
"@color/color_333333"
android:textSize=
"@dimen/sp16"
android:textStyle=
"bold"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
android:id=
"@+id/tv_buyer_nickname"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp13"
android:text=
"@string/b_merchant_order_buyer_nickname"
android:textColor=
"@color/color_999999"
android:textSize=
"@dimen/sp14"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/tv_buyer_info"
/>
<TextView
android:id=
"@+id/tv_buyer_nickname_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/dp24"
android:textColor=
"@color/color_333333"
android:textSize=
"@dimen/sp14"
app:layout_constraintStart_toEndOf=
"@id/tv_buyer_nickname"
app:layout_constraintTop_toTopOf=
"@id/tv_buyer_nickname"
tools:text=
"喜之郎嘻嘻果冻"
/>
<TextView
android:id=
"@+id/tv_buyer_phone"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp16"
android:text=
"@string/b_merchant_order_contact_info"
android:textColor=
"@color/color_999999"
android:textSize=
"@dimen/sp14"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/tv_buyer_nickname"
/>
<TextView
android:id=
"@+id/tv_buyer_phone_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textColor=
"@color/color_333333"
android:textSize=
"@dimen/sp14"
app:layout_constraintStart_toStartOf=
"@id/tv_buyer_nickname_content"
app:layout_constraintTop_toTopOf=
"@id/tv_buyer_phone"
tools:text=
"191****3913"
/>
<TextView
android:id=
"@+id/tv_contact_buyer"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:background=
"@drawable/b_merchant_order_shape_stroke_1_color_999999_corner_22"
android:drawableStart=
"@drawable/b_merchant_order_icon_phone"
android:drawablePadding=
"@dimen/dp1"
android:paddingStart=
"@dimen/dp7"
android:paddingTop=
"@dimen/dp5"
android:paddingEnd=
"@dimen/dp9"
android:paddingBottom=
"@dimen/dp5"
android:text=
"@string/b_merchant_order_contact_buyer"
android:textColor=
"@color/color_333333"
android:textSize=
"@dimen/sp12"
android:textStyle=
"bold"
app:layout_constraintBottom_toBottomOf=
"@id/tv_buyer_phone"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintTop_toTopOf=
"@id/tv_buyer_phone"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
Components/BMerchantOrder/src/main/res/layout/bmerchantorder_layout_merchant_order_detail_order_status.xml
0 → 100644
View file @
c55f8794
<?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"
>
<data>
</data>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:fitsSystemWindows=
"true"
android:paddingTop=
"@dimen/dp24"
android:paddingBottom=
"@dimen/dp24"
>
<ImageView
android:id=
"@+id/iv_order_status"
android:layout_width=
"@dimen/dp22"
android:layout_height=
"@dimen/dp22"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toStartOf=
"@id/tv_order_status"
app:layout_constraintHorizontal_chainStyle=
"packed"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
tools:src=
"@drawable/b_merchant_order_icon_order_status_finished"
/>
<TextView
android:id=
"@+id/tv_order_status"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/dp4"
android:textColor=
"@color/color_F26E3D"
android:textSize=
"@dimen/sp24"
android:textStyle=
"bold"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintHorizontal_chainStyle=
"packed"
app:layout_constraintStart_toEndOf=
"@id/iv_order_status"
app:layout_constraintTop_toTopOf=
"parent"
tools:text=
"已完成"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
Components/BMerchantOrder/src/main/res/values/strings.xml
View file @
c55f8794
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string
name=
"amount"
>
%.2f
</string>
<string
name=
"b_merchant_order_buyer_info"
>
买家信息
</string>
<string
name=
"b_merchant_order_buyer_nickname"
>
买家昵称
</string>
<string
name=
"b_merchant_order_contact_info"
>
联系方式
</string>
<string
name=
"b_merchant_order_contact_buyer"
>
联系买家
</string>
</resources>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment