Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleEditFragment.java

@@ -84,8 +84,8 @@ public class BaleEditFragment extends BaseFragment<BalePresenter, FragmentBaleEd
         mViewBinding.rvShopItemList.addItemDecoration(new DividerItemDecoration(getActivity(),
                 DividerItemDecoration.VERTICAL));
         mViewBinding.rvShopItemList.setAdapter(queryShopAdapter);
-        queryShopAdapter.setOnItemClickListener((adapter, view, position) -> clickProduct
-                (queryShopAdapter.getData().get(position)));
+//        queryShopAdapter.setOnItemClickListener((adapter, view, position) -> clickProduct
+//                (queryShopAdapter.getData().get(position)));
 
         editFragmentImgShopAdapter = new EditFragmentImgShopAdapter(R.layout
                 .item_bale_editfragment_img, listData);
@@ -219,6 +219,7 @@ public class BaleEditFragment extends BaseFragment<BalePresenter, FragmentBaleEd
             super.convert(helper, item);
 
             ItemBaleEditBinding mItemViewBinding = (ItemBaleEditBinding) helper.mViewBinding;
+            mItemViewBinding.tvGoodsSize.setText("规格/" + item.getSpuUnitName());
             if (item.isEdit()) {
                 mItemViewBinding.llUpDown.setVisibility(View.GONE);
                 mItemViewBinding.llEdit.setVisibility(View.VISIBLE);

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

@@ -11,10 +11,9 @@
     <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
                                                  xmlns:card_view="http://schemas.android.com/apk/res-auto"
                                                  android:layout_width="match_parent"
-                                                 android:layout_height="180dp"
+                                                 android:layout_height="150dp"
                                                  android:background="@color/white"
-                                                 android:foreground="?android:attr/selectableItemBackground"
-                                                 android:padding="@dimen/all_margin">
+                                                 android:foreground="?android:attr/selectableItemBackground">
 
         <!--<com.xingdata.zzdhd.ui.manager.bale.view.NineGridImageView-->
         <!--android:id="@+id/iv_pic"-->
@@ -31,14 +30,14 @@
 
         <com.xingdata.zzdpos.ui.manage.bale.view.TribeAvatar
             android:id="@+id/iv_pic"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
             android:layout_margin="@dimen/all_margin"
             android:background="@drawable/shape_black"
             android:padding="2dp"
-            card_view:layout_constraintBottom_toBottomOf="parent"
             card_view:layout_constraintHorizontal_weight="1"
             card_view:layout_constraintLeft_toLeftOf="parent"
+            card_view:layout_constraintBottom_toBottomOf="parent"
             card_view:layout_constraintRight_toLeftOf="@id/ll_shop_message"
             card_view:layout_constraintTop_toTopOf="parent">
 
@@ -50,6 +49,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:orientation="vertical"
+            android:gravity="center"
             android:padding="@dimen/all_padding"
             card_view:layout_constraintBottom_toBottomOf="parent"
             card_view:layout_constraintHorizontal_weight="1.5"

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

@@ -11,7 +11,7 @@
 
     <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
                                                  android:layout_width="match_parent"
-                                                 android:layout_height="180dp"
+                                                 android:layout_height="150dp"
                                                  android:layout_marginBottom="@dimen/all_padding"
                                                  android:foreground="?android:attr/selectableItemBackground"
                                                  android:padding="@dimen/all_margin">
@@ -109,6 +109,7 @@
                 android:layout_marginEnd="@dimen/all_margin"
                 android:layout_weight="1"
                 android:background="@color/white"
+                android:onClick="@{onClick}"
                 android:src="@mipmap/but_reduce"/>
 
 
@@ -138,6 +139,7 @@
                 android:layout_marginStart="@dimen/all_margin"
                 android:layout_weight="1"
                 android:background="@color/white"
+                android:onClick="@{onClick}"
                 android:src="@mipmap/but_add"
                 android:visibility="visible"
                 tools:layout_editor_absoluteX="666dp"
@@ -185,9 +187,9 @@
                 android:id="@+id/btn_edit_ok"
                 android:layout_width="55dp"
                 android:layout_height="27dp"
-                android:onClick="@{onClick}"
                 android:layout_marginStart="@dimen/all_margin"
                 android:background="@drawable/shape_black_solid_blue"
+                android:onClick="@{onClick}"
                 android:text="确定"
                 android:textColor="@color/white"
                 />
@@ -198,7 +200,7 @@
             style="@style/other_select_smallstyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/all_padding"
+            android:layout_marginTop="@dimen/all_margin"
             android:text="进价："
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="@id/tv_no_hint"

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

@@ -48,8 +48,8 @@
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:gravity="left"
-                android:lines="2"
-                android:maxLines="2"
+                android:lines="1"
+                android:maxLines="1"
                 android:text="生日蛋糕组装礼盒带增补品啊是的那是代表开机速度卡角度看啦啦；等哈阿大大"
                 android:textColor="@color/black"
                 android:textSize="@dimen/all_text_size"