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
6f73ad44
Commit
6f73ad44
authored
Jun 23, 2021
by
yinjiacheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix SHQBD-237 生活号标签具体区分普通企业和个体工商户
parent
bc88061e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
70 additions
and
69 deletions
+70
-69
MerchantSwitchAdapter.kt
...shenghuoquan/newscontent/adapter/MerchantSwitchAdapter.kt
+66
-65
MerchantCenterActivity.kt
...nghuoquan/newscontent/ui/center/MerchantCenterActivity.kt
+0
-1
LifeAccountLabelView.kt
...n/shenghuoquan/newscontent/widget/LifeAccountLabelView.kt
+4
-3
No files found.
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/adapter/MerchantSwitchAdapter.kt
View file @
6f73ad44
...
@@ -52,9 +52,10 @@ class MerchantSwitchAdapter(
...
@@ -52,9 +52,10 @@ class MerchantSwitchAdapter(
// 已认证
// 已认证
setBackgroundResource
(
R
.
drawable
.
shape_life_account_status_auth
)
setBackgroundResource
(
R
.
drawable
.
shape_life_account_status_auth
)
setTextColor
(
ContextCompat
.
getColor
(
context
,
R
.
color
.
color_FF1852F1
))
setTextColor
(
ContextCompat
.
getColor
(
context
,
R
.
color
.
color_FF1852F1
))
text
=
when
(
data
.
life_account_type
)
{
text
=
when
(
data
.
tag
.
tag_key
)
{
Constant
.
TYPE_LIFE_ACCOUNT_PERSONAL
->
resources
.
getString
(
R
.
string
.
personal_auth
)
Constant
.
LIFE_ACCOUNT_TAG_COMMON_ENTERPRISE_AUTH
->
resources
.
getString
(
R
.
string
.
common_enterprise
)
Constant
.
TYPE_LIFE_ACCOUNT_ENTERPRISE
->
resources
.
getString
(
R
.
string
.
enterprise_auth
)
Constant
.
LIFE_ACCOUNT_TAG_INDIVIDUAL_BUSINESS_AUTH
->
resources
.
getString
(
R
.
string
.
individual_business
)
Constant
.
LIFE_ACCOUNT_TAG_PERSONAL_AUTH
->
resources
.
getString
(
R
.
string
.
personal_auth
)
else
->
""
else
->
""
}
}
}
}
...
...
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantCenterActivity.kt
View file @
6f73ad44
...
@@ -194,7 +194,6 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
...
@@ -194,7 +194,6 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
/**
/**
* 对应生活号权限下的功能集
* 对应生活号权限下的功能集
* @param tagKey 生活号认证类型/状态
* todo 优化逻辑
* todo 优化逻辑
*/
*/
private
fun
generateFunctionPermissionMap
(
data
:
List
<
GetConfigListBean
.
Item
>)
{
private
fun
generateFunctionPermissionMap
(
data
:
List
<
GetConfigListBean
.
Item
>)
{
...
...
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/widget/LifeAccountLabelView.kt
View file @
6f73ad44
...
@@ -60,9 +60,10 @@ class LifeAccountLabelView @JvmOverloads constructor(
...
@@ -60,9 +60,10 @@ class LifeAccountLabelView @JvmOverloads constructor(
// 已认证
// 已认证
setBackgroundResource
(
R
.
drawable
.
shape_life_account_status_auth
)
setBackgroundResource
(
R
.
drawable
.
shape_life_account_status_auth
)
setTextColor
(
ContextCompat
.
getColor
(
context
,
R
.
color
.
color_FF1852F1
))
setTextColor
(
ContextCompat
.
getColor
(
context
,
R
.
color
.
color_FF1852F1
))
text
=
when
(
data
.
life_account_type
)
{
text
=
when
(
data
.
tag
.
tag_key
)
{
Constant
.
TYPE_LIFE_ACCOUNT_PERSONAL
->
resources
.
getString
(
R
.
string
.
personal_auth
)
Constant
.
LIFE_ACCOUNT_TAG_COMMON_ENTERPRISE_AUTH
->
resources
.
getString
(
R
.
string
.
common_enterprise
)
Constant
.
TYPE_LIFE_ACCOUNT_ENTERPRISE
->
resources
.
getString
(
R
.
string
.
enterprise_auth
)
Constant
.
LIFE_ACCOUNT_TAG_INDIVIDUAL_BUSINESS_AUTH
->
resources
.
getString
(
R
.
string
.
individual_business
)
Constant
.
LIFE_ACCOUNT_TAG_PERSONAL_AUTH
->
resources
.
getString
(
R
.
string
.
personal_auth
)
else
->
""
else
->
""
}
}
}
}
...
...
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