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
826a6a47
Commit
826a6a47
authored
Jul 16, 2021
by
yinjiacheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix SHQBD-631 商品下架二次确认弹窗文案修改
parent
d68e445d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
11 deletions
+18
-11
CommodityListAdapter.kt
...oquan/commodity/ui/coupon/adapter/CommodityListAdapter.kt
+14
-10
strings.xml
Components/commodity/src/main/res/values/strings.xml
+4
-0
LifeAccountIDCardAuthFragmentV2.kt
...an/newscontent/ui/auth/LifeAccountIDCardAuthFragmentV2.kt
+0
-1
No files found.
Components/commodity/src/main/java/com/yidian/shenghuoquan/commodity/ui/coupon/adapter/CommodityListAdapter.kt
View file @
826a6a47
...
...
@@ -141,21 +141,25 @@ class CommodityListAdapter(private val context: Context, private val status: Com
holder
.
binding
.
setVariable
(
BR
.
vm
,
CommodityListItemViewModel
())
holder
.
binding
.
vm
?.
commodityOfflineOperationEvent
?.
observe
(
context
as
LifecycleOwner
,
{
// 弹出确认下架弹窗
CommonHintDialog
(
context
,
"确认下架优惠券?"
,
arrayListOf
(
"取消"
,
"下架"
),
object
:
CommonHintDialog
.
OnHintOptionCallback
{
override
fun
onLeftOption
()
{
CommonHintDialog
(
context
,
context
.
resources
.
getString
(
R
.
string
.
commodity_down_shelves_confirm
),
arrayListOf
(
context
.
resources
.
getString
(
R
.
string
.
cancel
),
context
.
resources
.
getString
(
R
.
string
.
down_shelves
)),
object
:
CommonHintDialog
.
OnHintOptionCallback
{
override
fun
onLeftOption
()
{
}
}
override
fun
onRightOption
()
{
// 下架商品
holder
.
binding
.
vm
?.
requestCommodityOffline
(
it
.
goodsSpuId
)
}
override
fun
onRightOption
()
{
// 下架商品
holder
.
binding
.
vm
?.
requestCommodityOffline
(
it
.
goodsSpuId
)
}
}).
show
()
}).
show
()
})
holder
.
binding
.
vm
?.
commodityOfflineSuccessEvent
?.
observe
(
context
as
LifecycleOwner
,
{
// 下架成功 刷新列表
ToastUtil
.
showToast
(
context
,
"下架成功"
)
ToastUtil
.
showToast
(
context
,
context
.
resources
.
getString
(
R
.
string
.
down_shelves_success
)
)
commodityData
.
remove
(
data
)
notifyItemRemoved
(
position
)
commodityDataChange
.
value
=
commodityData
...
...
@@ -173,7 +177,7 @@ class CommodityListAdapter(private val context: Context, private val status: Com
holder
.
binding
.
setVariable
(
BR
.
vm
,
CommodityListItemViewModel
())
holder
.
binding
.
vm
?.
commodityOnlineSuccessEvent
?.
observe
(
context
as
LifecycleOwner
,
{
// 上架成功 刷新列表
ToastUtil
.
showToast
(
context
,
"上架成功"
)
ToastUtil
.
showToast
(
context
,
context
.
resources
.
getString
(
R
.
string
.
up_shelves_success
)
)
commodityData
.
remove
(
data
)
notifyItemRemoved
(
position
)
commodityDataChange
.
value
=
commodityData
...
...
Components/commodity/src/main/res/values/strings.xml
View file @
826a6a47
...
...
@@ -13,4 +13,8 @@
<string
name=
"click_post_coupon"
>
点击下方发布优惠券
</string>
<string
name=
"no_search_result"
>
暂无搜索结果
</string>
<string
name=
"click_search_again"
>
请点击搜索框重新进行搜索
</string>
<string
name=
"commodity_down_shelves_confirm"
>
确认下架商品?
</string>
<string
name=
"cancel"
>
取消
</string>
<string
name=
"down_shelves_success"
>
下架成功
</string>
<string
name=
"up_shelves_success"
>
上架成功
</string>
</resources>
\ No newline at end of file
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountIDCardAuthFragmentV2.kt
View file @
826a6a47
...
...
@@ -56,7 +56,6 @@ import java.io.File
* description: 生活号身份证认证 接入XInsight
*/
// TODO: 7/15/21 活体检测临时数据删除
// TODO: 7/15/21 接入Luban压缩
class
LifeAccountIDCardAuthFragmentV2
:
BaseFragment
<
FragmentLifeAccountIdCardAuthBinding
>(),
View
.
OnClickListener
,
BottomSelectAdapter
.
OnItemClickListener
<
BottomSelectBean
>,
IAuthPersonalCheckCallback
,
IAuthLiveIdentityCallback
,
LifeAccountAuthImageView
.
OnLifeAccountAuthImageViewCallback
,
...
...
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