UI

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/fragment/InventoryAddFragment.java

@@ -38,9 +38,7 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
     private List<Sssku> topCsList = new ArrayList<>();
     private InventoryGoodsAdapter mInventoryGoodsAdapter;
     private CsCartDialog mCartDialog = new CsCartDialog();
-    private Drawable drawable;
-    private RecyclerViewUtil.ListCardItemDecoration emptyItemDecoration;
-    private RecyclerViewUtil.ListCardItemDecoration listItemDecoration;
+
     /**
      * 当前购物车信息
      */
@@ -56,9 +54,7 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
 
     @Override
     public void initView() {
-        drawable = getResources().getDrawable(R.drawable.singleline_zhouyu_huanggai);
-        emptyItemDecoration = new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 50, drawable, 1);
-        listItemDecoration = new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 50, drawable, 0);
+
         initRecycler();
         mViewBinding.setCartCount(0);
         mViewBinding.icTitle.edTitle.setVisibility(View.GONE);
@@ -114,20 +110,21 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
         mInventoryGoodsAdapter = new InventoryGoodsAdapter(topCsList);
         mInventoryGoodsAdapter.setEmptyView(getEmptyView());
         mInventoryGoodsAdapter.setOnItemLongClickListener((adapter, view, position) -> {
-            PromptDialog delDialog = new PromptDialog();
-            delDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "是否删除").setClick(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    adapter.getData().remove(position);
-                    adapter.notifyDataSetChanged();
-                    delDialog.dismiss();
-                }
-            }, new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    delDialog.dismiss();
-                }
+            if (bottomCsList.size() == 0) {
+                mPresenter.cancelInventoryAdd(mCs);
+            } else {
+                PromptDialog promptDialog = new PromptDialog();
+                promptDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "退出前是否删除本次盘库记录").setClick(view1 -> {
+                    mPresenter.cancelInventoryAdd(mCs);
+                    promptDialog.dismiss();
+
+                }, view1 -> {
+                    promptDialog.dismiss();
+                    pop();
+
                 }).setCancelables(false).show((BaseActivity) mContext);
+            }
+
             return false;
         });
         mInventoryGoodsAdapter.setOnItemChildClickListener((adapter, view, position) -> {
@@ -146,10 +143,8 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
             }
 
         });
-        Drawable drawable = getResources().getDrawable(R.drawable.singleline_zhouyu_huanggai);
-        mViewBinding.recyclerView.addItemDecoration(new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 50, drawable));
+
         mViewBinding.recyclerView.setAdapter(mInventoryGoodsAdapter);
-        mViewBinding.recyclerView.addItemDecoration(emptyItemDecoration);
 
     }
 
@@ -166,9 +161,14 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
                 }
             }
         }
-        mInventoryGoodsAdapter.notifyDataSetChanged();
+
+        updateRecycler();
     }
 
+    private void updateRecycler() {
+
+        mInventoryGoodsAdapter.notifyDataSetChanged();
+    }
 
     public void addInventoryGoodsItem(Sssku sssku) {
         if (!topCsList.contains(sssku)) {
@@ -183,7 +183,7 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
 
         }
 
-        mInventoryGoodsAdapter.notifyDataSetChanged();
+        updateRecycler();
     }
 
     public void addInventoryDetailItem(CsDetail csDetail, Sssku sssku) {
@@ -219,6 +219,9 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
 
     @Override
     public boolean onBackPressedSupport() {
+        if (bottomCsList.size() == 0) {
+            mPresenter.cancelInventoryAdd(mCs);
+        } else {
             PromptDialog promptDialog = new PromptDialog();
             promptDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "退出前是否删除本次盘库记录").setClick(view1 -> {
                 mPresenter.cancelInventoryAdd(mCs);
@@ -229,6 +232,8 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
                 pop();
 
             }).setCancelables(false).show((BaseActivity) mContext);
+        }
+
         return true;
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/manage/otherselect/fragment/OtherListFragment.java

@@ -34,7 +34,6 @@ import java.util.List;
 public class OtherListFragment extends BaseFragment<OtherSelectPresenter, FragmentOtherListBinding> {
     private OtherSelectAdapter mOtherSelectAdapter;
     private Drawable drawable;
-    private RecyclerViewUtil.ListCardItemDecoration emptyItemDecoration;
     private RecyclerViewUtil.ListCardItemDecoration listItemDecoration;
 
 
@@ -46,13 +45,12 @@ public class OtherListFragment extends BaseFragment<OtherSelectPresenter, Fragme
     @Override
     public void initView() {
         drawable = getResources().getDrawable(R.drawable.singleline_zhouyu_huanggai);
-        emptyItemDecoration = new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 50, drawable, 1);
         listItemDecoration = new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 50, drawable, 0);
         mOtherSelectAdapter = new OtherSelectAdapter(new ArrayList<>());
         mOtherSelectAdapter.setEmptyView(getEmptyView(R.string.empty_other_select));
         mViewBinding.recyclerOtherSelcet.setLayoutManager(new LinearLayoutManager(getActivity()));
         mViewBinding.recyclerOtherSelcet.setAdapter(mOtherSelectAdapter);
-        mViewBinding.recyclerOtherSelcet.addItemDecoration(emptyItemDecoration);
+
 
 //        mOtherSelectAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
 //            @Override
@@ -90,13 +88,10 @@ public class OtherListFragment extends BaseFragment<OtherSelectPresenter, Fragme
             mOtherSelectAdapter.setNewData(pager.getList());
             if (pager.getList().size() == 0) {
                 mViewBinding.recyclerOtherSelcet.removeItemDecoration(listItemDecoration);
-                mViewBinding.recyclerOtherSelcet.removeItemDecoration(emptyItemDecoration);
-                mViewBinding.recyclerOtherSelcet.addItemDecoration(emptyItemDecoration);
                 mViewBinding.recyclerOtherSelcet.invalidateItemDecorations();
 
             } else {
                 mViewBinding.recyclerOtherSelcet.removeItemDecoration(listItemDecoration);
-                mViewBinding.recyclerOtherSelcet.removeItemDecoration(emptyItemDecoration);
                 mViewBinding.recyclerOtherSelcet.addItemDecoration(listItemDecoration);
                 mViewBinding.recyclerOtherSelcet.invalidateItemDecorations();
             }

app/src/main/res/layout/dialog_base.xml

@@ -6,17 +6,18 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/lyt_main_bg"
         android:orientation="vertical">
 
+
         <TextView
             android:id="@+id/tv_title"
             style="@style/dialog_title"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/all_line_width"
-            android:background="@color/gray_kongming" />
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/all_padding" />
+
+
         <ViewStub
             android:id="@+id/vs_center"
             android:layout_width="match_parent"

app/src/main/res/layout/item_inventory_goods.xml

@@ -6,7 +6,15 @@
     <data>
     </data>
 
-
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/all_bounced_padding"
+        android:background="@drawable/singleline_zhouyu_huanggai"
+        />
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -206,6 +214,6 @@
             app:layout_constraintTop_toTopOf="@id/linearLayout" />
 
     </android.support.constraint.ConstraintLayout>
-
+</LinearLayout>
 
 </layout>
\ No newline at end of file

app/src/main/res/values/strings.xml

@@ -483,7 +483,7 @@
     <!-- 菜单POS -->
     <string name="menu_cashier">收银</string>
     <string name="menu_service">服务</string>
-    <string name="menu_myself">个人</string>
+    <string name="menu_myself">我的</string>
     <string name="menu_billing">开单</string>
     <string name="menu_receivables">收款</string>
     <string name="menu_vip">会员</string>