分组信息相关;

app/src/main/java/com/xingdata/zzdpos/C.java

@@ -294,7 +294,10 @@ public class C {
         public final class SSKUGRP {
             private static final String ROOT_URL = PKG + "sskugrp/";
 
+            public static final String add = ROOT_URL + "add";
             public static final String query = ROOT_URL + "query";
+            public static final String delete = ROOT_URL + "delete";
+            public static final String update = ROOT_URL + "update";
         }
 
         public final class CSDETAIL {

app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java

@@ -768,7 +768,7 @@ public final class ApiFactory {
          */
         public static Observable<Pager<com.xingdata.zzdpos.model.Cs>> querCsList(int pageNulmber,
                                                                                  int pageSize
-) {
+        ) {
             return Api.getInstance().service.querCsList(pageNulmber, pageSize).onErrorReturn(new
                     ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread());
@@ -913,6 +913,33 @@ public final class ApiFactory {
                     .observeOn(AndroidSchedulers.mainThread())
                     .retryWhen(new RetryHelper(3));
         }
+
+        public static Observable<String> add(com.xingdata.zzdpos.model.Sskugrp sskugrp) {
+            return Api.getInstance().service.addSskugrp(sskugrp)
+                    .onErrorReturn(new ErrorFilter<>())
+                    .map(new ResultFilter<>())
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .retryWhen(new RetryHelper(3));
+        }
+
+        public static Observable<String> update(com.xingdata.zzdpos.model.Sskugrp sskugrp) {
+            return Api.getInstance().service.updateSskugrp(sskugrp)
+                    .onErrorReturn(new ErrorFilter<>())
+                    .map(new ResultFilter<>())
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .retryWhen(new RetryHelper(3));
+        }
+
+        public static Observable<String> delete(Long skuGrpId) {
+            return Api.getInstance().service.deleteSskugrp(skuGrpId)
+                    .onErrorReturn(new ErrorFilter<>())
+                    .map(new ResultFilter<>())
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .retryWhen(new RetryHelper(3));
+        }
     }
 
     public static class User {

app/src/main/java/com/xingdata/zzdpos/api/ApiService.java

@@ -352,6 +352,15 @@ interface ApiService {
     @POST(C.URL.SSKUGRP.query)
     Observable<HttpMessage<Pager<Sskugrp>>> querySskugrp();
 
+    @POST(C.URL.SSKUGRP.add)
+    Observable<HttpMessage<String>> addSskugrp(@Body Sskugrp sskugrp);
+
+    @POST(C.URL.SSKUGRP.update)
+    Observable<HttpMessage<String>> updateSskugrp(@Body Sskugrp sskugrp);
+
+    @POST(C.URL.SSKUGRP.delete)
+    Observable<HttpMessage<String>> deleteSskugrp(@Query("id") Long skuGrpId);
+
     @POST(C.URL.MS.query)
     Observable<HttpMessage<Pager<Ms>>> queryMs(@Query("pageNumber") int pageNumber,
                                                @Query("pageSize") int pageSize,

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

@@ -55,6 +55,9 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
         });
     }
 
+    @Override
+    public void onBackPressedSupport() {
+    }
 
     @Override
     public void loadSkus(List<Sssku> skus, boolean isRefresh) {
@@ -64,6 +67,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
     @Override
     public void loadSkugrps(List<Sskugrp> sskugrps) {
         mManagerFragment.loadSkugrps(sskugrps);
+        mSkugrpFragment.loadSkugrps(sskugrps);
     }
 
     @Override
@@ -124,11 +128,13 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
     @Override
     public void backToEditFragment() {
         this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
+        this.popTo(EditorFragment.class, false);
     }
 
     @Override
     public void backToManagerFragment() {
         this.showTitleBarByTitleMode(C.TITLE_MODE.SKU);
+        this.popTo(ManagerFragment.class, false);
         this.resetSearchBar();
     }
 
@@ -169,7 +175,5 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
     private void resetSearchBar() {
         mViewBinding.etSearch.setText("");
         mViewBinding.clTitle.requestFocus();
-        mViewBinding.clTitle.requestFocusFromTouch();
     }
-
 }

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

@@ -102,6 +102,11 @@ public interface SsskuContract {
          */
         void dismissLoadingDialog();
 
+        /**
+         * 关闭所有对话框
+         */
+        void dismissAllDialog();
+
     }
 
     abstract class Presenter extends BasePresenter<View> {
@@ -175,6 +180,13 @@ public interface SsskuContract {
          */
         public abstract void clickEditSku(Sssku sssku);
 
+        /**
+         * 分组页面 - 添加分组
+         *
+         * @param skugrpName 分组名
+         */
+        public abstract void clickAddSkugrp(String skugrpName);
+
         /**
          * 分组页面 - 删除分组.
          *

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

@@ -45,6 +45,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
 
     @Override
     public void clickSkugrp(Sskugrp sskugrp) {
+        //点击商品管理里的分组
         this.mPageNum = 0;
         this.mSkuGrpId = sskugrp.getSkuGrpId();
         mView.loadSkugrpState(mSkuGrpId);
@@ -96,13 +97,49 @@ public class SsskuPresenter extends SsskuContract.Presenter {
     }
 
     @Override
-    public void clickDeleteSkugrp(Sskugrp sskugrp) {
+    public void clickAddSkugrp(String skugrpName) {
+        mView.showLoadingDialog();
+        Sskugrp sskugrp = new Sskugrp();
+        sskugrp.setSkuGrpName(skugrpName);
+        mCompositeDisposable.add(
+                ApiFactory.Sskugrp.add(sskugrp)
+                        .doOnSubscribe(subscription -> mView.dismissLoadingDialog())
+                        .subscribe(s -> {
+                            mView.dismissAllDialog();
+                            this.getSkugrp();
+                        }, throwable -> {
+                        })
+        );
+    }
 
+    @Override
+    public void clickDeleteSkugrp(Sskugrp sskugrp) {
+        mView.showLoadingDialog();
+        mCompositeDisposable.add(
+                ApiFactory.Sskugrp.delete(sskugrp.getSkuGrpId())
+                        .doOnSubscribe(subscription -> mView.dismissLoadingDialog())
+                        .subscribe(s -> {
+                            mView.dismissAllDialog();
+                            this.getSkugrp();
+                        }, throwable -> {
+                        })
+        );
     }
 
     @Override
     public void clickEditSkugrp(Sskugrp sskugrp) {
-
+        mView.showLoadingDialog();
+        sskugrp.setCreateTime(null);
+        sskugrp.setUpdateTime(null);
+        mCompositeDisposable.add(
+                ApiFactory.Sskugrp.update(sskugrp)
+                        .doOnSubscribe(subscription -> mView.dismissLoadingDialog())
+                        .subscribe(s -> {
+                            mView.dismissAllDialog();
+                            this.getSkugrp();
+                        }, throwable -> {
+                        })
+        );
     }
 
     @Override
@@ -119,7 +156,8 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                 ApiFactory.Sssku.querySssku(mPageNum, "", mSkuGrpId)
                         .doOnSubscribe(subscription -> mView.dismissLoadingDialog())
                         .subscribe(ssskuPager -> {
-                            if (mPageNum == 0) mView.loadSsskuCount(ssskuPager.getTotalRow());
+                            if (mPageNum == 0 && mSkuGrpId == 0L)
+                                mView.loadSsskuCount(ssskuPager.getTotalRow());
                             mView.loadSkus(ssskuPager.getList(), mPageNum == 0);
                         })
         );
@@ -143,11 +181,6 @@ public class SsskuPresenter extends SsskuContract.Presenter {
     private void getSkugrp() {
         mCompositeDisposable.add(
                 ApiFactory.Sskugrp.querySskugrp().subscribe(sskugrpPager -> {
-                            Sskugrp sskugrp = new Sskugrp();
-                            sskugrp.setSkuGrpId(0L);
-                            sskugrp.setSkuGrpName("全部分组");
-                            sskugrp.setSelected(true);
-                            sskugrpPager.getList().add(0, sskugrp);
                             mView.loadSkugrps(sskugrpPager.getList());
                         }
                 )

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

 package com.xingdata.zzdpos.ui.manage.sssku.dialog;
 
+import android.view.View;
+
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseDialog;
 import com.xingdata.zzdpos.databinding.DialogSkugrpEditorBinding;
@@ -27,6 +29,17 @@ public class SkugrpEditorDialog extends BaseDialog<SsskuPresenter, DialogSkugrpE
 
     @Override
     public void initView() {
+        if (mSskugrp != null) mViewBinding.etName.setText(mSskugrp.getSkuGrpName());
+    }
 
+    @Override
+    public void onConfirmClick(View view) {
+        super.onConfirmClick(view);
+        if (mSskugrp == null) {
+            mPresenter.clickAddSkugrp(mViewBinding.etName.getText().toString());
+        } else {
+            mSskugrp.setSkuGrpName(mViewBinding.etName.getText().toString());
+            mPresenter.clickEditSkugrp(mSskugrp);
+        }
     }
 }

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

@@ -4,11 +4,18 @@ import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseSheetDialog;
 import com.xingdata.zzdpos.databinding.DialogSkugrpMenuBinding;
 import com.xingdata.zzdpos.model.Sskugrp;
+import com.xingdata.zzdpos.ui.manage.sssku.SsskuActivity;
 import com.xingdata.zzdpos.ui.manage.sssku.SsskuPresenter;
 
 public class SkugrpMenuDialog extends BaseSheetDialog<SsskuPresenter, DialogSkugrpMenuBinding> {
+
     private Sskugrp mSskugrp;
 
+    @Override
+    protected boolean isTransparentBackground() {
+        return true;
+    }
+
     public SkugrpMenuDialog setSskugrp(Sskugrp sskugrp) {
         this.mSskugrp = sskugrp;
         return this;
@@ -21,6 +28,16 @@ public class SkugrpMenuDialog extends BaseSheetDialog<SsskuPresenter, DialogSkug
 
     @Override
     public void initView() {
-
+        mViewBinding.tvCancel.setOnClickListener(view -> {
+            this.dismiss();
+        });
+        mViewBinding.tvDelete.setOnClickListener(view -> {
+            this.dismiss();
+            new SkugrpDeleteDialog().setSskugrp(mSskugrp).show(((SsskuActivity) getActivity()));
+        });
+        mViewBinding.tvUpdate.setOnClickListener(view -> {
+            this.dismiss();
+            new SkugrpEditorDialog().setSskugrp(mSskugrp).show(((SsskuActivity) getActivity()));
+        });
     }
 }

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

@@ -19,10 +19,10 @@ public class DetailFragment extends BaseFragment<SsskuPresenter, FragmentSsskuDe
 
     @Override
     public void initView() {
-        mViewBinding.tvEdit.setOnClickListener(view -> {
-            this.pop();
-            mPresenter.clickEditSku(mSssku);
-        });
+//        mViewBinding.tv.setOnClickListener(view -> {
+//            this.pop();
+//            mPresenter.clickEditSku(mSssku);
+//        });
     }
 
     /**
@@ -38,6 +38,6 @@ public class DetailFragment extends BaseFragment<SsskuPresenter, FragmentSsskuDe
     @Override
     public boolean onBackPressedSupport() {
         ((SsskuActivity) getActivity()).backToManagerFragment();
-        return super.onBackPressedSupport();
+         return super.onBackPressedSupport();
     }
 }

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

@@ -16,6 +16,7 @@ import com.xingdata.zzdpos.ui.manage.sssku.SsskuPresenter;
 import com.xingdata.zzdpos.ui.manage.sssku.adapter.SkuAdapter;
 import com.xingdata.zzdpos.ui.manage.sssku.adapter.SkugrpAdapter;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class ManagerFragment extends BaseFragment<SsskuPresenter, FragmentSsskuManagerBinding> {
@@ -86,7 +87,14 @@ public class ManagerFragment extends BaseFragment<SsskuPresenter, FragmentSsskuM
      * @param sskugrps 分组信息
      */
     public void loadSkugrps(List<Sskugrp> sskugrps) {
-        mSkugrpAdapter.setNewData(sskugrps);
+        Sskugrp sskugrp = new Sskugrp();
+        sskugrp.setSkuGrpId(0L);
+        sskugrp.setSkuGrpName("全部分组");
+        sskugrp.setSelected(true);
+        List<Sskugrp> _sskugrps = new ArrayList<>();
+        _sskugrps.addAll(sskugrps);
+        _sskugrps.add(0, sskugrp);
+        mSkugrpAdapter.setNewData(_sskugrps);
     }
 
     /**

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

 package com.xingdata.zzdpos.ui.manage.sssku.fragment;
 
+import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
 
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentSsskuSkugrpBinding;
+import com.xingdata.zzdpos.model.Sskugrp;
 import com.xingdata.zzdpos.ui.manage.sssku.SsskuActivity;
 import com.xingdata.zzdpos.ui.manage.sssku.SsskuPresenter;
+import com.xingdata.zzdpos.ui.manage.sssku.adapter.SkugrpAdapter;
 import com.xingdata.zzdpos.ui.manage.sssku.dialog.SkugrpEditorDialog;
+import com.xingdata.zzdpos.ui.manage.sssku.dialog.SkugrpMenuDialog;
+
+import java.util.List;
 
 
 public class SkugrpFragment extends BaseFragment<SsskuPresenter, FragmentSsskuSkugrpBinding> {
 
+    private List<Sskugrp> mSskugrps;
+    private SkugrpAdapter mSkugrpAdapter;
 
     @Override
     public int getLayoutId() {
@@ -20,11 +28,32 @@ public class SkugrpFragment extends BaseFragment<SsskuPresenter, FragmentSsskuSk
 
     @Override
     public void initView() {
-        mViewBinding.setVisibility(View.GONE);
+        mSkugrpAdapter = new SkugrpAdapter();
+        mSkugrpAdapter.setNewData(mSskugrps);
+
+        mViewBinding.rlSkugrp.setAdapter(mSkugrpAdapter);
+        mViewBinding.rlSkugrp.setLayoutManager(new LinearLayoutManager(mContext));
 
+        mViewBinding.setVisibility(View.INVISIBLE);
         mViewBinding.llSkugrpAdd.setOnClickListener(view -> {
             new SkugrpEditorDialog().show(((SsskuActivity) getActivity()));
         });
+
+        mSkugrpAdapter.setOnItemClickListener((adapter, view, position) -> {
+            new SkugrpMenuDialog().setSskugrp(mSkugrpAdapter.getData().get(position)).show(((SsskuActivity) getActivity()));
+        });
+    }
+
+    /**
+     * 加载商品分组
+     *
+     * @param sskugrps 分组信息
+     */
+    public void loadSkugrps(List<Sskugrp> sskugrps) {
+        mSskugrps = sskugrps;
+        if (mSkugrpAdapter == null) return;
+        mSkugrpAdapter.notifyDataSetChanged();
+        mViewBinding.setVisibility(sskugrps.size() > 0 ? View.VISIBLE : View.INVISIBLE);
     }
 
     @Override

app/src/main/res/drawable/shape_white_r1.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="@dimen/all_shape_radius" />
+    <solid android:color="@color/white_caocao" />
+
+</shape>
\ No newline at end of file

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

@@ -6,17 +6,13 @@
         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"
-            android:layout_marginBottom="@dimen/all_padding" />
-
+            android:layout_height="wrap_content" />
 
         <ViewStub
             android:id="@+id/vs_center"
@@ -25,22 +21,25 @@
             android:layout_weight="1"
             android:inflatedId="@+id/panel_import" />
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/all_line_width"
+            android:background="@color/gray_kongming" />
 
         <LinearLayout
-            android:layout_marginTop="@dimen/all_padding"
-            android:orientation="horizontal"
-            android:weightSum="2"
-            android:background="@color/white_caocao"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:background="@color/white_caocao"
+            android:orientation="horizontal"
+            android:weightSum="2">
 
             <Button
-                android:layout_margin="@dimen/all_padding"
                 android:id="@+id/btn_cancel"
                 style="@style/button_passive"
                 android:layout_width="0dp"
-                android:layout_weight="1"
                 android:layout_height="wrap_content"
+                android:layout_margin="@dimen/all_padding"
+                android:layout_weight="1"
                 android:stateListAnimator="@null"
                 android:text="@string/all_cancel"
                 android:textSize="@dimen/all_text_size"
@@ -51,12 +50,12 @@
                 tools:targetApi="lollipop" />
 
             <Button
-                android:layout_margin="@dimen/all_padding"
                 android:id="@+id/btn_confirm"
                 style="@style/button_positive"
                 android:layout_width="0dp"
-                android:layout_weight="1"
                 android:layout_height="wrap_content"
+                android:layout_margin="@dimen/all_padding"
+                android:layout_weight="1"
                 android:stateListAnimator="@null"
                 android:text="@string/all_confirm"
                 android:textSize="@dimen/all_text_size"
@@ -68,7 +67,6 @@
 
         </LinearLayout>
 
-
     </LinearLayout>
 
 </layout>
\ No newline at end of file

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

@@ -5,6 +5,7 @@
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:background="@color/white_caocao"
         android:orientation="vertical">
 
         <TextView
@@ -21,11 +22,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/all_margin"
+            android:layout_marginStart="@dimen/all_margin"
             android:layout_marginTop="@dimen/all_margin"
             android:text="确定删除吗?"
             android:textColor="@color/black_baozheng"
-            android:textSize="@dimen/all_body_size" />
-        
+            android:textSize="@dimen/all_text_size" />
+
     </LinearLayout>
 
 </layout>
\ No newline at end of file

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

@@ -3,26 +3,27 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/white_caocao"
         android:orientation="vertical">
 
         <TextView
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/all_margin"
             android:layout_marginTop="@dimen/all_margin"
-            android:gravity="center"
-            android:text="提示"
+            android:text="@string/skugrp_add_hint"
             android:textColor="@color/black_baozheng"
-            android:textSize="@dimen/all_sub_title_size"
-            android:textStyle="bold" />
+            android:textSize="@dimen/all_text_size" />
 
         <EditText
-            android:id="@+id/et_pwd"
+            android:id="@+id/et_name"
             style="@style/editText_new"
             android:layout_marginBottom="@dimen/all_margin"
-            android:layout_marginTop="@dimen/et_margin_edittext"
-            android:hint="@string/skugrp_add_hint"
+            android:layout_marginTop="@dimen/all_margin"
+            android:inputType="text"
+            android:labelFor="@+id/et_name"
             android:maxLength="16" />
 
     </LinearLayout>

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

@@ -3,10 +3,59 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/transparent">
+        android:orientation="vertical"
+        android:paddingBottom="@dimen/all_margin"
+        android:paddingEnd="@dimen/all_margin"
+        android:paddingStart="@dimen/all_margin">
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/shape_white_r1"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_update"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/button3_height"
+                android:foreground="?android:attr/selectableItemBackground"
+                android:gravity="center"
+                android:text="@string/all_update"
+                android:textColor="@color/blue_mawu"
+                android:textSize="@dimen/all_text_size" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/all_line_width"
+                android:layout_marginEnd="@dimen/all_margin"
+                android:layout_marginStart="@dimen/all_margin"
+                android:background="@color/gray_kongming" />
+
+            <TextView
+                android:id="@+id/tv_delete"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/button3_height"
+                android:foreground="?android:attr/selectableItemBackground"
+                android:gravity="center"
+                android:text="@string/all_delete"
+                android:textColor="@color/red_guanyu"
+                android:textSize="@dimen/all_text_size" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tv_cancel"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/button3_height"
+            android:layout_marginTop="@dimen/all_margin"
+            android:background="@drawable/shape_white_r1"
+            android:foreground="?android:attr/selectableItemBackground"
+            android:gravity="center"
+            android:padding="@dimen/all_spacing"
+            android:text="@string/all_cancel"
+            android:textColor="@color/black_likui"
+            android:textSize="@dimen/all_text_size" />
     </LinearLayout>
 
 </layout>
\ No newline at end of file

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

@@ -5,14 +5,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/red_guanyu"
         android:orientation="vertical">
 
-        <TextView
-            android:id="@+id/tv_edit"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="编辑" />
-
     </LinearLayout>
 </layout>
\ No newline at end of file

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

@@ -210,5 +210,19 @@
     <!--新标准-->
     <dimen name="headline">20dp</dimen>
 
+    <dimen name="margin">16dp</dimen>
+
+    <dimen name="button1_height">40dp</dimen>
+    <dimen name="button1_marginHorizontal">24dp</dimen>
+    <dimen name="button1_width">120dp</dimen>
+
+    <dimen name="button2_height">35dp</dimen>
+    <dimen name="button2_marginHorizontal">16dp</dimen>
+    <dimen name="button2_width">105dp</dimen>
+
+    <dimen name="button3_height">44dp</dimen>
+    <dimen name="button3_marginHorizontal">16dp</dimen>
+    <dimen name="button3_width">328dp</dimen>
+
 
 </resources>

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

@@ -10,6 +10,8 @@
     <string name="all_add">添加</string>
     <string name="all_no">否</string>
     <string name="all_yes">是</string>
+    <string name="all_update">编辑</string>
+    <string name="all_delete">删除</string>
     <string name="visible">visible</string>
     <string name="gone">gone</string>
     <string name="password">＊</string>
@@ -682,7 +684,7 @@
 
     <!--商品维护-->
     <string name="sku_size">规格/</string>
-    <string name="skugrp_add_hint">请输入分组名称/</string>
+    <string name="skugrp_add_hint">请输入分组名称</string>
 
 
 </resources>

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

@@ -264,7 +264,6 @@
     </style>
 
     <style name="button_positive" parent="android:ButtonBar">
-        <item name="android:foreground">?android:attr/selectableItemBackgroundBorderless</item>
         <item name="android:background">@drawable/red_border_allradius</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:gravity">center</item>
@@ -317,7 +316,6 @@
     </style>
 
     <style name="button_passive" parent="android:ButtonBar">
-        <item name="android:foreground">?android:attr/selectableItemBackgroundBorderless</item>
         <item name="android:background">@drawable/selector_gradient_gray_button_background</item>
         <item name="android:textColor">@drawable/selector_gray_button_text_color</item>
         <item name="android:gravity">center</item>
@@ -389,7 +387,6 @@
     </style>
 
     <style name="searchBarEditor">
-        <item name="android:drawableStart">@mipmap/ic_search</item>
         <item name="android:drawablePadding">@dimen/all_spacing</item>
         <item name="android:maxLines">1</item>
         <item name="android:maxLength">20</item>