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
5960d96c
Commit
5960d96c
authored
Jul 14, 2021
by
yinjiacheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add 商户管理中心钱包模块接入TowerPro通用配置管理
parent
98dfd1f4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
11 deletions
+32
-11
GetCommonConfigBean.kt
...n/java/com/yidian/common/http/bean/GetCommonConfigBean.kt
+3
-1
Constant.kt
.../com/yidian/shenghuoquan/newscontent/constant/Constant.kt
+11
-0
MerchantCenterActivity.kt
...nghuoquan/newscontent/ui/center/MerchantCenterActivity.kt
+18
-10
No files found.
CommonLib/Common/src/main/java/com/yidian/common/http/bean/GetCommonConfigBean.kt
View file @
5960d96c
...
...
@@ -53,7 +53,9 @@ class GetCommonConfigBean {
@SerializedName
(
"items"
)
val
items
:
List
<
Item
>,
@SerializedName
(
"show"
)
val
show
:
Int
val
show
:
Int
,
@SerializedName
(
"is_show_wallet"
)
val
isShowWallet
:
Int
)
data class
Item
(
...
...
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/constant/Constant.kt
View file @
5960d96c
...
...
@@ -94,8 +94,19 @@ object Constant {
const
val
MERCHANT_SERVICE_GROUP_OTHER
=
3
// 其他服务
// 商户管理中心服务功能id
const
val
MERCHANT_SERVICE_FUNCTION_PUBLISH_COUPON
=
101
// 我要发布-优惠券
const
val
MERCHANT_SERVICE_FUNCTION_PUBLISH_RECRUITMENT
=
102
// 我要发布-招聘
const
val
MERCHANT_SERVICE_FUNCTION_PERMISSION_MANAGEMENT
=
201
// 管理服务-权限管理
const
val
MERCHANT_SERVICE_FUNCTION_STAFF_MANAGEMENT
=
202
// 管理服务-人员管理
const
val
MERCHANT_SERVICE_FUNCTION_COUPON_MANAGEMENT
=
301
// 其他服务-优惠券管理
const
val
MERCHANT_SERVICE_FUNCTION_JOB_MANAGEMENT
=
302
// 其他服务-职位管理
const
val
MERCHANT_SERVICE_FUNCTION_STORE_MANAGEMENT
=
303
// 其他服务-门店管理
const
val
MERCHANT_SERVICE_FUNCTION_SYSTEM_SETTING
=
304
// 其他服务-系统设置
const
val
MERCHANT_SERVICE_FUNCTION_AUTH_MANAGEMENT
=
305
// 其他服务-认证管理
// 商户管理中心服务展示
const
val
MERCHANT_SERVICE_SHOW
=
1
// 各输入场景最大长度显示
const
val
MAX_LENGTH_LIFE_ACCOUNT_NAME
=
24
// 生活号名称
...
...
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantCenterActivity.kt
View file @
5960d96c
...
...
@@ -4,6 +4,7 @@ import android.content.DialogInterface
import
android.os.Bundle
import
android.view.View
import
androidx.core.content.ContextCompat
import
androidx.core.view.isVisible
import
androidx.recyclerview.widget.LinearLayoutManager
import
com.scwang.smart.refresh.layout.api.RefreshLayout
import
com.scwang.smart.refresh.layout.listener.OnRefreshListener
...
...
@@ -108,9 +109,6 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
viewBind
.
bvTopBar
.
setBackVisibility
(
false
)
viewBind
.
bvTopBar
.
setOnCommonTopBarCallback
(
null
,
this
)
// 本期需求无资产功能 仅做UI展示
viewBind
.
avMerchantAsset
.
setMerchantAssetData
(
"8856.88"
,
"675.00"
)
// 服务列表展示
viewBind
.
rvServiceGroup
.
layoutManager
=
LinearLayoutManager
(
this
)
viewBind
.
rvServiceGroup
.
addItemDecoration
(
MerchantServiceGroupAdapter
.
MerchantServiceGroupItemDecorator
())
...
...
@@ -144,19 +142,29 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
/**
* 刷新商户管理中心相关数据
*/
private
fun
refreshMerchantCenterData
(
lifeAccountData
:
LifeAccountItemBean
.
Response
,
configData
:
List
<
GetCommonConfigBean
.
Item
>)
{
private
fun
refreshMerchantCenterData
(
lifeAccountData
:
LifeAccountItemBean
.
Response
,
configData
:
GetCommonConfigBean
.
MerchantManagerCenter
)
{
// 设置标签
viewBind
.
lvLifeAccountLabel
.
setLifeAccountData
(
lifeAccountData
)
// 设置钱包
if
(
configData
.
isShowWallet
==
Constant
.
MERCHANT_SERVICE_SHOW
)
{
viewBind
.
avMerchantAsset
.
isVisible
=
true
viewBind
.
avMerchantAsset
.
setMerchantAssetData
(
"0.00"
,
"0.00"
)
}
else
{
viewBind
.
avMerchantAsset
.
isVisible
=
false
}
// 展示底部浮窗
showMerchantCenterBottomHint
(
lifeAccountData
)
// 生成FunctionId和XPage页面节点映射
generateFunctionPageMap
(
configData
)
generateFunctionPageMap
(
configData
.
items
)
// 生成FunctionId和跳转页面参数映射
generateFunctionParamsMap
(
configData
)
generateFunctionParamsMap
(
configData
.
items
)
// 生成当前生活号状态下的功能集
generateFunctionPermissionMap
(
configData
)
generateFunctionPermissionMap
(
configData
.
items
)
// 过滤商户服务数据
filterMerchantServiceData
(
configData
)
filterMerchantServiceData
(
configData
.
items
)
}
/**
...
...
@@ -584,7 +592,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
// 更新本地存储的生活号id
StorageUtil
.
putLifeAccountId
(
lifeAccountResult
[
0
].
life_account_id
)
// 刷新数据
configResult
?.
data
?.
merchantManagerCenter
?.
items
?.
let
{
refreshMerchantCenterData
(
lifeAccountResult
[
0
],
it
)
}
configResult
?.
data
?.
merchantManagerCenter
?.
let
{
refreshMerchantCenterData
(
lifeAccountResult
[
0
],
it
)
}
// 切换主体入口是否展示判断
viewBind
.
bvTopBar
.
setActionVisibility
(
lifeAccountResult
.
size
>
1
)
return
...
...
@@ -597,7 +605,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
if
(
curLifeAccount
.
life_account_id
==
it
.
life_account_id
)
{
curLifeAccount
=
it
// 刷新数据
configResult
?.
data
?.
merchantManagerCenter
?.
items
?.
let
{
configData
->
refreshMerchantCenterData
(
it
,
configData
)
}
configResult
?.
data
?.
merchantManagerCenter
?.
let
{
configData
->
refreshMerchantCenterData
(
it
,
configData
)
}
}
}
}
...
...
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