修改bug;

添加字段;

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

@@ -19,8 +19,7 @@ public class Sskugrp extends RealmObject implements BaseModel, BaseBean {
     public static Sskugrp createDefault() {
         Sskugrp sskugrp = new Sskugrp();
         sskugrp.setSelected(true);
-        sskugrp.setSkuGrpId(0l);
-        sskugrp.setSkuGrpName("全部商品");
+        sskugrp.setSkuGrpId(0L);
         return sskugrp;
     }
 

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

 package com.xingdata.zzdpos.ui.manage.sssku;
 
+import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.SPUtils;
 import com.blankj.utilcode.util.StringUtils;
 import com.blankj.utilcode.util.ToastUtils;
@@ -336,12 +337,14 @@ public class SsskuPresenter extends SsskuContract.Presenter {
      */
     private void getSkugrp() {
         mCompositeDisposable.add(
-                ApiFactory.Sskugrp.querySskugrp().subscribe(sskugrpPager -> {
-                            mView.loadSkugrps(sskugrpPager.getList());
-                        }, throwable -> {
-                            ToastUtils.showShort(throwable.getMessage());
-                        }
-                )
+                ApiFactory.Sskugrp.querySskugrp()
+                        .subscribe(
+                                sskugrpPager -> mView.loadSkugrps(sskugrpPager.getList()),
+                                throwable -> {
+                                    LogUtils.e(throwable.getMessage());
+                                    ToastUtils.showShort(throwable.getMessage());
+                                }
+                        )
         );
     }
 
@@ -350,9 +353,13 @@ public class SsskuPresenter extends SsskuContract.Presenter {
      */
     private void getReplenish() {
         mCompositeDisposable.add(
-                ApiFactory.Psb.preOrder().subscribe(ssskuPager -> mView.loadReplenishCount(ssskuPager.getTotalRow()), throwable -> {
-                    ToastUtils.showShort(throwable.getMessage());
-                })
+                ApiFactory.Psb.preOrder()
+                        .subscribe(
+                                ssskuPager -> mView.loadReplenishCount(ssskuPager.getTotalRow()),
+                                throwable -> {
+                                    LogUtils.e(throwable.getMessage());
+                                    ToastUtils.showShort(throwable.getMessage());
+                                })
         );
     }
 
@@ -361,9 +368,14 @@ public class SsskuPresenter extends SsskuContract.Presenter {
      */
     private void getCor() {
         mCompositeDisposable.add(
-                ApiFactory.Cor.queryAll().subscribe(cors -> mView.loadCors(cors), throwable -> {
-                    ToastUtils.showShort(throwable.getMessage());
-                })
+                ApiFactory.Cor.queryAll()
+                        .subscribe(
+                                cors -> mView.loadCors(cors),
+                                throwable -> {
+                                    LogUtils.e(throwable.getMessage());
+                                    ToastUtils.showShort(throwable.getMessage());
+                                }
+                        )
         );
     }
 }

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

@@ -335,12 +335,10 @@ public class EditorFragment extends BaseFragment<SsskuPresenter, FragmentSsskuEd
     public void loadSkugrps(List<Sskugrp> sskugrps) {
         Sskugrp sskugrp = new Sskugrp();
         sskugrp.setSkuGrpId(0L);
-        sskugrp.setSkuGrpName(getString(R.string.sku_default_skuname));
         sskugrp.setSelected(true);
-        List<Sskugrp> _sskugrps = new ArrayList<>();
-        _sskugrps.addAll(sskugrps);
+        List<Sskugrp> _sskugrps = new ArrayList<>(sskugrps);
         _sskugrps.add(0, sskugrp);
-        mSskugrps = _sskugrps;
+        this.mSskugrps = _sskugrps;
     }
 
     /**

app/src/main/java/com/xingdata/zzdpos/ui/marketing/marketingMenu/MarketingMenuActivity.java

 package com.xingdata.zzdpos.ui.marketing.marketingMenu;
 
 import android.databinding.DataBindingUtil;
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
 
@@ -12,7 +10,6 @@ import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.databinding.ActivityMarketingMenuBinding;
-import com.xingdata.zzdpos.model.MarketingMenuModel;
 import com.xingdata.zzdpos.ui.dialog.PromptDialog;
 import com.xingdata.zzdpos.ui.main.MainPresenter;
 import com.xingdata.zzdpos.ui.main.dialog.PaidUpDialog;
@@ -23,7 +20,6 @@ import com.xingdata.zzdpos.ui.marketing.recharge.RechargeRuleActivity;
 import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity;
 import com.xingdata.zzdpos.ui.marketing.viplevel.LevelActivity;
 import com.xingdata.zzdpos.util.OnClickListener;
-import com.xingdata.zzdpos.util.RecyclerViewUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -44,7 +40,7 @@ public class MarketingMenuActivity extends BaseActivity<MainPresenter, ActivityM
 
         ActivityMarketingMenuBinding mViewBinding = DataBindingUtil.setContentView(
                 this, R.layout.activity_marketing_menu);
-        mViewBinding.icTitle.tvTitle.setText("营销设置");
+        mViewBinding.icTitle.tvTitle.setText(R.string.ms_title);
         mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {

app/src/main/java/com/xingdata/zzdpos/ui/store/StorePresenter.java

@@ -254,13 +254,11 @@ public class StorePresenter extends StoreContract.Presenter {
                         sskugrps -> {
                             Sskugrp sskugrp = new Sskugrp();
                             sskugrp.setSkuGrpId(-1L);
-                            sskugrp.setSkuGrpName("组合商品");
                             sskugrp.setSelected(false);
                             sskugrps.add(0, sskugrp);
 
                             sskugrp = new Sskugrp();
                             sskugrp.setSkuGrpId(0L);
-                            sskugrp.setSkuGrpName("全部商品");
                             sskugrp.setSelected(true);
                             sskugrps.add(0, sskugrp);
 

app/src/main/java/com/xingdata/zzdpos/ui/store/adapter/SkugrpAdapter.java

@@ -17,6 +17,12 @@ public class SkugrpAdapter extends BaseSelectedAdapter<Sskugrp, ItemSelectorBind
     protected void convert(BaseViewHolder helper, ItemSelectorBinding mViewBinding, Sskugrp item) {
         mViewBinding.setSelected(getSelectedPosition() == helper.getAdapterPosition());
         mViewBinding.tvName.getPaint().setFakeBoldText(getSelectedPosition() == helper.getAdapterPosition());
-        mViewBinding.tvName.setText(item.getSkuGrpName());
+        String name = item.getSkuGrpName();
+        if (item.getSkuGrpId() == 0) {
+            name = mContext.getString(R.string.sku_default_grpName);
+        } else if (item.getSkuGrpId() < 0) {
+            name = mContext.getString(R.string.sku_default_grpName);
+        }
+        mViewBinding.tvName.setText(name);
     }
 }

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

@@ -65,7 +65,7 @@
             android:paddingEnd="@dimen/all_bounced_padding"
             android:paddingStart="@dimen/all_bounced_padding"
             android:paddingTop="@dimen/dp_4"
-            android:text="高级功能"
+            android:text="@string/ms_user_title"
             android:textColor="@color/red_guanyu"
             android:textSize="@dimen/all_text_size_small"
             android:visibility="@{isShow? View.VISIBLE: View.GONE}" />

app/src/main/res/values-en/stringzz.xml

@@ -32,5 +32,7 @@
     <string name="recharge_dis_add">Add Recharge Plan</string>
     <string name="recharge_dis_update">Update Recharge Plan</string>
     <string name="recharge_dis_empty">Not find the Recharge Plan</string>
+    
+    <string name="sku_u_grpName">Package sku </string>
 
 </resources>

app/src/main/res/values-zh/stringzz.xml

@@ -32,5 +32,6 @@
     <string name="recharge_dis_add">新增充值优惠</string>
     <string name="recharge_dis_update">修改充值优惠</string>
     <string name="recharge_dis_empty">还没有充值优惠，请添加充值优惠~</string>
-
+    
+    <string name="sku_u_grpName">组合商品</string>
 </resources>

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

@@ -32,5 +32,8 @@
     <string name="recharge_dis_add">添加充值优惠</string>
     <string name="recharge_dis_update">修改充值优惠</string>
     <string name="recharge_dis_empty">还没有充值优惠，请添加充值优惠~</string>
+    
+    <string name="sku_u_grpName">组合商品</string>
 
+    
 </resources>