Merge branch 'dev_commodity' of...

Merge branch 'dev_commodity' of https://git.yidian-inc.com:8021/bp/ShenghuoquanBusiness into dev_commodity

Components/commodity/src/main/java/com/yidian/shenghuoquan/commodity/ui/coupon/CategorySearchActivity.kt

 package com.yidian.shenghuoquan.commodity.ui.coupon
 
 import androidx.activity.viewModels
+import androidx.core.view.isVisible
 import com.yidian.common.XEventConfig
 import com.yidian.common.extensions.initTitleBar
 import com.yidian.common.mvvm.BaseMvvmActivity
@@ -45,8 +46,12 @@ class CategorySearchActivity : BaseMvvmActivity<CommodityActivityCategorySearchB
     })
     vm.searchSuccessEvent.observe(this, {
       if (it.isNullOrEmpty()) {
+        binding.rvCategoryList.isVisible = false
+        binding.pvEmptyPage.isVisible = true
         adapter.setList(null)
       } else {
+        binding.rvCategoryList.isVisible = true
+        binding.pvEmptyPage.isVisible = false
         adapter.setList(it)
       }
     })

Components/commodity/src/main/res/layout/commodity_activity_category_search.xml

@@ -89,11 +89,22 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_category_list"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
             android:layoutAnimation="@null"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             tools:itemCount="3"
             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>
 </layout>
\ No newline at end of file

Components/commodity/src/main/res/values/strings.xml

@@ -11,4 +11,6 @@
     <string name="publish_coupon">发布优惠券</string>
     <string name="no_coupons">暂无优惠券</string>
     <string name="click_post_coupon">点击下方发布优惠券</string>
+    <string name="no_search_result">暂无搜索结果</string>
+    <string name="click_search_again">请点击搜索框重新进行搜索</string>
 </resources>
\ No newline at end of file

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/store/ChooseStoreActivity.kt

@@ -3,6 +3,7 @@ package com.yidian.shenghuoquan.newscontent.ui.store
 import android.content.Intent
 import android.os.Bundle
 import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
 import com.yidian.common.XEventConfig
 import com.yidian.common.XRouterPathConstants
 import com.yidian.common.base.BaseActivity
@@ -54,6 +55,14 @@ class ChooseStoreActivity : BaseActivity<ActivityChooseStoreBinding>() {
     val requestParams = HashMap<String, String?>()
     requestParams["life_account_id"] = StorageUtil.getLifeAccountId()
     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()) {
         shopList.forEach { shopListBean ->

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/store/StoreManagementActivity.kt

@@ -2,6 +2,7 @@ package com.yidian.shenghuoquan.newscontent.ui.store
 
 import android.content.Intent
 import android.os.Bundle
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.yidian.common.XRouterPathConstants.Companion.STORE_MANAGEMENT
 import com.yidian.common.base.BaseActivity
@@ -46,6 +47,14 @@ class StoreManagementActivity : BaseActivity<ActivityStoreManagementBinding>() {
     val requestParams = HashMap<String, String?>()
     requestParams["life_account_id"] = StorageUtil.getLifeAccountId()
     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)
     }
   }

Components/newscontent/src/main/res/layout/activity_choose_store.xml

@@ -27,6 +27,16 @@
         tools:itemCount="9"
         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
         android:layout_width="match_parent"
         android:layout_height="64dp"

Components/newscontent/src/main/res/layout/activity_store_management.xml

@@ -21,6 +21,16 @@
         android:layout_weight="1"
         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
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp64"

Components/newscontent/src/main/res/values/strings.xml

@@ -177,5 +177,8 @@
     <string name="login_again">重新登录</string>
     <string name="no_life_account">当前无生活号，请重新登录</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>
\ No newline at end of file