Merge branch 'master' of 192.168.254.154:w525721508/TangKuPos

app/src/main/java/com/xingdata/zzdpos/model/Ossku.java

@@ -566,7 +566,7 @@ public class Ossku implements BaseBean {
     }
 
     public String getSpuImg() {
-        if (spuImg.contains("ngoods.png")) return "";
+        if (spuImg !=null && spuImg.contains("ngoods.png")) return "";
         return spuImg;
     }
 

app/src/main/java/com/xingdata/zzdpos/model/Saledetail.java

@@ -676,7 +676,7 @@ public class Saledetail implements BaseModel, BaseBean, BaseGoodPrint {
 
 
     public String getSpuImg() {
-        if (spuImg.contains("ngoods.png")) return "";
+        if (spuImg !=null && spuImg.contains("ngoods.png")) return "";
         return spuImg;
     }
 

app/src/main/java/com/xingdata/zzdpos/model/Sspr.java

@@ -138,7 +138,7 @@ public class Sspr extends RealmObject implements BaseModel, BaseBean {
     }
 
     public String getSpuImg() {
-        if (spuImg.contains("ngoods.png")) return "";
+        if (spuImg !=null && spuImg.contains("ngoods.png")) return "";
         return spuImg;
     }
 

app/src/main/java/com/xingdata/zzdpos/model/Sssku.java

@@ -463,7 +463,7 @@ public class Sssku extends RealmObject implements BaseModel, BaseBean, BaseSku,
     }
 
     public String getSpuImg() {
-        if (spuImg.contains("ngoods.png")) return "";
+        if (spuImg != null && spuImg.contains("ngoods.png")) return "";
         return spuImg;
     }
 

app/src/main/java/com/xingdata/zzdpos/model/Ussku.java

@@ -290,7 +290,7 @@ public class Ussku extends RealmObject implements BaseModel, BaseBean, BaseSku {
     }
 
     public String getSpuImg() {
-        if (spuImg.contains("ngoods.png")) return "";
+        if (spuImg !=null && spuImg.contains("ngoods.png")) return "";
         return spuImg;
     }
 

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

@@ -128,7 +128,16 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
         mViewBinding.etSearch.requestFocus();
         KeyboardUtils.showSoftInput(mViewBinding.etSearch);
         this.showTitleBarByTitleMode(searchType);
-        this.start(mSearchFragment.setSearchType(searchType));
+        this.start(mSearchFragment.setKeyword("").setSearchType(searchType));
+    }
+
+    @Override
+    public void showSearchFragment(String keyword, int searchType) {
+        if (mSearchFragment.isAdded()) return;
+        mViewBinding.etSearch.requestFocus();
+        KeyboardUtils.showSoftInput(mViewBinding.etSearch);
+        this.showTitleBarByTitleMode(searchType);
+        this.start(mSearchFragment.setKeyword(keyword).setSearchType(searchType));
     }
 
     @Override

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

@@ -85,9 +85,19 @@ public interface SsskuContract {
 
         /**
          * 显示搜索页面
+         *
+         * @param searchType 搜索类型
          */
         void showSearchFragment(int searchType);
 
+        /**
+         * 显示搜索页面
+         *
+         * @param keyword    预设关键字
+         * @param searchType 搜索类型
+         */
+        void showSearchFragment(String keyword, int searchType);
+
         /**
          * 显示添加检查页面
          */

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

@@ -30,6 +30,7 @@ public class AddFragment extends BaseFragment<SsskuPresenter, FragmentSsskuAddBi
     public void initView() {
 
         mViewBinding.etBarcode.requestFocus();
+        KeyboardUtils.showSoftInput(mViewBinding.etBarcode);
 
         mViewBinding.etBarcode.setOnEditorActionListener((textView, i, keyEvent) -> {
             if ((i == EditorInfo.IME_ACTION_SEARCH || i == EditorInfo.IME_ACTION_UNSPECIFIED) && !StringUtils.isEmpty(textView.getText())) {

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

@@ -3,7 +3,9 @@ package com.xingdata.zzdpos.ui.manage.sssku.fragment;
 import android.annotation.SuppressLint;
 import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
+import android.widget.TextView;
 
+import com.blankj.utilcode.util.StringUtils;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
@@ -18,6 +20,8 @@ import java.util.List;
 public class SearchFragment extends BaseFragment<SsskuPresenter, FragmentSsskuSearchBinding> {
 
     private int mSearchType;
+    private String mKeyword;
+
     private SkuAdapter<Sssku> mSkuAdapter;
 
     @Override
@@ -48,8 +52,12 @@ public class SearchFragment extends BaseFragment<SsskuPresenter, FragmentSsskuSe
 
         // 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);
+
+        //init
+        if (!StringUtils.isEmpty(mKeyword)) mPresenter.searchSku(mKeyword);
     }
 
     /**
@@ -87,6 +95,17 @@ public class SearchFragment extends BaseFragment<SsskuPresenter, FragmentSsskuSe
         return this;
     }
 
+    /**
+     * 设置预设关键字
+     *
+     * @param keyword 预设关键字
+     * @return this
+     */
+    public SearchFragment setKeyword(String keyword) {
+        this.mKeyword = mKeyword;
+        return this;
+    }
+
     @Override
     public boolean onBackPressedSupport() {
         switch (mSearchType) {

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

@@ -92,7 +92,7 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A
     @Override
     public void showSearchFragment(int searchType) {
         this.showTitleBarByTitleMode(searchType);
-        this.start(mSearchFragment.setSearchType(searchType));
+        this.start(mSearchFragment.setKeyword("").setSearchType(searchType));
     }
 
     @Override
@@ -108,6 +108,7 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A
             mScanFragment.pop();
             mPresenter.scanCompleted(barcode, searchType);
         });
+        mScanFragment.setOnBackPressedListener(this::pop);
         this.start(mScanFragment);
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/adapter/MsAdapter.java

@@ -71,7 +71,11 @@ public class MsAdapter extends BaseAdapter<Ms, ItemMsBinding> {
                 strGroup = mContext.getResources().getString(R.string.ms_group_all_info);
                 break;
             case C.MS_GROUP.CATE:
+                if (ms.getCateName() != null) {
                     strGroup = mContext.getResources().getString(R.string.ms_group_cate_info, ms.getCateName());
+                } else {
+                    strGroup = mContext.getResources().getString(R.string.ms_group_cate_info, "指定品类商品");
+                }
                 break;
             case C.MS_GROUP.SKU:
                 String spuName = DBFactory.Marketing.Ms.querySpuNameBySkuId(ms.getSkuId());

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

@@ -48,8 +48,7 @@
                     style="@style/searchBarEditor"
                     android:layout_width="0dp"
                     android:layout_weight="1"
-                    android:inputType="number"
-                    android:labelFor="@+id/et_search"/>
+                    android:labelFor="@+id/et_search" />
 
             </LinearLayout>
 

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

@@ -333,20 +333,20 @@
     <string name="ms_editor_title">管理-营销计划</string>
     <string name="ms_editor_setting">设置营销计划</string>
     <string name="ms_editor_subtitle_info">基本信息</string>
-    <string name="ms_editor_name">计划名称</string>
+    <string name="ms_editor_name">计划名称:</string>
     <string name="ms_editor_name_hint">请输入计划名称</string>
     <string name="ms_editor_subtitle_time">时间信息</string>
     <string name="ms_editor_time_more">更多设置</string>
     <string name="ms_editor_date">起止时间:</string>
-    <string name="ms_editor_date_start">开始时间</string>
-    <string name="ms_editor_date_end">结束时间</string>
-    <string name="ms_editor_time">限定时段</string>
-    <string name="ms_editor_week">限定星期</string>
+    <string name="ms_editor_date_start">开始时间:</string>
+    <string name="ms_editor_date_end">结束时间:</string>
+    <string name="ms_editor_time">限定时段:</string>
+    <string name="ms_editor_week">限定星期:</string>
     <string name="ms_editor_subtitle_ms">活动信息</string>
     <string name="ms_editor_type">营销方式:</string>
-    <string name="ms_editor_group">营销主体</string>
-    <string name="ms_editor_user">营销对象</string>
-    <string name="ms_editor_area">营销范围</string>
+    <string name="ms_editor_group">营销主体:</string>
+    <string name="ms_editor_user">营销对象:</string>
+    <string name="ms_editor_area">营销范围:</string>
     <string name="ms_editor_buy">买</string>
     <string name="ms_editor_group_all_hint">任意商品</string>
     <string name="ms_editor_group_skugrp_hint">品类下的任意商品</string>
@@ -355,7 +355,7 @@
     <string name="ms_editor_group_sku_name">品名:</string>
     <string name="ms_editor_group_sku_price">售价:</string>
     <string name="ms_editor_type_dis_text1">享受</string>
-    <string name="ms_editor_type_dis_hint">折扣比例</string>
+    <string name="ms_editor_type_dis_hint">折扣比例:</string>
     <string name="ms_editor_type_dis_text2">折优惠</string>
     <string name="ms_editor_type_promotion_text1">按选定商品的促销价销售</string>
     <string name="ms_editor_type_promotion_text2">促销价为商品维护中的促销价</string>
@@ -372,7 +372,7 @@
     <string name="ms_editor_type_gift_hint">条码:请扫码或输入条码</string>
     <string name="ms_editor_type_gift_name">品名:</string>
     <string name="ms_editor_type_gift_price">售价:</string>
-    <string name="ms_editor_type_gift_search_hint">请扫内包装商品条码</string>
+    <string name="ms_editor_type_gift_search_hint">请输入商品名称/条码</string>
     <string name="ms_editor_date_format">%s年%s月%s日</string>
     <string name="ms_editor_time_format">%s:%s</string>