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
e904089b
Commit
e904089b
authored
Sep 08, 2021
by
shiyl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单中心页面搭建
parent
337d5da5
Changes
22
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
517 additions
and
5 deletions
+517
-5
IntentConstants.kt
.../main/java/com/yidian/bcommon/constant/IntentConstants.kt
+3
-0
MyOrderEntryAdapter.kt
...henghuoquan/bmerchantorder/adapter/MyOrderEntryAdapter.kt
+29
-0
OrderFilterConditionAdapter.kt
...uan/bmerchantorder/adapter/OrderFilterConditionAdapter.kt
+27
-0
MyOrderEntryDto.kt
...yidian/shenghuoquan/bmerchantorder/dto/MyOrderEntryDto.kt
+10
-0
OrderFilterConditionDto.kt
...henghuoquan/bmerchantorder/dto/OrderFilterConditionDto.kt
+9
-0
MerchantOrderCenterActivity.kt
...ghuoquan/bmerchantorder/ui/MerchantOrderCenterActivity.kt
+51
-0
MerchantOrderCenterViewModel.kt
.../bmerchantorder/viewmodel/MerchantOrderCenterViewModel.kt
+134
-1
b_merchant_order_icon_all_order.webp
.../res/drawable-xxhdpi/b_merchant_order_icon_all_order.webp
+0
-0
b_merchant_order_icon_bill_bg.webp
...in/res/drawable-xxhdpi/b_merchant_order_icon_bill_bg.webp
+0
-0
b_merchant_order_icon_order_closed.webp
...s/drawable-xxhdpi/b_merchant_order_icon_order_closed.webp
+0
-0
b_merchant_order_icon_order_completed.webp
...rawable-xxhdpi/b_merchant_order_icon_order_completed.webp
+0
-0
b_merchant_order_icon_time_filter.webp
...es/drawable-xxhdpi/b_merchant_order_icon_time_filter.webp
+0
-0
b_merchant_order_icon_waiting_payment.webp
...rawable-xxhdpi/b_merchant_order_icon_waiting_payment.webp
+0
-0
b_merchant_order_icon_waiting_write_off.webp
...wable-xxhdpi/b_merchant_order_icon_waiting_write_off.webp
+0
-0
b_merchant_order_shape_blue_corner_bg.xml
...in/res/drawable/b_merchant_order_shape_blue_corner_bg.xml
+9
-0
b_merchant_order_shape_order_num.xml
...rc/main/res/drawable/b_merchant_order_shape_order_num.xml
+13
-0
b_merchant_order_shape_white_corner_bg.xml
...n/res/drawable/b_merchant_order_shape_white_corner_bg.xml
+9
-0
bmerchantorder_activity_merchant_order_center.xml
.../layout/bmerchantorder_activity_merchant_order_center.xml
+151
-2
bmerchantorder_item_my_ordre_entry.xml
...rc/main/res/layout/bmerchantorder_item_my_ordre_entry.xml
+46
-0
bmerchantorder_item_ordre_filter_condition.xml
...res/layout/bmerchantorder_item_ordre_filter_condition.xml
+22
-0
color.xml
Components/BMerchantOrder/src/main/res/values/color.xml
+3
-1
strings.xml
Components/BMerchantOrder/src/main/res/values/strings.xml
+1
-1
No files found.
CommonLib/BCommon/src/main/java/com/yidian/bcommon/constant/IntentConstants.kt
View file @
e904089b
...
...
@@ -24,4 +24,7 @@ object IntentConstants {
// 确认订单进选择优惠券列表
const
val
KEY_EXTRA_COUPON_LIST
=
"couponList"
// 商户订单中心 -> 商户订单列表
const
val
KEY_EXTRA_MERCHANT_ORDER_LIST
=
"key_extra_merchant_order_list"
}
Components/BMerchantOrder/src/main/java/com/yidian/shenghuoquan/bmerchantorder/adapter/MyOrderEntryAdapter.kt
0 → 100644
View file @
e904089b
package
com.yidian.shenghuoquan.bmerchantorder.adapter
import
android.widget.TextView
import
androidx.core.content.ContextCompat
import
com.chad.library.adapter.base.BaseQuickAdapter
import
com.chad.library.adapter.base.viewholder.BaseViewHolder
import
com.yidian.bcommon.extensions.hide
import
com.yidian.bcommon.extensions.show
import
com.yidian.shenghuoquan.bmerchantorder.R
import
com.yidian.shenghuoquan.bmerchantorder.dto.MyOrderEntryDto
/**
* 订单中心 - 各订单类型的入口
*/
class
MyOrderEntryAdapter
:
BaseQuickAdapter
<
MyOrderEntryDto
,
BaseViewHolder
>(
R
.
layout
.
bmerchantorder_item_my_ordre_entry
)
{
override
fun
convert
(
holder
:
BaseViewHolder
,
item
:
MyOrderEntryDto
)
{
holder
.
getView
<
TextView
>(
R
.
id
.
tv_order_type
).
text
=
item
.
orderTypeName
val
orderNum
=
holder
.
getView
<
TextView
>(
R
.
id
.
tv_order_num
)
if
(
item
.
orderTypeNum
.
isNullOrBlank
())
{
orderNum
.
hide
()
}
else
{
orderNum
.
show
()
orderNum
.
text
=
item
.
orderTypeNum
}
holder
.
getView
<
TextView
>(
R
.
id
.
iv_order_icon
).
background
=
item
.
orderTypeIcon
?.
let
{
ContextCompat
.
getDrawable
(
context
,
it
)
}
}
}
Components/BMerchantOrder/src/main/java/com/yidian/shenghuoquan/bmerchantorder/adapter/OrderFilterConditionAdapter.kt
0 → 100644
View file @
e904089b
package
com.yidian.shenghuoquan.bmerchantorder.adapter
import
android.widget.TextView
import
androidx.core.content.ContextCompat
import
com.chad.library.adapter.base.BaseQuickAdapter
import
com.chad.library.adapter.base.viewholder.BaseViewHolder
import
com.yidian.shenghuoquan.bmerchantorder.R
import
com.yidian.shenghuoquan.bmerchantorder.dto.OrderFilterConditionDto
/**
* 订单筛选条件适配器
*/
class
OrderFilterConditionAdapter
:
BaseQuickAdapter
<
OrderFilterConditionDto
,
BaseViewHolder
>(
R
.
layout
.
bmerchantorder_item_ordre_filter_condition
)
{
override
fun
convert
(
holder
:
BaseViewHolder
,
item
:
OrderFilterConditionDto
)
{
val
view
=
holder
.
getView
<
TextView
>(
R
.
id
.
tv_filter_name
)
view
.
text
=
item
.
name
if
(
item
.
isSelected
)
{
view
.
setTextColor
(
ContextCompat
.
getColor
(
context
,
R
.
color
.
color_1852F1
))
view
.
background
=
ContextCompat
.
getDrawable
(
context
,
R
.
drawable
.
b_merchant_order_shape_blue_corner_bg
)
}
else
{
view
.
setTextColor
(
ContextCompat
.
getColor
(
context
,
R
.
color
.
color_333333
))
view
.
background
=
ContextCompat
.
getDrawable
(
context
,
R
.
drawable
.
b_merchant_order_shape_white_corner_bg
)
}
}
}
Components/BMerchantOrder/src/main/java/com/yidian/shenghuoquan/bmerchantorder/dto/MyOrderEntryDto.kt
0 → 100644
View file @
e904089b
package
com.yidian.shenghuoquan.bmerchantorder.dto
/**
* 我的订单入口数据模型
*/
data class
MyOrderEntryDto
(
val
orderTypeName
:
String
?
=
null
,
// 订单类型名称
var
orderTypeNum
:
String
?
=
null
,
// 订单类型数量
val
orderTypeIcon
:
Int
?
=
null
,
// 订单类型图标(@DrawableRes)
)
Components/BMerchantOrder/src/main/java/com/yidian/shenghuoquan/bmerchantorder/dto/OrderFilterConditionDto.kt
0 → 100644
View file @
e904089b
package
com.yidian.shenghuoquan.bmerchantorder.dto
/**
* 订单筛选条件
*/
data class
OrderFilterConditionDto
(
val
name
:
String
?
=
null
,
var
isSelected
:
Boolean
=
false
)
Components/BMerchantOrder/src/main/java/com/yidian/shenghuoquan/bmerchantorder/ui/MerchantOrderCenterActivity.kt
View file @
e904089b
package
com.yidian.shenghuoquan.bmerchantorder.ui
import
androidx.activity.viewModels
import
androidx.recyclerview.widget.GridLayoutManager
import
com.yidian.bcommon.constant.XRouterPathConstants
import
com.yidian.bcommon.mvvm.BaseMvvmActivity
import
com.yidian.bcommon.utils.ToastUtils
import
com.yidian.shenghuoquan.bmerchantorder.R
import
com.yidian.shenghuoquan.bmerchantorder.adapter.MyOrderEntryAdapter
import
com.yidian.shenghuoquan.bmerchantorder.adapter.OrderFilterConditionAdapter
import
com.yidian.shenghuoquan.bmerchantorder.databinding.BmerchantorderActivityMerchantOrderCenterBinding
import
com.yidian.shenghuoquan.bmerchantorder.dto.OrderFilterConditionDto
import
com.yidian.shenghuoquan.bmerchantorder.viewmodel.MerchantOrderCenterViewModel
import
com.yidian.xpage.XPageViewProtocol
...
...
@@ -15,6 +20,10 @@ import com.yidian.xpage.XPageViewProtocol
class
MerchantOrderCenterActivity
:
BaseMvvmActivity
<
BmerchantorderActivityMerchantOrderCenterBinding
,
MerchantOrderCenterViewModel
>(),
XPageViewProtocol
{
private
val
orderFilterAdapter
by
lazy
{
OrderFilterConditionAdapter
()
}
private
val
myOrderEntryAdapter
by
lazy
{
MyOrderEntryAdapter
()
}
override
val
layoutId
:
Int
=
R
.
layout
.
bmerchantorder_activity_merchant_order_center
override
val
vm
:
MerchantOrderCenterViewModel
by
viewModels
()
...
...
@@ -25,9 +34,51 @@ class MerchantOrderCenterActivity : BaseMvvmActivity<BmerchantorderActivityMerch
override
fun
initView
()
{
subscribeUiEvent
()
initOrderTypeEntryList
()
initFilterConditionList
()
}
override
fun
onResume
()
{
super
.
onResume
()
vm
.
requestOrderCenterInfo
()
}
/**
* 初始化筛选条件的列表
*/
private
fun
initFilterConditionList
()
{
binding
.
rvOrderEntry
.
layoutManager
=
GridLayoutManager
(
this
,
2
)
binding
.
rvOrderEntry
.
adapter
=
myOrderEntryAdapter
myOrderEntryAdapter
.
setOnItemClickListener
{
_
,
_
,
position
->
// 更新点击orderFilterList中的item为选中状态
vm
.
updateFilterList
(
position
)
// 使用最新的筛选条件刷新页面
vm
.
requestOrderCenterInfo
()
}
// 初始化筛选条件列表,默认选中第一个
vm
.
initFilterList
()
}
/**
* 初始化订单入口的列表
*/
private
fun
initOrderTypeEntryList
()
{
binding
.
rvOrderEntry
.
layoutManager
=
GridLayoutManager
(
this
,
3
)
binding
.
rvOrderEntry
.
adapter
=
myOrderEntryAdapter
myOrderEntryAdapter
.
setOnItemClickListener
{
_
,
_
,
position
->
vm
.
openOrderList
(
position
)
}
// 初始化订单入口,默认没有小红点
vm
.
initOrderEntryList
()
}
private
fun
subscribeUiEvent
()
{
vm
.
initOrderEntryListEvent
.
observe
(
this
,
{
myOrderEntryAdapter
.
setList
(
it
)
})
vm
.
initOrderFilterListEvent
.
observe
(
this
,
{
orderFilterAdapter
.
setList
(
it
)
})
}
...
...
Components/BMerchantOrder/src/main/java/com/yidian/shenghuoquan/bmerchantorder/viewmodel/MerchantOrderCenterViewModel.kt
View file @
e904089b
package
com.yidian.shenghuoquan.bmerchantorder.viewmodel
import
androidx.lifecycle.LiveData
import
androidx.lifecycle.MutableLiveData
import
com.yidian.bcommon.mvvm.BaseViewModel
import
com.yidian.bcommon.utils.ToastUtils
import
com.yidian.shenghuoquan.bmerchantorder.R
import
com.yidian.shenghuoquan.bmerchantorder.dto.MyOrderEntryDto
import
com.yidian.shenghuoquan.bmerchantorder.dto.OrderFilterConditionDto
/**
* 订单中心
*/
class
MerchantOrderCenterViewModel
:
BaseViewModel
()
{
private
lateinit
var
orderEntryList
:
MutableList
<
MyOrderEntryDto
>
private
lateinit
var
orderFilterList
:
MutableList
<
OrderFilterConditionDto
>
val
currentTimeLimit
=
MutableLiveData
<
String
>()
// 当前时间筛选条件
val
actualIncome
=
MutableLiveData
<
Double
?>()
// 实际收入
val
pendingSettlementIncome
=
MutableLiveData
<
Double
?>()
// 待结算收入
/**
* 订单入口 Event
*/
private
val
_initOrderEntryListEvent
=
MutableLiveData
<
List
<
MyOrderEntryDto
>>()
val
initOrderEntryListEvent
:
LiveData
<
List
<
MyOrderEntryDto
>>
=
_initOrderEntryListEvent
/**
* 订单筛选 Event
*/
private
val
_initOrderFilterListEvent
=
MutableLiveData
<
List
<
OrderFilterConditionDto
>>()
val
initOrderFilterListEvent
:
LiveData
<
List
<
OrderFilterConditionDto
>>
=
_initOrderFilterListEvent
val
currentTimeLimit
=
MutableLiveData
<
String
>()
fun
requestOrderCenterInfo
()
{
// todo 筛选条件使用orderFilterList中的当前选中条件,也可以将参数声明为单独的变量,看接口要求吧
// todo 网络请求成功后更新订单的小红点,收支账单赋值
pendingSettlementIncome
.
value
=
12.0
actualIncome
.
value
=
123.453
updateOrderEntryList
()
}
/**
* 初始化订单入口,避免多次遍历重复创建对象
*/
fun
initOrderEntryList
()
{
orderEntryList
=
mutableListOf
()
for
(
i
in
0
..
4
)
{
when
(
i
)
{
0
->
{
val
dto
=
MyOrderEntryDto
(
orderTypeName
=
"全部订单"
,
orderTypeIcon
=
R
.
drawable
.
b_merchant_order_icon_all_order
)
orderEntryList
.
add
(
dto
)
}
1
->
{
val
dto
=
MyOrderEntryDto
(
orderTypeName
=
"待付款"
,
orderTypeIcon
=
R
.
drawable
.
b_merchant_order_icon_waiting_payment
)
orderEntryList
.
add
(
dto
)
}
2
->
{
val
dto
=
MyOrderEntryDto
(
orderTypeName
=
"待核销"
,
orderTypeIcon
=
R
.
drawable
.
b_merchant_order_icon_waiting_write_off
)
orderEntryList
.
add
(
dto
)
}
3
->
{
val
dto
=
MyOrderEntryDto
(
orderTypeName
=
"已完成"
,
orderTypeIcon
=
R
.
drawable
.
b_merchant_order_icon_order_completed
)
orderEntryList
.
add
(
dto
)
}
4
->
{
val
dto
=
MyOrderEntryDto
(
orderTypeName
=
"退款/已关闭"
,
orderTypeIcon
=
R
.
drawable
.
b_merchant_order_icon_order_closed
)
orderEntryList
.
add
(
dto
)
}
}
}
_initOrderEntryListEvent
.
value
=
orderEntryList
}
/**
* 更新订单入口显示的订单数量
*/
private
fun
updateOrderEntryList
()
{
// todo 此list应为接口返回的订单数量
val
list
=
listOf
(
"99+"
,
"9"
,
"90"
,
""
,
""
)
list
.
forEachIndexed
{
index
,
s
->
orderEntryList
[
index
].
apply
{
orderTypeNum
=
s
}
}
_initOrderEntryListEvent
.
value
=
orderEntryList
}
/**
* 初始化订单入口,避免多次遍历重复创建对象
*/
fun
initFilterList
()
{
orderFilterList
=
mutableListOf
()
for
(
i
in
0
..
2
)
{
when
(
i
)
{
0
->
{
val
dto
=
OrderFilterConditionDto
(
name
=
"近三个月"
,
isSelected
=
true
)
orderFilterList
.
add
(
dto
)
}
1
->
{
val
dto
=
OrderFilterConditionDto
(
name
=
"近一个月"
)
orderFilterList
.
add
(
dto
)
}
2
->
{
val
dto
=
OrderFilterConditionDto
(
name
=
"近一周"
)
orderFilterList
.
add
(
dto
)
}
}
}
_initOrderFilterListEvent
.
value
=
orderFilterList
}
fun
updateFilterList
(
position
:
Int
)
{
orderFilterList
.
forEachIndexed
{
index
,
dto
->
when
(
index
)
{
position
->
dto
.
isSelected
=
true
else
->
dto
.
isSelected
=
false
}
}
// 关闭筛选条件切换
openTimeFilter
()
}
fun
openTimeFilter
()
{
// 如果关闭则打开,反之关闭
}
fun
openOrderList
(
orderType
:
Int
)
{
// todo 修改为XPage打开页面
when
(
orderType
)
{
0
->
ToastUtils
.
showShortSafe
(
"打开全部订单"
)
1
->
ToastUtils
.
showShortSafe
(
"打开待付款订单"
)
2
->
ToastUtils
.
showShortSafe
(
"打开待核销订单"
)
3
->
ToastUtils
.
showShortSafe
(
"打开已完成订单"
)
4
->
ToastUtils
.
showShortSafe
(
"打开退款/关闭订单"
)
}
// val map = HashMap<String, Any?>()
// map[IntentConstants.KEY_EXTRA_MERCHANT_ORDER_LIST] = orderType
// XPageManager.push(XRouterPathConstants.MERCHANT_ORDER_LIST_ACTIVITY, map)
}
...
...
Components/BMerchantOrder/src/main/res/drawable-xxhdpi/b_merchant_icon_all_order.webp
→
Components/BMerchantOrder/src/main/res/drawable-xxhdpi/b_merchant_
order_
icon_all_order.webp
View file @
e904089b
File moved
Components/BMerchantOrder/src/main/res/drawable-xxhdpi/b_merchant_icon_bill_bg.webp
→
Components/BMerchantOrder/src/main/res/drawable-xxhdpi/b_merchant_
order_
icon_bill_bg.webp
View file @
e904089b
File moved
Components/BMerchantOrder/src/main/res/drawable-xxhdpi/b_merchant_icon_order_closed.webp
→
Components/BMerchantOrder/src/main/res/drawable-xxhdpi/b_merchant_
order_
icon_order_closed.webp
View file @
e904089b
File moved
Components/BMerchantOrder/src/main/res/drawable-xxhdpi/b_merchant_icon_order_completed.webp
→
Components/BMerchantOrder/src/main/res/drawable-xxhdpi/b_merchant_
order_
icon_order_completed.webp
View file @
e904089b
File moved
Components/BMerchantOrder/src/main/res/drawable-xxhdpi/b_merchant_icon_time_filter.webp
→
Components/BMerchantOrder/src/main/res/drawable-xxhdpi/b_merchant_
order_
icon_time_filter.webp
View file @
e904089b
File moved
Components/BMerchantOrder/src/main/res/drawable-xxhdpi/b_merchant_icon_waiting_payment.webp
→
Components/BMerchantOrder/src/main/res/drawable-xxhdpi/b_merchant_
order_
icon_waiting_payment.webp
View file @
e904089b
File moved
Components/BMerchantOrder/src/main/res/drawable-xxhdpi/b_merchant_icon_waiting_write_off.webp
→
Components/BMerchantOrder/src/main/res/drawable-xxhdpi/b_merchant_
order_
icon_waiting_write_off.webp
View file @
e904089b
File moved
Components/BMerchantOrder/src/main/res/drawable/b_merchant_order_shape_blue_corner_bg.xml
0 → 100644
View file @
e904089b
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:shape=
"rectangle"
>
<corners
android:radius=
"@dimen/dp12"
/>
<solid
android:color=
"#ffe9efff"
/>
</shape>
\ No newline at end of file
Components/BMerchantOrder/src/main/res/drawable/b_merchant_order_shape_order_num.xml
0 → 100644
View file @
e904089b
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:shape=
"rectangle"
>
<solid
android:color=
"@color/b_merchant_order_color_F26E3D"
/>
<corners
android:radius=
"@dimen/dp8"
/>
<padding
android:left=
"@dimen/dp5"
android:right=
"@dimen/dp5"
/>
</shape>
\ No newline at end of file
Components/BMerchantOrder/src/main/res/drawable/b_merchant_order_shape_white_corner_bg.xml
0 → 100644
View file @
e904089b
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:shape=
"rectangle"
>
<corners
android:radius=
"@dimen/dp12"
/>
<solid
android:color=
"@color/white"
/>
</shape>
\ No newline at end of file
Components/BMerchantOrder/src/main/res/layout/bmerchantorder_activity_merchant_order_center.xml
View file @
e904089b
...
...
@@ -50,8 +50,8 @@
android:id=
"@+id/tv_order_time"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:drawableStart=
"@drawable/b_merchant_icon_time_filter"
android:onClick=
"@{() -> vm.
postBackEvent
()}"
android:drawableStart=
"@drawable/b_merchant_
order_
icon_time_filter"
android:onClick=
"@{() -> vm.
openTimeFilter
()}"
android:textColor=
"@color/color_666666"
android:textSize=
"@dimen/sp12"
app:layout_constraintEnd_toEndOf=
"parent"
...
...
@@ -62,6 +62,155 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/dp16"
android:layout_marginEnd=
"@dimen/dp16"
android:background=
"@drawable/b_merchant_order_icon_bill_bg"
>
<TextView
android:id=
"@+id/tv_bill"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/dp20"
android:layout_marginTop=
"@dimen/dp19"
android:text=
"收支账单"
android:textColor=
"@color/color_333333"
android:textSize=
"@dimen/sp16"
android:textStyle=
"bold"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintHorizontal_bias=
"0"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
android:id=
"@+id/tv_actual_income_num"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp15"
android:layout_marginEnd=
"@dimen/dp5"
android:text=
"@{@string/amount(vm.actualIncome)}"
android:textColor=
"@color/b_merchant_order_color_F26E3D"
android:textSize=
"28sp"
app:layout_constraintEnd_toStartOf=
"@id/gl_bill_center"
app:layout_constraintHorizontal_bias=
"0"
app:layout_constraintStart_toStartOf=
"@id/tv_bill"
app:layout_constraintTop_toBottomOf=
"@id/tv_bill"
tools:text=
"12353.13"
/>
<TextView
android:id=
"@+id/tv_actual_income_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"@dimen/dp19"
android:text=
"实际收入"
android:textColor=
"@color/color_999999"
android:textSize=
"12sp"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toStartOf=
"@id/gl_bill_center"
app:layout_constraintHorizontal_bias=
"0"
app:layout_constraintStart_toStartOf=
"@id/tv_bill"
app:layout_constraintTop_toBottomOf=
"@id/tv_actual_income_num"
/>
<androidx.constraintlayout.widget.Guideline
android:id=
"@+id/gl_bill_center"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
app:layout_constraintGuide_percent=
"0.5"
/>
<TextView
android:id=
"@+id/tv_pending_payment_num"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/dp5"
android:layout_marginTop=
"@dimen/dp15"
android:text=
"@{@string/amount(vm.pendingSettlementIncome)}"
android:textColor=
"@color/b_merchant_order_color_F26E3D"
android:textSize=
"28sp"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintHorizontal_bias=
"0"
app:layout_constraintStart_toEndOf=
"@id/gl_bill_center"
app:layout_constraintTop_toBottomOf=
"@id/tv_bill"
tools:text=
"12144214.00"
/>
<TextView
android:id=
"@+id/tv_pending_payment_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"@dimen/dp19"
android:text=
"待结算收入"
android:textColor=
"@color/color_999999"
android:textSize=
"12sp"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintHorizontal_bias=
"0"
app:layout_constraintStart_toEndOf=
"@id/gl_bill_center"
app:layout_constraintTop_toBottomOf=
"@id/tv_pending_payment_num"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/dp16"
android:layout_marginTop=
"@dimen/dp10"
android:layout_marginEnd=
"@dimen/dp16"
android:background=
"@drawable/b_merchant_order_shape_white_corner_bg"
>
<TextView
android:id=
"@+id/tv_my_order_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/dp20"
android:layout_marginTop=
"@dimen/dp20"
android:text=
"我的订单"
android:textColor=
"@color/color_333333"
android:textSize=
"16sp"
android:textStyle=
"bold"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintHorizontal_bias=
"0"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
android:id=
"@+id/tv_all_order_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:onClick=
"@{()-> vm.openOrderList(0)}"
android:text=
"全部"
android:textColor=
"@color/color_999999"
android:textSize=
"14sp"
app:layout_constraintBaseline_toBaselineOf=
"@id/tv_my_order_title"
app:layout_constraintEnd_toStartOf=
"@id/iv_all_order"
/>
<ImageView
android:id=
"@+id/iv_all_order"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp20"
android:layout_marginEnd=
"@dimen/dp12"
android:onClick=
"@{()-> vm.openOrderList(0)}"
android:src=
"@drawable/icon_next"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintVertical_bias=
"0"
/>
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_order_entry"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/tv_my_order_title"
tools:itemCount=
"3"
tools:listitem=
"@layout/bmerchantorder_item_my_ordre_entry"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</layout>
\ No newline at end of file
Components/BMerchantOrder/src/main/res/layout/bmerchantorder_item_my_ordre_entry.xml
0 → 100644
View file @
e904089b
<?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=
"@dimen/dp85"
>
<ImageView
android:id=
"@+id/iv_order_icon"
android:layout_width=
"@dimen/dp30"
android:layout_height=
"@dimen/dp30"
android:background=
"@drawable/b_merchant_order_icon_all_order"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintVertical_bias=
"0.3"
/>
<TextView
android:id=
"@+id/tv_order_type"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp6"
android:textColor=
"@color/color_333333"
android:textSize=
"12sp"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/iv_order_icon"
tools:text=
"全部订单"
/>
<TextView
android:id=
"@+id/tv_order_num"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:background=
"@drawable/b_merchant_order_shape_order_num"
android:textColor=
"@color/white"
android:textSize=
"12sp"
android:visibility=
"gone"
app:layout_constraintBottom_toTopOf=
"@id/iv_order_icon"
app:layout_constraintEnd_toEndOf=
"@id/iv_order_icon"
app:layout_constraintStart_toEndOf=
"@id/iv_order_icon"
app:layout_constraintTop_toTopOf=
"@id/iv_order_icon"
tools:text=
"99+"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
Components/BMerchantOrder/src/main/res/layout/bmerchantorder_item_ordre_filter_condition.xml
0 → 100644
View file @
e904089b
<?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=
"wrap_content"
android:layout_height=
"wrap_content"
>
<TextView
android:id=
"@+id/tv_filter_name"
android:layout_width=
"@dimen/dp163"
android:layout_height=
"@dimen/dp56"
android:background=
"@drawable/b_merchant_order_shape_white_corner_bg"
android:gravity=
"center"
android:textColor=
"@color/color_333333"
android:textSize=
"16sp"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
tools:text=
"近三个月"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
Components/BMerchantOrder/src/main/res/values/color.xml
View file @
e904089b
<?xml version="1.0" encoding="utf-8"?>
<resources></resources>
\ No newline at end of file
<resources>
<color
name=
"b_merchant_order_color_F26E3D"
>
#F26E3D
</color>
</resources>
Components/BMerchantOrder/src/main/res/values/strings.xml
View file @
e904089b
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string
name=
"amount"
>
%.2f
</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