提交代码;

app/src/main/java/com/xingdata/zzdpos/base/BaseDialog.java

@@ -43,7 +43,6 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
     public boolean isShowing;
 
     static {
-
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/dialog/SkugrpDeleteDialog.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.DialogSkugrpDeleteBinding;
+import com.xingdata.zzdpos.model.Sskugrp;
+import com.xingdata.zzdpos.ui.manage.sssku.SsskuPresenter;
+
+public class SkugrpDeleteDialog extends BaseDialog<SsskuPresenter, DialogSkugrpDeleteBinding> {
+
+    private Sskugrp mSskugrp;
+
+    public SkugrpDeleteDialog setSskugrp(Sskugrp sskugrp) {
+        this.mSskugrp = sskugrp;
+        return this;
+    }
+
+    @Override
+    protected boolean isShowTitle() {
+        return false;
+    }
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.dialog_skugrp_delete;
+    }
+
+    @Override
+    public void initView() {
+    }
+
+    @Override
+    public void onConfirmClick(View view) {
+        super.onConfirmClick(view);
+        mPresenter.clickDeleteSkugrp(mSskugrp);
+    }
+}

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

+package com.xingdata.zzdpos.ui.manage.sssku.dialog;
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseDialog;
+import com.xingdata.zzdpos.databinding.DialogSkugrpEditorBinding;
+import com.xingdata.zzdpos.model.Sskugrp;
+import com.xingdata.zzdpos.ui.manage.sssku.SsskuPresenter;
+
+public class SkugrpEditorDialog extends BaseDialog<SsskuPresenter, DialogSkugrpEditorBinding> {
+
+    private Sskugrp mSskugrp;
+
+    public SkugrpEditorDialog setSskugrp(Sskugrp sskugrp) {
+        this.mSskugrp = sskugrp;
+        return this;
+    }
+
+    @Override
+    protected boolean isShowTitle() {
+        return false;
+    }
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.dialog_skugrp_editor;
+    }
+
+    @Override
+    public void initView() {
+
+    }
+}

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

+package com.xingdata.zzdpos.ui.manage.sssku.dialog;
+
+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.SsskuPresenter;
+
+public class SkugrpMenuDialog extends BaseSheetDialog<SsskuPresenter, DialogSkugrpMenuBinding> {
+    private Sskugrp mSskugrp;
+
+    public SkugrpMenuDialog setSskugrp(Sskugrp sskugrp) {
+        this.mSskugrp = sskugrp;
+        return this;
+    }
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.dialog_skugrp_menu;
+    }
+
+    @Override
+    public void initView() {
+
+    }
+}

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

 package com.xingdata.zzdpos.ui.manage.sssku.fragment;
 
+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.ui.manage.sssku.SsskuActivity;
 import com.xingdata.zzdpos.ui.manage.sssku.SsskuPresenter;
+import com.xingdata.zzdpos.ui.manage.sssku.dialog.SkugrpEditorDialog;
 
 
 public class SkugrpFragment extends BaseFragment<SsskuPresenter, FragmentSsskuSkugrpBinding> {
+
+
     @Override
     public int getLayoutId() {
         return R.layout.fragment_sssku_skugrp;
@@ -15,7 +20,11 @@ public class SkugrpFragment extends BaseFragment<SsskuPresenter, FragmentSsskuSk
 
     @Override
     public void initView() {
+        mViewBinding.setVisibility(View.GONE);
 
+        mViewBinding.llSkugrpAdd.setOnClickListener(view -> {
+            new SkugrpEditorDialog().show(((SsskuActivity) getActivity()));
+        });
     }
 
     @Override

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/all_margin"
+            android:gravity="center"
+            android:text="提示"
+            android:textColor="@color/black_baozheng"
+            android:textSize="@dimen/all_sub_title_size"
+            android:textStyle="bold" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/all_margin"
+            android:layout_marginTop="@dimen/all_margin"
+            android:text="确定删除吗?"
+            android:textColor="@color/black_baozheng"
+            android:textSize="@dimen/all_body_size" />
+        
+    </LinearLayout>
+
+</layout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/all_margin"
+            android:gravity="center"
+            android:text="提示"
+            android:textColor="@color/black_baozheng"
+            android:textSize="@dimen/all_sub_title_size"
+            android:textStyle="bold" />
+
+        <EditText
+            android:id="@+id/et_pwd"
+            style="@style/editText_new"
+            android:layout_marginBottom="@dimen/all_margin"
+            android:layout_marginTop="@dimen/et_margin_edittext"
+            android:hint="@string/skugrp_add_hint"
+            android:maxLength="16" />
+
+    </LinearLayout>
+
+</layout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@color/transparent">
+
+    </LinearLayout>
+
+</layout>
\ No newline at end of file

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

@@ -22,7 +22,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/all_line_width"
             android:layout_gravity="bottom"
-            android:layout_marginTop="@dimen/all_margin"
+            android:layout_marginTop="@dimen/all_spacing"
             android:background="@color/gray_huanggai" />
 
         <LinearLayout

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

@@ -2,11 +2,60 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <data>
+
+        <variable
+            name="visibility"
+            type="int" />
+
+    </data>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/green_chengyaojin"
         android:orientation="vertical">
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/all_line_width"
+            android:background="@color/gray_kongming" />
+
+        <LinearLayout
+            android:id="@+id/ll_skugrp_add"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white_caocao"
+            android:foreground="?android:attr/selectableItemBackground"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="?attr/actionBarSize"
+                android:drawablePadding="@dimen/all_spacing"
+                android:drawableStart="@mipmap/add_bg"
+                android:gravity="center"
+                android:text="@string/sssku_skugrp_add"
+                android:textColor="@color/red_guanyu"
+                android:textSize="@dimen/all_sub_title_size" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/all_line_width"
+                android:background="@color/gray_huanggai" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/all_line_width"
+            android:layout_marginTop="@dimen/all_margin"
+            android:background="@color/gray_huanggai"
+            android:visibility="@{visibility}" />
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/rl_skugrp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
     </LinearLayout>
 </layout>
\ No newline at end of file

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

@@ -379,6 +379,7 @@
     <string name="sssku_update">编辑商品</string>
     <string name="sssku_detail">商品详情</string>
     <string name="sssku_skugrp">分组信息</string>
+    <string name="sssku_skugrp_add">添加分组</string>
 
     <string name="sssku_search_hint">请输入商品名称/助记码/条码</string>
     <string name="sssku_empty_hint">没有搜到此商品\n请重新搜索，或点击添加按钮进行添加~</string>
@@ -678,6 +679,7 @@
 
     <!--商品维护-->
     <string name="sku_size">规格/</string>
+    <string name="skugrp_add_hint">请输入分组名称/</string>
 
 
 </resources>

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

@@ -17,9 +17,9 @@
         <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 
 
     <style name="vicescreen_textview_stlye">
@@ -43,6 +43,7 @@
         <item name="android:textColor">@color/black</item>
         <item name="android:textSize">@dimen/detail_textview_size</item>
     </style>
+
     <style name="default_blacktext_margin_smallstyle">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">match_parent</item>
@@ -55,6 +56,7 @@
         <item name="android:textColor">@color/black</item>
         <item name="android:textSize">@dimen/detail_textview_size</item>
     </style>
+
     <style name="default_bluetext_popbutton">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">match_parent</item>
@@ -66,7 +68,6 @@
     </style>
 
 
-
     <style name="default_title">
         <item name="android:gravity">center_vertical</item>
         <item name="android:singleLine">true</item>
@@ -263,6 +264,7 @@
     </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>
@@ -315,6 +317,7 @@
     </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>
@@ -338,16 +341,15 @@
     </style>
 
     <style name="editText_new" parent="view_base">
-        <item name=" android:background">@drawable/selector_white_background_stroke</item>
+        <item name="android:background">@drawable/selector_white_background_stroke</item>
         <item name="android:padding">@dimen/et_padding</item>
-        <item name=" android:saveEnabled">false</item>
+        <item name="android:saveEnabled">false</item>
         <item name="android:gravity">center|left</item>
         <item name="android:textSize">@dimen/et_textsize</item>
         <item name="android:textColorHint">@color/hint</item>
     </style>
 
 
-
     <style name="button" parent="view_base">
         <item name=" android:background">@drawable/red_border</item>
         <item name=" android:saveEnabled">false</item>