소스 검색

EmptyView

詹子聪 5 년 전
부모
커밋
1e6d9fb0a6

+ 3 - 3
app/src/main/java/com/itant/shibei/tool/DataTool.java

@@ -69,15 +69,15 @@ public class DataTool {
         goodsBean.description = "远程教育,在家办公,顺畅不卡顿!酷睿i7-8550U处理器、256GSSD,8G内存,便携电脑移动办公更强性能购买PN61-i7,高效稳定";
         goodsBean.reason = "小巧便携且高效稳定";
         goodsBean.oldPrice = 389900;
-        goodsBean.nowPrice = 384900;
-        goodsBean.rebate = 50;
+        goodsBean.nowPrice = 384050;
+        goodsBean.rebate = 5850;
         goodsBean.shopName = "华硕京东自营旗舰店";
         goodsBean.province = "广东";
         goodsBean.isSelfBusiness = true;
         goodsBean.hasCoupon = true;
         goodsBean.couponInfo = "30";
         goodsBean.goodsType = GoodsBean.TYPE_TECHNOLOGY;
-        goodsBean.goodsUrl = "https://union-click.jd.com/jdc?e=&p=AyIGZRtcEgAXA1QfWhIyEgZUGlocChIFVBJeJUZNXwtEa0xHV0YXEEULWldTCQQHCllHGAdFBwtEQkQBBRxNVlQYBUkeTVxNCRNLGEF6RwtVGloUAxsPVRlaHAciVR1hWBNYZl42cCVPUVF6V1skdFxJZ1kXaxQyEgZUGFMcBREAUitrFQUiVDtADnsGQQBWH1JHCxMCUksOJQMiB1ETXhYKGwFdHVsQByIAVRJrU1dTWhNNBEtnbFMSRQYlMiIEZStrFTIRNxd1WBYLFVcAEg8dUkcFUE9THAsbBl0aWRBSFwIFTl8VChI3VxpaEQs%3D";
+        goodsBean.goodsUrl = "https://union-click.jd.com/jdc?e=&p=AyIGZRtcEgAXA1QfWhIyEgZUGlocChIFVBJeJUZNXwtEa0xHV0YXEEULWldTCQQHCllHGAdFBwtEQkQBBRxNVlQYBUkeTVxNCRNLGEF6RwtVGloUAxsPVRlaHAciQAd%2BM10Lalg3c1h0YnF5E10LRUFJd1kXaxQyEgZUGFMcBREAUitrFQUiVDtADnsGQQBWH1JHCxMCUksOJQMiB1ETXRUKGw9RGlIQCiIAVRJrU1dTWhNNBEtnbFMSRQYlMiIEZStrFTIRNxd1Wx0AFAECSAtAUkFUUBNfEFISAQEbU0UCFgddS1scAxs3VxpaEQs%3D";
         goodsBean.salesPerMonth = 1022;
         goodsBean.goodCommentPercent = 0.98d;
         goodsBean.isLocal = true;

+ 1 - 1
app/src/main/java/com/itant/shibei/ui/TabActivity.java

@@ -16,8 +16,8 @@ import com.itant.shibei.base.ITopActionListener;
 import com.itant.shibei.manager.UserInfoManager;
 import com.itant.shibei.ui.function.FunctionFragment;
 import com.itant.shibei.ui.home.about.AboutFragment;
+import com.itant.shibei.ui.home.coupon.TemplateFragment;
 import com.itant.shibei.ui.home.goods.GoodsFragment;
-import com.itant.shibei.ui.home.template.TemplateFragment;
 import com.itant.shibei.ui.mine.MineActivity;
 import com.itant.shibei.ui.mine.login.LoginActivity;
 import com.itant.shibei.widget.AppbarTranslateListener;

+ 1 - 1
app/src/main/java/com/itant/shibei/ui/function/FunctionFragment.java

@@ -11,7 +11,7 @@ import androidx.viewpager.widget.ViewPager;
 
 import com.flyco.tablayout.SlidingTabLayout;
 import com.itant.shibei.R;
-import com.itant.shibei.ui.home.template.TemplateFragment;
+import com.itant.shibei.ui.home.coupon.TemplateFragment;
 import com.miekir.common.adapter.TabFragmentAdapter;
 
 import java.util.ArrayList;

+ 1 - 1
app/src/main/java/com/itant/shibei/ui/home/template/ITemplateView.java

@@ -1,4 +1,4 @@
-package com.itant.shibei.ui.home.template;
+package com.itant.shibei.ui.home.coupon;
 
 import com.miekir.mvp.view.IView;
 

+ 1 - 1
app/src/main/java/com/itant/shibei/ui/home/template/TemplateAdapter.java

@@ -1,4 +1,4 @@
-package com.itant.shibei.ui.home.template;
+package com.itant.shibei.ui.home.coupon;
 
 import android.app.Activity;
 import android.content.Context;

+ 5 - 12
app/src/main/java/com/itant/shibei/ui/home/template/TemplateFragment.java

@@ -1,10 +1,8 @@
-package com.itant.shibei.ui.home.template;
+package com.itant.shibei.ui.home.coupon;
 
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.View;
-import android.widget.ImageView;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
@@ -52,8 +50,7 @@ public class TemplateFragment extends BaseMVPFragment implements ITemplateView<C
     private int mCurrentPage = PAGE_START;
     /**是否下拉获取数据*/
     private boolean mIsRefresh = true;
-    private ImageView iv_empty;
-    
+
     public TemplateFragment(int templateType) {
         mTemplateType = templateType;
     }
@@ -67,7 +64,6 @@ public class TemplateFragment extends BaseMVPFragment implements ITemplateView<C
     public void onCreateViewFinished(@Nullable Bundle savedInstanceState) {
         super.onCreateViewFinished(savedInstanceState);
 
-        iv_empty = rootView.findViewById(R.id.iv_empty);
         rv_template = rootView.findViewById(R.id.rv_template);
         // 必须要设置LayoutManager,否则RecyclerView不知道要使用什么布局,从而在界面上不显示
         LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false);
@@ -81,6 +77,9 @@ public class TemplateFragment extends BaseMVPFragment implements ITemplateView<C
         mAdapter = new TemplateAdapter(getActivity(), mCouponBeanList);
         mAdapter.setCouponLongClickListener(this::showAdminDialog);
         rv_template.setAdapter(mAdapter);
+        // 必须先绑定RecyclerView
+        mAdapter.setEmptyView(R.layout.view_empty, rv_template);
+
         // 不要滑动一段距离
         rv_template.smoothScrollToPosition(0);
         srl_template = rootView.findViewById(R.id.srl_template);
@@ -197,12 +196,6 @@ public class TemplateFragment extends BaseMVPFragment implements ITemplateView<C
         if (couponBeanList != null && couponBeanList.size() > 0) {
             mCurrentPage++;
         }
-
-        if (mCouponBeanList.size() == 0) {
-            iv_empty.setVisibility(View.VISIBLE);
-        } else {
-            iv_empty.setVisibility(View.GONE);
-        }
     }
 
     /**

+ 1 - 1
app/src/main/java/com/itant/shibei/ui/home/template/TemplatePresenter.java

@@ -1,4 +1,4 @@
-package com.itant.shibei.ui.home.template;
+package com.itant.shibei.ui.home.coupon;
 
 import android.text.TextUtils;
 

+ 45 - 0
app/src/main/res/layout/activity_search.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--搜索栏-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/colorPrimary"
+    android:paddingStart="@dimen/margin_s"
+    android:paddingTop="@dimen/margin_ss"
+    android:paddingEnd="@dimen/margin_s"
+    android:paddingBottom="@dimen/margin_ss">
+
+    <androidx.cardview.widget.CardView
+        app:cardCornerRadius="@dimen/height_indicator"
+        app:cardElevation="@dimen/margin_sss"
+        app:cardUseCompatPadding="true"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clickable="true"
+        android:focusable="true"
+        android:foreground="?android:attr/selectableItemBackground">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/height_edit_text"
+            android:gravity="center_vertical"
+            android:paddingStart="@dimen/margin_s"
+            android:paddingEnd="@dimen/margin_s">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="搜索商品"
+                android:textColor="@color/gray_hint"
+                android:textSize="@dimen/text_normal_p" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_search"
+                android:tint="@color/gray_text_2" />
+        </LinearLayout>
+    </androidx.cardview.widget.CardView>
+</FrameLayout>

+ 0 - 10
app/src/main/res/layout/fragment_function_template.xml

@@ -16,14 +16,4 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"/>
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
-    <ImageView
-        android:id="@+id/iv_empty"
-        android:layout_width="@dimen/size_image_big"
-        android:layout_height="@dimen/size_image_big"
-        android:scaleType="fitXY"
-        android:src="@mipmap/logo_gray"
-        android:layout_gravity="center"
-        android:tint="@color/gray_text_hint"
-        android:visibility="gone"/>
 </LinearLayout>

+ 15 - 0
app/src/main/res/layout/view_empty.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--搜索栏-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/iv_empty"
+        android:layout_width="@dimen/size_image_big"
+        android:layout_height="@dimen/size_image_big"
+        android:scaleType="fitXY"
+        android:src="@mipmap/logo_gray"
+        android:layout_gravity="center"
+        android:tint="@color/gray_text_hint"/>
+</FrameLayout>

+ 8 - 4
app/src/main/res/layout/view_search.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--搜索栏-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -8,7 +8,10 @@
     android:paddingStart="@dimen/margin_s"
     android:paddingTop="@dimen/margin_ss"
     android:paddingEnd="@dimen/margin_s"
-    android:paddingBottom="@dimen/margin_ss">
+    android:paddingBottom="@dimen/margin_ss"
+    android:orientation="vertical">
+
+    <include layout="@layout/view_toolbar"/>
 
     <androidx.cardview.widget.CardView
         app:cardCornerRadius="@dimen/height_indicator"
@@ -39,7 +42,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:src="@drawable/ic_search"
-                android:tint="@color/gray_text_2" />
+                android:tint="@color/gray_text_2"
+                android:visibility="gone"/>
         </LinearLayout>
     </androidx.cardview.widget.CardView>
-</FrameLayout>
+</LinearLayout>

+ 1 - 1
app/src/main/res/navigation/mobile_navigation.xml

@@ -13,7 +13,7 @@
 
     <fragment
         android:id="@+id/nav_template"
-        android:name="com.itant.shibei.ui.home.template.TemplateFragment"
+        android:name="com.itant.shibei.ui.home.coupon.TemplateFragment"
         android:label="@string/title_function"
         tools:layout="@layout/fragment_function_template" />