添加颜色

.idea/modules.xml

@@ -2,7 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/TangKuPos.iml" filepath="$PROJECT_DIR$/TangKuPos.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/TangKuPos.iml" filepath="$PROJECT_DIR$/.idea/TangKuPos.iml" />
+      <module fileurl="file://C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" filepath="C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>

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

@@ -31,4 +31,6 @@ public interface BaseSku {
     Long getSpuCateId();
 
     Long getSpuBrandId();
+
+    Long getSpuBarcode();
 }

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

@@ -4,6 +4,7 @@ package com.xingdata.zzdpos.ui.marketing.ms;
 import com.blankj.utilcode.util.LogUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
+import com.xingdata.zzdpos.base.BaseSku;
 import com.xingdata.zzdpos.databinding.ActivityMsBinding;
 import com.xingdata.zzdpos.model.Ms;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
@@ -78,6 +79,16 @@ public class MsActivity extends BaseActivity<MsPresenter, ActivityMsBinding> imp
         mEditorFragment.loadUser(users);
     }
 
+    @Override
+    public <Sku extends BaseSku> void loadGroupSkuSssku(Sku sku) {
+        mEditorFragment.loadGroupSku(sku);
+    }
+
+    @Override
+    public <Sku extends BaseSku> void loadTypeGiftSssku(Sku sku) {
+        mEditorFragment.loadTypeSku(sku);
+    }
+
     @Override
     public void showLoadingDialog() {
         mLoadingDialog.show(this);

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

 package com.xingdata.zzdpos.ui.marketing.ms;
 
 import com.xingdata.zzdpos.base.BasePresenter;
+import com.xingdata.zzdpos.base.BaseSku;
 import com.xingdata.zzdpos.base.BaseView;
 import com.xingdata.zzdpos.model.Ms;
+import com.xingdata.zzdpos.model.Sssku;
 import com.xingdata.zzdpos.ui.marketing.ms.model.Area;
 import com.xingdata.zzdpos.ui.marketing.ms.model.Group;
 import com.xingdata.zzdpos.ui.marketing.ms.model.Type;
@@ -66,6 +68,20 @@ interface MsContract {
          */
         void loadUsers(List<User> users);
 
+        /**
+         * 加载作为主体的商品信息
+         *
+         * @param sku 加载编辑信息
+         */
+        <Sku extends BaseSku> void loadGroupSkuSssku(Sku sku);
+
+        /**
+         * 加载换购的商品
+         *
+         * @param sku 包装内的商品
+         */
+        <Sku extends BaseSku> void loadTypeGiftSssku(Sku sku);
+
         /**
          * 显示读取对话框
          */
@@ -114,6 +130,28 @@ interface MsContract {
          */
         public abstract void initEditor();
 
+        /**
+         * 编辑页面 - 点击GroupSkuView里的搜索按钮
+         *
+         * @param barcode 条形码
+         */
+        public abstract void clickGroupSearchButton(String barcode);
+
+        /**
+         * 编辑页面 - 点击TypeGift里的搜索按钮
+         *
+         * @param barcode 条形码
+         */
+        public abstract void clickTypeSearchButton(String barcode);
+
+        /**
+         * 商品列表页面 - 确认选择
+         *
+         * @param sssku 商品
+         * @param res   使用的地方
+         */
+        public abstract void selectedSkuInDialog(Sssku sssku, int res);
+
     }
 
 }

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

@@ -5,6 +5,7 @@ import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.api.ApiFactory;
 import com.xingdata.zzdpos.db.DBFactory;
 import com.xingdata.zzdpos.model.Ms;
+import com.xingdata.zzdpos.model.Sssku;
 import com.xingdata.zzdpos.ui.marketing.ms.model.Area;
 import com.xingdata.zzdpos.ui.marketing.ms.model.Group;
 import com.xingdata.zzdpos.ui.marketing.ms.model.Type;
@@ -89,6 +90,21 @@ public class MsPresenter extends MsContract.Presenter {
                 });
     }
 
+    @Override
+    public void clickGroupSearchButton(String barcode) {
+
+    }
+
+    @Override
+    public void clickTypeSearchButton(String barcode) {
+
+    }
+
+    @Override
+    public void selectedSkuInDialog(Sssku sssku, int res) {
+
+    }
+
     /**
      * 获取营销计划
      */

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

@@ -13,6 +13,7 @@ import com.blankj.utilcode.util.FragmentUtils;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.base.BaseSku;
 import com.xingdata.zzdpos.databinding.FragmentMsEditorBinding;
 import com.xingdata.zzdpos.databinding.ViewTimeDetailBinding;
 import com.xingdata.zzdpos.model.Ms;
@@ -105,6 +106,25 @@ public class EditorFragment extends BaseFragment<MsPresenter, FragmentMsEditorBi
         mAreaAdapter.setNewData(areas);
     }
 
+    /**
+     * 加载按商品优惠的商品
+     *
+     * @param sssku 商品
+     */
+    public <Sku extends BaseSku> void loadGroupSku(Sku sssku) {
+        if (mGroupView instanceof GroupSkuView) ((GroupSkuView) mGroupView).loadSssku(sssku);
+
+    }
+
+    /**
+     * TODO 加载换购的商品
+     *
+     * @param sssku 商品
+     */
+    public <Sku extends BaseSku> void loadTypeSku(Sku sssku) {
+//        if (mTypeView instanceof TypeGiftView) ((TypeGiftView) mTypeView).loadSssku(sssku);
+    }
+
     /**
      * 初始化基本信息界面
      */

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

+package com.xingdata.zzdpos.ui.marketing.ms.view;
+
+import android.view.View;
+import android.widget.AdapterView;
+
+import com.xingdata.zzdpos.C;
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.api.ApiFactory;
+import com.xingdata.zzdpos.databinding.ViewGroupCateBinding;
+import com.xingdata.zzdpos.model.Category;
+import com.xingdata.zzdpos.model.Ms;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 指定品类页面
+ */
+public class GroupCateView extends BaseGroupView<ViewGroupCateBinding> {
+
+    private int mClaPosition = 0, mGrpPosition = 0, mCatePosition = 0;
+    private List<Category> mClas, mGrps, mCates;
+    private AdapterView.OnItemSelectedListener mOnItemSelectedListener;
+
+    private long cateId;
+
+    public GroupCateView() {
+        mOnItemSelectedListener = new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+                switch (adapterView.getId()) {
+                    case R.id.ns_type_1:
+                        mClaPosition = i;
+                        mGrpPosition = 0;
+                        mCatePosition = 0;
+
+                        mViewBinding.nsType3.setVisibility(View.INVISIBLE);
+
+                        loadGrp(mClas.get(i));
+                        cateId = mClas.get(i).getSpuCateId();
+                        break;
+                    case R.id.ns_type_2:
+                        mGrpPosition = i;
+                        mCatePosition = 0;
+
+                        if (mGrps.get(i).getSpuCateId() > 0) {
+                            loadCate(mGrps.get(i));
+                            cateId = mGrps.get(i).getSpuCateId();
+                            mViewBinding.nsType3.setVisibility(View.VISIBLE);
+                        } else {
+                            cateId = mClas.get(mClaPosition).getSpuCateId();
+                            mViewBinding.nsType3.setVisibility(View.INVISIBLE);
+                        }
+
+                        break;
+                    case R.id.ns_type_3:
+                        mCatePosition = i;
+
+                        if (mCates.get(i).getSpuCateId() < 0) {
+                            cateId = mGrps.get(mGrpPosition).getSpuCateId();
+                        } else {
+                            cateId = mCates.get(i).getSpuCateId();
+                        }
+                        break;
+                }
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> adapterView) {
+            }
+        };
+    }
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.view_group_cate;
+    }
+
+
+    @Override
+    public void initView() {
+        super.initView();
+        loadCla();
+
+        mViewBinding.nsType1.setOnItemSelectedListener(mOnItemSelectedListener);
+        mViewBinding.nsType2.setOnItemSelectedListener(mOnItemSelectedListener);
+        mViewBinding.nsType3.setOnItemSelectedListener(mOnItemSelectedListener);
+    }
+
+    @Override
+    protected void setViewByMs() {
+    }
+
+    @Override
+    public boolean processMs(Ms ms) {
+        ms.setMsTouchTag2((byte) C.MS_GROUP.CATE);
+        ms.setSpuCateId((int) cateId);
+        return true;
+    }
+
+
+    /**
+     * 加载大类
+     */
+    private void loadCla() {
+        ApiFactory.Shop.queryAll().subscribe(
+                categories -> {
+                    mClas = categories;
+                    List<String> strClas = new ArrayList<>();
+                    for (int i = 0; i < categories.size(); i++) {
+                        if (mMs != null && mMs.getSpuCateId() != null && mMs.getSpuCateId() / 10000 == categories.get(i).getSpuCateId() / 10000)
+                            mClaPosition = i;
+                        strClas.add(categories.get(i).getSpuClaName());
+                    }
+                    mViewBinding.nsType1.attachDataSource(strClas);
+                    mViewBinding.nsType1.setSelectedIndex(mClaPosition);
+
+                    cateId = mClas.get(0).getSpuCateId();
+
+                    loadGrp(mClas.get(mClaPosition));
+                },
+                throwable -> {
+                });
+    }
+
+    /**
+     * 设置大类信息,加载中类
+     *
+     * @param cateCla 大类信息
+     */
+    private void loadGrp(Category cateCla) {
+        ApiFactory.Shop.queryAll(cateCla).subscribe(
+                categories -> {
+                    Category category = new Category();
+                    category.setSpuGrpName("全部");
+                    category.setSpuCateId(cateCla.getSpuCateId());
+                    categories.add(0, category);
+
+                    mGrps = categories;
+                    List<String> strGrps = new ArrayList<>();
+                    for (int j = 0; j < categories.size(); j++) {
+                        if (mMs != null && mMs.getSpuCateId() != null && mMs.getSpuCateId() / 100 == categories.get(j).getSpuCateId() / 100)
+                            mGrpPosition = j;
+                        strGrps.add(categories.get(j).getSpuGrpName());
+                    }
+                    mViewBinding.nsType2.attachDataSource(strGrps);
+                    mViewBinding.nsType2.setSelectedIndex(mGrpPosition);
+
+                    if (mGrpPosition != 0) {
+                        loadCate(mGrps.get(mGrpPosition));
+                        mViewBinding.nsType3.setVisibility(View.VISIBLE);
+                    }
+                },
+                throwable -> {
+                });
+
+    }
+
+    /**
+     * 设置中类信息,加载小类
+     *
+     * @param cateGrp 中类信息
+     */
+    private void loadCate(Category cateGrp) {
+        ApiFactory.Shop.queryAll(cateGrp).subscribe(
+                categories -> {
+                    Category category = new Category();
+                    category.setSpuCateName("全部");
+                    category.setSpuCateId(cateGrp.getSpuCateId());
+                    categories.add(0, category);
+
+                    mCates = categories;
+                    List<String> strCates = new ArrayList<>();
+                    for (int j = 0; j < categories.size(); j++) {
+                        if (mMs != null && mMs.getSpuCateId() != null && mMs.getSpuCateId().longValue() == categories.get(j).getSpuCateId())
+                            mCatePosition = j;
+                        strCates.add(categories.get(j).getSpuCateName());
+                    }
+                    mViewBinding.nsType3.attachDataSource(strCates);
+                    mViewBinding.nsType3.setSelectedIndex(mCatePosition);
+                },
+                throwable -> {
+                });
+    }
+
+}

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

@@ -6,17 +6,17 @@ import android.view.View;
 
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseSku;
 import com.xingdata.zzdpos.databinding.ViewGroupSkuBinding;
 import com.xingdata.zzdpos.model.Ms;
-import com.xingdata.zzdpos.model.Sssku;
 import com.xingdata.zzdpos.util.ConvertUtil;
 
 /**
  * 指定商品页面
  */
-public class GroupSkuView extends BaseGroupView<ViewGroupSkuBinding> {
+public class GroupSkuView<Sku extends BaseSku> extends BaseGroupView<ViewGroupSkuBinding> {
 
-    private Sssku mSssku;
+    private Sku mSku;
 
     @Override
     public int getLayoutId() {
@@ -26,11 +26,10 @@ public class GroupSkuView extends BaseGroupView<ViewGroupSkuBinding> {
     @Override
     public void initView() {
         super.initView();
-//        mViewBinding.btnSearch.setOnClickListener(view -> {
-//            TODO
-//            mPresenter.clickGroupSkuSearchButton(mViewBinding.etKeyword.getText().toString());
-//        });
-//        mViewBinding.etKeyword.requestFocus();
+        mViewBinding.etSearch.setOnClickListener(view -> {
+            mPresenter.clickGroupSearchButton(mViewBinding.etSearch.getText().toString());
+        });
+        mViewBinding.etSearch.requestFocus();
     }
 
     @SuppressLint("SetTextI18n")
@@ -38,7 +37,7 @@ public class GroupSkuView extends BaseGroupView<ViewGroupSkuBinding> {
     protected void setViewByMs() {
         if (mMs.getMsTouchTag2() == null || mMs.getMsTouchTag2() != C.MS_GROUP.SKU) return;
         mViewBinding.llProduct.setVisibility(View.VISIBLE);
-//        mViewBinding.etKeyword.setText(ConvertUtil.longToString(mMs.getSkuBarCode()));
+        mViewBinding.etSearch.setText(ConvertUtil.longToString(mMs.getSkuBarCode()));
         mViewBinding.tvProductName.setText(getString(R.string.ms_editor_group_sku_name) + mMs.getSkuName());
         mViewBinding.tvProductPrice.setText(getString(R.string.ms_editor_group_sku_price) + ConvertUtil.fenToYuan(mMs.getSkuPrice1(), true));
     }
@@ -46,18 +45,18 @@ public class GroupSkuView extends BaseGroupView<ViewGroupSkuBinding> {
     @Override
     public boolean processMs(Ms ms) {
         ms.setMsTouchTag2((byte) C.MS_GROUP.SKU);
-        if (mSssku == null && ms.getSkuId() == null) return false;
-        if (mSssku != null) ms.setSkuId(mSssku.getSkuId());
+        if (mSku == null && ms.getSkuId() == null) return false;
+        if (mSku != null) ms.setSkuId(mSku.getSkuId());
         return true;
     }
 
     @SuppressLint("SetTextI18n")
-    public void loadSssku(Sssku sssku) {
-        this.mSssku = sssku;
-        if (sssku != null) {
-//            mViewBinding.etKeyword.setText(ConvertUtil.longToString(sssku.getSpuBarcode()));
-            mViewBinding.tvProductName.setText(getString(R.string.ms_editor_group_sku_name) + sssku.getSpuName());
-            mViewBinding.tvProductPrice.setText(getString(R.string.ms_editor_group_sku_price) + ConvertUtil.fenToYuan(sssku.getSkuRetailPrice1(), true));
+    public void loadSssku(Sku sku) {
+        this.mSku = sku;
+        if (sku != null) {
+            mViewBinding.etSearch.setText(ConvertUtil.longToString(sku.getSpuBarcode()));
+            mViewBinding.tvProductName.setText(getString(R.string.ms_editor_group_sku_name) + sku.getSpuName());
+            mViewBinding.tvProductPrice.setText(getString(R.string.ms_editor_group_sku_price) + ConvertUtil.fenToYuan(sku.getSkuRetailPrice1(), true));
             mViewBinding.llProduct.setVisibility(View.VISIBLE);
         } else {
             mViewBinding.llProduct.setVisibility(View.GONE);

app/src/main/java/com/xingdata/zzdpos/ui/vip/VipPresenter.java

@@ -81,7 +81,7 @@ public class VipPresenter extends VipContract.Presenter {
     @Override
     public void saleorderQuery(Long vipID) {
         ApiFactory.Saleorder.querySaleorderByVipId(vipID,0,100).subscribe(ticketList -> {
-            mView.ticketQuerySus(ticketList);
+//            mView.ticketQuerySus(ticketList);
         }, throwable -> {
             ToastUtils.showShort(throwable.getMessage());
         });

app/src/main/java/com/xingdata/zzdpos/ui/vip/adapter/VipRechargeAdapter.java → app/src/main/java/com/xingdata/zzdpos/ui/vip/adapter/VipExpenseAdapter.java

@@ -6,6 +6,7 @@ import android.support.annotation.Nullable;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseAdapter;
 import com.xingdata.zzdpos.databinding.ItemVipRechargeItemBinding;
+import com.xingdata.zzdpos.model.Saleorder;
 import com.xingdata.zzdpos.model.VipRechargeOrder;
 
 import java.util.List;
@@ -17,11 +18,11 @@ import java.util.List;
 public class VipRechargeAdapter extends BaseAdapter<VipRechargeOrder, ItemVipRechargeItemBinding> {
     private Context mContext;
 
-    public VipRechargeAdapter(Context mContext, @Nullable List<VipRechargeOrder> data) {
+    public VipRechargeAdapter(Context mContext, @Nullable List<Saleorder> data) {
         super(R.layout.item_vip_recharge_item, data);
         this.mContext=mContext;
     }
     @Override
-    protected void convert(ItemVipRechargeItemBinding mViewBinding, VipRechargeOrder item) {
+    protected void convert(ItemVipRechargeItemBinding mViewBinding, Saleorder item) {
     }
 }

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

 <?xml version="1.0" encoding="utf-8"?>
-<layout>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/white_caocao"
-        android:orientation="horizontal">
+        android:orientation="vertical">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/editor_item_height"
-            android:gravity="center"
-            android:text="@string/ms_editor_buy"
-            android:textColor="@color/black"
-            android:textSize="@dimen/big_text_size" />
-
-        <org.angmarch.views.NiceSpinner
-            android:id="@+id/ns_type_1"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/all_spacing"
-            android:minWidth="@dimen/et_min_width_short" />
+            android:orientation="horizontal">
 
-        <org.angmarch.views.NiceSpinner
-            android:id="@+id/ns_type_2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/all_spacing"
-            android:minWidth="@dimen/et_min_width_short" />
+            <TextView
+                android:id="@+id/tv_hint"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/editor_item_height"
+                android:gravity="center"
+                android:text="@string/ms_editor_buy"
+                android:textColor="@color/black"
+                android:textSize="@dimen/big_text_size"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <org.angmarch.views.NiceSpinner
-            android:id="@+id/ns_type_3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/all_spacing"
-            android:minWidth="@dimen/et_min_width_short"
-            android:visibility="gone" />
+            <org.angmarch.views.NiceSpinner
+                android:id="@+id/ns_type_1"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/all_spacing"
+                android:layout_weight="1"
+                app:layout_constraintLeft_toRightOf="@id/tv_hint"
+                app:layout_constraintTop_toTopOf="@id/tv_hint" />
+
+            <org.angmarch.views.NiceSpinner
+                android:id="@+id/ns_type_2"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                app:layout_constraintLeft_toLeftOf="@id/ns_type_1"
+                app:layout_constraintTop_toBottomOf="@id/ns_type_1" />
+
+            <org.angmarch.views.NiceSpinner
+                android:id="@+id/ns_type_3"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:visibility="invisible"
+                app:layout_constraintLeft_toLeftOf="@id/ns_type_2"
+                app:layout_constraintTop_toBottomOf="@id/ns_type_2" />
+
+        </LinearLayout>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/all_spacing"
+            android:layout_marginTop="@dimen/all_spacing"
             android:gravity="center"
             android:text="@string/ms_editor_group_skugrp_hint"
             android:textColor="@color/black"
-            android:textSize="@dimen/big_text_size" />
+            android:textSize="@dimen/big_text_size"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/ns_type_3" />
 
     </LinearLayout>
 </layout>
\ No newline at end of file

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

@@ -39,48 +39,55 @@
                 android:src="@mipmap/but_sweep_yard" />
         </LinearLayout>
 
-        <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:layout_marginTop="@dimen/all_margin"
-            android:background="@color/gray_kongming" />
-
         <LinearLayout
+            android:id="@+id/ll_product"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-            <com.facebook.drawee.view.SimpleDraweeView
-                android:layout_width="80dp"
-                android:layout_height="80dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginStart="@dimen/all_margin" />
+            <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:layout_marginTop="@dimen/all_margin"
+                android:background="@color/gray_kongming" />
 
             <LinearLayout
-                android:id="@+id/ll_product"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/all_spacing"
-                android:orientation="vertical"
-                android:padding="@dimen/all_margin">
+                android:layout_height="wrap_content">
 
-                <TextView
-                    android:id="@+id/tv_product_name"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/ms_editor_group_sku_name" />
+                <com.facebook.drawee.view.SimpleDraweeView
+                    android:id="@+id/tv_product_pic"
+                    android:layout_width="80dp"
+                    android:layout_height="80dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginStart="@dimen/all_margin"
+                    app:placeholderImage="@mipmap/icon_goods_default" />
 
-                <TextView
-                    android:id="@+id/tv_product_price"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/all_margin"
-                    android:text="@string/ms_editor_group_sku_price" />
+                    android:layout_marginTop="@dimen/all_spacing"
+                    android:orientation="vertical"
+                    android:padding="@dimen/all_margin">
 
-            </LinearLayout>
-        </LinearLayout>
+                    <TextView
+                        android:id="@+id/tv_product_name"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/ms_editor_group_sku_name" />
 
+                    <TextView
+                        android:id="@+id/tv_product_price"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/all_margin"
+                        android:text="@string/ms_editor_group_sku_price" />
 
+                </LinearLayout>
+            </LinearLayout>
+
+        </LinearLayout>
     </LinearLayout>
 </layout>
\ No newline at end of file