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
b07d125e
Commit
b07d125e
authored
Jul 09, 2021
by
yinjiacheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update 门店管理、选择门店、选择类目页面无数据时增加空视图
parent
ed125fcb
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
60 additions
and
1 deletion
+60
-1
CategorySearchActivity.kt
...henghuoquan/commodity/ui/coupon/CategorySearchActivity.kt
+5
-0
commodity_activity_category_search.xml
...rc/main/res/layout/commodity_activity_category_search.xml
+12
-1
strings.xml
Components/commodity/src/main/res/values/strings.xml
+2
-0
ChooseStoreActivity.kt
.../shenghuoquan/newscontent/ui/store/ChooseStoreActivity.kt
+9
-0
StoreManagementActivity.kt
...nghuoquan/newscontent/ui/store/StoreManagementActivity.kt
+9
-0
activity_choose_store.xml
...newscontent/src/main/res/layout/activity_choose_store.xml
+10
-0
activity_store_management.xml
...content/src/main/res/layout/activity_store_management.xml
+10
-0
strings.xml
Components/newscontent/src/main/res/values/strings.xml
+3
-0
No files found.
Components/commodity/src/main/java/com/yidian/shenghuoquan/commodity/ui/coupon/CategorySearchActivity.kt
View file @
b07d125e
package
com.yidian.shenghuoquan.commodity.ui.coupon
package
com.yidian.shenghuoquan.commodity.ui.coupon
import
androidx.activity.viewModels
import
androidx.activity.viewModels
import
androidx.core.view.isVisible
import
com.yidian.common.XEventConfig
import
com.yidian.common.XEventConfig
import
com.yidian.common.extensions.initTitleBar
import
com.yidian.common.extensions.initTitleBar
import
com.yidian.common.mvvm.BaseMvvmActivity
import
com.yidian.common.mvvm.BaseMvvmActivity
...
@@ -45,8 +46,12 @@ class CategorySearchActivity : BaseMvvmActivity<CommodityActivityCategorySearchB
...
@@ -45,8 +46,12 @@ class CategorySearchActivity : BaseMvvmActivity<CommodityActivityCategorySearchB
})
})
vm
.
searchSuccessEvent
.
observe
(
this
,
{
vm
.
searchSuccessEvent
.
observe
(
this
,
{
if
(
it
.
isNullOrEmpty
())
{
if
(
it
.
isNullOrEmpty
())
{
binding
.
rvCategoryList
.
isVisible
=
false
binding
.
pvEmptyPage
.
isVisible
=
true
adapter
.
setList
(
null
)
adapter
.
setList
(
null
)
}
else
{
}
else
{
binding
.
rvCategoryList
.
isVisible
=
true
binding
.
pvEmptyPage
.
isVisible
=
false
adapter
.
setList
(
it
)
adapter
.
setList
(
it
)
}
}
})
})
...
...
Components/commodity/src/main/res/layout/commodity_activity_category_search.xml
View file @
b07d125e
...
@@ -89,11 +89,22 @@
...
@@ -89,11 +89,22 @@
<androidx.recyclerview.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_category_list"
android:id=
"@+id/rv_category_list"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"0dp"
android:layout_weight=
"1"
android:layoutAnimation=
"@null"
android:layoutAnimation=
"@null"
app:layoutManager=
"androidx.recyclerview.widget.LinearLayoutManager"
app:layoutManager=
"androidx.recyclerview.widget.LinearLayoutManager"
tools:itemCount=
"3"
tools:itemCount=
"3"
tools:listitem=
"@layout/commodity_layout_category_search_list_item"
/>
tools:listitem=
"@layout/commodity_layout_category_search_list_item"
/>
<com.yidian.common.widget.CommonEmptyPageView
android:id=
"@+id/pv_empty_page"
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
android:layout_weight=
"1"
android:visibility=
"gone"
app:CommonEmptyPageView_empty_content_text=
"@string/no_search_result"
app:CommonEmptyPageView_empty_tips_text=
"@string/click_search_again"
app:CommonEmptyPageView_place_holder_img=
"@drawable/img_empty_place_holder"
/>
</LinearLayout>
</LinearLayout>
</layout>
</layout>
\ No newline at end of file
Components/commodity/src/main/res/values/strings.xml
View file @
b07d125e
...
@@ -11,4 +11,6 @@
...
@@ -11,4 +11,6 @@
<string
name=
"publish_coupon"
>
发布优惠券
</string>
<string
name=
"publish_coupon"
>
发布优惠券
</string>
<string
name=
"no_coupons"
>
暂无优惠券
</string>
<string
name=
"no_coupons"
>
暂无优惠券
</string>
<string
name=
"click_post_coupon"
>
点击下方发布优惠券
</string>
<string
name=
"click_post_coupon"
>
点击下方发布优惠券
</string>
<string
name=
"no_search_result"
>
暂无搜索结果
</string>
<string
name=
"click_search_again"
>
请点击搜索框重新进行搜索
</string>
</resources>
</resources>
\ No newline at end of file
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/store/ChooseStoreActivity.kt
View file @
b07d125e
...
@@ -3,6 +3,7 @@ package com.yidian.shenghuoquan.newscontent.ui.store
...
@@ -3,6 +3,7 @@ package com.yidian.shenghuoquan.newscontent.ui.store
import
android.content.Intent
import
android.content.Intent
import
android.os.Bundle
import
android.os.Bundle
import
androidx.core.content.ContextCompat
import
androidx.core.content.ContextCompat
import
androidx.core.view.isVisible
import
com.yidian.common.XEventConfig
import
com.yidian.common.XEventConfig
import
com.yidian.common.XRouterPathConstants
import
com.yidian.common.XRouterPathConstants
import
com.yidian.common.base.BaseActivity
import
com.yidian.common.base.BaseActivity
...
@@ -50,6 +51,14 @@ class ChooseStoreActivity : BaseActivity<ActivityChooseStoreBinding>() {
...
@@ -50,6 +51,14 @@ class ChooseStoreActivity : BaseActivity<ActivityChooseStoreBinding>() {
val
requestParams
=
HashMap
<
String
,
String
?>()
val
requestParams
=
HashMap
<
String
,
String
?>()
requestParams
[
"life_account_id"
]
=
StorageUtil
.
getLifeAccountId
()
requestParams
[
"life_account_id"
]
=
StorageUtil
.
getLifeAccountId
()
ApiService
.
getShopList
(
requestParams
)
{
shopList
->
ApiService
.
getShopList
(
requestParams
)
{
shopList
->
if
(
shopList
.
isNullOrEmpty
())
{
viewBind
.
rvStore
.
isVisible
=
false
viewBind
.
pvEmptyPage
.
isVisible
=
true
return
@getShopList
}
else
{
viewBind
.
rvStore
.
isVisible
=
true
viewBind
.
pvEmptyPage
.
isVisible
=
false
}
// 勾选上次选中的门店的
// 勾选上次选中的门店的
if
(!
lastSelectStoreList
.
isNullOrEmpty
())
{
if
(!
lastSelectStoreList
.
isNullOrEmpty
())
{
shopList
.
forEach
{
shopListBean
->
shopList
.
forEach
{
shopListBean
->
...
...
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/store/StoreManagementActivity.kt
View file @
b07d125e
...
@@ -2,6 +2,7 @@ package com.yidian.shenghuoquan.newscontent.ui.store
...
@@ -2,6 +2,7 @@ package com.yidian.shenghuoquan.newscontent.ui.store
import
android.content.Intent
import
android.content.Intent
import
android.os.Bundle
import
android.os.Bundle
import
androidx.core.view.isVisible
import
androidx.recyclerview.widget.LinearLayoutManager
import
androidx.recyclerview.widget.LinearLayoutManager
import
com.yidian.common.XRouterPathConstants.Companion.STORE_MANAGEMENT
import
com.yidian.common.XRouterPathConstants.Companion.STORE_MANAGEMENT
import
com.yidian.common.base.BaseActivity
import
com.yidian.common.base.BaseActivity
...
@@ -46,6 +47,14 @@ class StoreManagementActivity : BaseActivity<ActivityStoreManagementBinding>() {
...
@@ -46,6 +47,14 @@ class StoreManagementActivity : BaseActivity<ActivityStoreManagementBinding>() {
val
requestParams
=
HashMap
<
String
,
String
?>()
val
requestParams
=
HashMap
<
String
,
String
?>()
requestParams
[
"life_account_id"
]
=
StorageUtil
.
getLifeAccountId
()
requestParams
[
"life_account_id"
]
=
StorageUtil
.
getLifeAccountId
()
ApiService
.
getShopList
(
requestParams
)
{
ApiService
.
getShopList
(
requestParams
)
{
if
(
it
.
isNullOrEmpty
())
{
viewBind
.
storeList
.
isVisible
=
false
viewBind
.
pvEmptyPage
.
isVisible
=
true
return
@getShopList
}
else
{
viewBind
.
storeList
.
isVisible
=
true
viewBind
.
pvEmptyPage
.
isVisible
=
false
}
adapter
.
setData
(
it
)
adapter
.
setData
(
it
)
}
}
}
}
...
...
Components/newscontent/src/main/res/layout/activity_choose_store.xml
View file @
b07d125e
...
@@ -27,6 +27,16 @@
...
@@ -27,6 +27,16 @@
tools:itemCount=
"9"
tools:itemCount=
"9"
tools:listitem=
"@layout/layout_choose_store_list_item"
/>
tools:listitem=
"@layout/layout_choose_store_list_item"
/>
<com.yidian.common.widget.CommonEmptyPageView
android:id=
"@+id/pv_empty_page"
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
android:layout_weight=
"1"
android:visibility=
"gone"
app:CommonEmptyPageView_empty_content_text=
"@string/no_stores"
app:CommonEmptyPageView_empty_tips_text=
"@string/click_top_right_add_store"
app:CommonEmptyPageView_place_holder_img=
"@drawable/img_empty_place_holder"
/>
<LinearLayout
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"64dp"
android:layout_height=
"64dp"
...
...
Components/newscontent/src/main/res/layout/activity_store_management.xml
View file @
b07d125e
...
@@ -21,6 +21,16 @@
...
@@ -21,6 +21,16 @@
android:layout_weight=
"1"
android:layout_weight=
"1"
tools:listitem=
"@layout/store_management_item"
/>
tools:listitem=
"@layout/store_management_item"
/>
<com.yidian.common.widget.CommonEmptyPageView
android:id=
"@+id/pv_empty_page"
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
android:layout_weight=
"1"
android:visibility=
"gone"
app:CommonEmptyPageView_empty_content_text=
"@string/no_stores"
app:CommonEmptyPageView_empty_tips_text=
"@string/click_below_add_store"
app:CommonEmptyPageView_place_holder_img=
"@drawable/img_empty_place_holder"
/>
<LinearLayout
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp64"
android:layout_height=
"@dimen/dp64"
...
...
Components/newscontent/src/main/res/values/strings.xml
View file @
b07d125e
...
@@ -177,5 +177,8 @@
...
@@ -177,5 +177,8 @@
<string
name=
"login_again"
>
重新登录
</string>
<string
name=
"login_again"
>
重新登录
</string>
<string
name=
"no_life_account"
>
当前无生活号,请重新登录
</string>
<string
name=
"no_life_account"
>
当前无生活号,请重新登录
</string>
<string
name=
"logout"
>
退出登录
</string>
<string
name=
"logout"
>
退出登录
</string>
<string
name=
"no_stores"
>
暂无门店
</string>
<string
name=
"click_below_add_store"
>
请点击下方新增门店
</string>
<string
name=
"click_top_right_add_store"
>
请点击右上角新增门店
</string>
</resources>
</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