提交页面修改;

app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuActivity.java

@@ -145,7 +145,6 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
                 this.showTitleBarByTitleMode(C.TITLE_MODE.SKU_EDITOR);
                 mViewBinding.tvEditorHint.setText("已有");
                 mViewBinding.tvEditorHint.setBackgroundResource(R.drawable.shape_orange_r1);
-
                 mViewBinding.tvTitle.setText(R.string.sssku_add);
                 this.start(mEditorFragment.setSssku(sku).setEditMode(C.SKU_EDITOR_MODE.ADD));
                 break;

app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuPresenter.java

@@ -226,7 +226,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                             if (sssku1.getSkuGrpId().longValue() == mSkuGrpId || mSkuGrpId == 0L) {
                                 mView.updateSku(sssku1);
                             } else {
-                                mView.deleteSku(sssku1.getSkuId());
+                                mView.deleteSku(sssku1.getId());
                             }
                         }, throwable -> mView.showMsg(throwable.getMessage()));
                 break;

app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/fragment/ManagerFragment.java

@@ -5,6 +5,7 @@ import android.annotation.SuppressLint;
 import android.support.v4.app.ActivityCompat;
 import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
+import android.widget.TextView;
 
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
@@ -60,6 +61,7 @@ public class ManagerFragment extends BaseFragment<SsskuPresenter, FragmentSsskuM
 
         // set empty
         @SuppressLint("InflateParams") View view = getLayoutInflater().inflate(R.layout.view_empty, null);
+        ((TextView) view.findViewById(R.id.tv_empty)).setText(R.string.sku_empty_hint);
         mSkuAdapter.setEmptyView(view);
         mSkuAdapter.isUseEmpty(false);
 
@@ -80,7 +82,7 @@ public class ManagerFragment extends BaseFragment<SsskuPresenter, FragmentSsskuM
             mViewBinding.srlSku.setRefreshing(false);
             mSkuAdapter.setNewData(skus);
         } else if (skus.size() > 0) mSkuAdapter.addData(skus);
-        if (skus.size() < C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(isRefresh);
+        if (skus.size() <= C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(false);
         else mSkuAdapter.loadMoreComplete();
     }
 
@@ -154,7 +156,7 @@ public class ManagerFragment extends BaseFragment<SsskuPresenter, FragmentSsskuM
      */
     public void updateSku(Sssku sssku) {
         for (int i = 0; i < mSkuAdapter.getData().size(); i++) {
-            if (mSkuAdapter.getData().get(i).getSkuId().longValue() == sssku.getSkuId().longValue()) {
+            if (mSkuAdapter.getData().get(i).getId().longValue() == sssku.getSkuId().longValue()) {
                 mSkuAdapter.setData(i, sssku);
                 return;
             }
@@ -168,7 +170,7 @@ public class ManagerFragment extends BaseFragment<SsskuPresenter, FragmentSsskuM
      */
     public void deleteSku(Long skuId) {
         for (int i = 0; i < mSkuAdapter.getData().size(); i++) {
-            if (mSkuAdapter.getData().get(i).getSkuId().longValue() == skuId) {
+            if (mSkuAdapter.getData().get(i).getId().longValue() == skuId) {
                 mSkuAdapter.remove(i);
                 return;
             }

app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/fragment/SearchFragment.java

@@ -71,7 +71,7 @@ public class SearchFragment extends BaseFragment<SsskuPresenter, FragmentSsskuSe
             mSkuAdapter.setEnableLoadMore(true);
             mSkuAdapter.setNewData(skus);
         } else if (skus.size() > 0) mSkuAdapter.addData(skus);
-        if (skus.size() < C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(isRefresh);
+        if (skus.size() <= C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(isRefresh);
         else mSkuAdapter.loadMoreComplete();
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/ManagerFragment.java

@@ -56,7 +56,7 @@ public class ManagerFragment extends BaseFragment<MsPresenter, FragmentMsManager
             mViewBinding.srlMs.setRefreshing(false);
             mMsAdapter.setNewData(mss);
         } else if (mss.size() > 0) mMsAdapter.addData(mss);
-        if (mss.size() < C.PRODUCT.PAGE_SIZE) mMsAdapter.loadMoreEnd(isRefresh);
+        if (mss.size() <= C.PRODUCT.PAGE_SIZE) mMsAdapter.loadMoreEnd(isRefresh);
         else mMsAdapter.loadMoreComplete();
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/SearchFragment.java

@@ -69,7 +69,7 @@ public class SearchFragment<Sku extends BaseSku> extends BaseFragment<MsPresente
             mSkuAdapter.setEnableLoadMore(true);
             mSkuAdapter.setNewData(skus);
         } else if (skus.size() > 0) mSkuAdapter.addData(skus);
-        if (skus.size() < C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(isRefresh);
+        if (skus.size() <= C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(isRefresh);
         else mSkuAdapter.loadMoreComplete();
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/view/TypeMoneyOffView.java

@@ -2,6 +2,8 @@ package com.xingdata.zzdpos.ui.marketing.ms.view;
 
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.view.View;
+import android.widget.EditText;
 
 import com.blankj.utilcode.util.StringUtils;
 import com.xingdata.zzdpos.C;
@@ -11,11 +13,27 @@ import com.xingdata.zzdpos.model.Ms;
 import com.xingdata.zzdpos.util.ConvertUtil;
 import com.xingdata.zzdpos.util.InputFilters;
 
+
 /**
  * 满减返现页面
  */
 public class TypeMoneyOffView extends BaseTypeView<ViewTypeMoneyOffBinding> {
 
+    private View.OnFocusChangeListener mOnFocusChangeListener;
+
+    public TypeMoneyOffView() {
+        mOnFocusChangeListener = (view, b) -> {
+            if (view instanceof EditText) {
+                EditText editText = (EditText) view;
+                if (b && editText.getText().toString().equals("0.00")) {
+                    editText.setText("");
+                } else if (!b && editText.getText().length() == 0) {
+                    editText.setText("0.00");
+                }
+            }
+        };
+    }
+
     @Override
     public int getLayoutId() {
         return R.layout.view_type_money_off;
@@ -44,7 +62,6 @@ public class TypeMoneyOffView extends BaseTypeView<ViewTypeMoneyOffBinding> {
                 }
             }
         });
-
         mViewBinding.etDisAmt.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
@@ -62,6 +79,9 @@ public class TypeMoneyOffView extends BaseTypeView<ViewTypeMoneyOffBinding> {
                 }
             }
         });
+
+        mViewBinding.etAmt.setOnFocusChangeListener(mOnFocusChangeListener);
+        mViewBinding.etDisAmt.setOnFocusChangeListener(mOnFocusChangeListener);
     }
 
     @Override
@@ -77,11 +97,13 @@ public class TypeMoneyOffView extends BaseTypeView<ViewTypeMoneyOffBinding> {
 
         String strAmt = mViewBinding.etAmt.getText().toString();
         if (StringUtils.isEmpty(strAmt)) return false;
+        if (ConvertUtil.yuanToFen(strAmt) <= 0) return false;
         ms.setPayAmt(ConvertUtil.yuanToFen(strAmt));
 
         String strDisAmt = mViewBinding.etDisAmt.getText().toString();
         if (StringUtils.isEmpty(strDisAmt)) return false;
         if (ConvertUtil.yuanToFen(strDisAmt) > ConvertUtil.yuanToFen(strAmt)) return false;
+        if (ConvertUtil.yuanToFen(strDisAmt) <= 0) return false;
         ms.setGiftOffAmt(ConvertUtil.yuanToFen(strDisAmt));
 
         return true;

app/src/main/java/com/xingdata/zzdpos/ui/scan/ScanFragment.java

@@ -57,14 +57,12 @@ public class ScanFragment<P extends BasePresenter> extends BaseFragment<P, Fragm
                 return new ScanFragment.CustomViewFinderView(context);
             }
         };
-
         mResultHandler = result -> {
             if (mOnScanCompletedListener != null) {
                 mOnScanCompletedListener.onScanCompleted(result.getText());
             }
             resetScanner();
         };
-
         mScannerView.setResultHandler(mResultHandler);
         mViewBinding.contentFrame.addView(mScannerView);
     }

app/src/main/java/com/xingdata/zzdpos/ui/store/fragment/SearchFragment.java

@@ -87,7 +87,7 @@ public class SearchFragment extends BaseFragment<StorePresenter, FragmentStoreSe
             mSkuAdapter.setEnableLoadMore(true);
             mSkuAdapter.setNewData(skus);
         } else if (skus.size() > 0) mSkuAdapter.addData(skus);
-        if (skus.size() < C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(isRefresh);
+        if (skus.size() <= C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(isRefresh);
         else mSkuAdapter.loadMoreComplete();
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/store/fragment/StoreFragment.java

@@ -76,6 +76,9 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin
         mSkuAdapter.setEmptyView(emptyView);
         mSkuAdapter.isUseEmpty(false);
 
+
+
+
         // init data
         mPresenter.initStore();
     }
@@ -215,7 +218,7 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin
             mViewBinding.srlSku.setRefreshing(false);
             mSkuAdapter.setNewData(skus);
         } else if (skus.size() > 0) mSkuAdapter.addData(skus);
-        if (skus.size() < C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(false);
+        if (skus.size() <= C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(false);
         else mSkuAdapter.loadMoreComplete();
     }
 

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

@@ -28,8 +28,8 @@
                 style="@style/searchBarEditor"
                 android:layout_width="match_parent"
                 android:gravity="center_vertical"
-                android:textColor="@color/black_likui"
-                android:text="@string/store_search_hint" />
+                android:text="@string/store_search_hint"
+                android:textColor="@color/black_likui" />
         </LinearLayout>
 
         <View
@@ -45,7 +45,8 @@
             android:gravity="center_vertical"
             android:orientation="horizontal"
             android:paddingBottom="@dimen/all_margin"
-            android:paddingTop="@dimen/all_margin">
+            android:paddingTop="@dimen/all_margin"
+            android:visibility="gone">
 
             <LinearLayout
                 android:layout_width="0dp"

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

@@ -49,7 +49,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/all_margin"
-            android:background="@drawable/shape_gray_r1"
+            android:background="@drawable/shape_black_b2"
             android:padding="@dimen/all_spacing"
             android:text="@{@string/sku_size+spuUnitName}"
             android:textSize="@dimen/all_caption_size"

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

@@ -59,7 +59,13 @@
             android:layout_height="?attr/actionBarSize"
             android:gravity="center_vertical"
             android:paddingEnd="@dimen/all_margin"
-            android:paddingStart="@dimen/all_margin">
+            android:paddingStart="@null">
+
+            <ImageView
+                android:layout_width="@dimen/all_margin"
+                android:layout_height="wrap_content"
+                android:contentDescription="@null"
+                android:src="@mipmap/point" />
 
             <TextView
                 android:layout_width="wrap_content"

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

@@ -730,5 +730,8 @@
     <string name="sku_update_vip">调整会员</string>
 
     <string name="sku_name_hint">请输入商品名称</string>
+    <string name="sku_empty_hint">没有找到对应商品~</string>
+
+
 
 </resources>