Commit 4c68ac55 authored by zhang_z's avatar zhang_z

提交代码;

parent 57fab647
...@@ -26,11 +26,11 @@ public class GroupSkuView extends BaseGroupView<ViewGroupSkuBinding> { ...@@ -26,11 +26,11 @@ public class GroupSkuView extends BaseGroupView<ViewGroupSkuBinding> {
@Override @Override
public void initView() { public void initView() {
super.initView(); super.initView();
mViewBinding.btnSearch.setOnClickListener(view -> { // mViewBinding.btnSearch.setOnClickListener(view -> {
//TODO // TODO
// mPresenter.clickGroupSkuSearchButton(mViewBinding.etKeyword.getText().toString()); // mPresenter.clickGroupSkuSearchButton(mViewBinding.etKeyword.getText().toString());
}); // });
mViewBinding.etKeyword.requestFocus(); // mViewBinding.etKeyword.requestFocus();
} }
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
...@@ -38,7 +38,7 @@ public class GroupSkuView extends BaseGroupView<ViewGroupSkuBinding> { ...@@ -38,7 +38,7 @@ public class GroupSkuView extends BaseGroupView<ViewGroupSkuBinding> {
protected void setViewByMs() { protected void setViewByMs() {
if (mMs.getMsTouchTag2() == null || mMs.getMsTouchTag2() != C.MS_GROUP.SKU) return; if (mMs.getMsTouchTag2() == null || mMs.getMsTouchTag2() != C.MS_GROUP.SKU) return;
mViewBinding.llProduct.setVisibility(View.VISIBLE); mViewBinding.llProduct.setVisibility(View.VISIBLE);
mViewBinding.etKeyword.setText(ConvertUtil.longToString(mMs.getSkuBarCode())); // mViewBinding.etKeyword.setText(ConvertUtil.longToString(mMs.getSkuBarCode()));
mViewBinding.tvProductName.setText(getString(R.string.ms_editor_group_sku_name) + mMs.getSkuName()); 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)); mViewBinding.tvProductPrice.setText(getString(R.string.ms_editor_group_sku_price) + ConvertUtil.fenToYuan(mMs.getSkuPrice1(), true));
} }
...@@ -55,7 +55,7 @@ public class GroupSkuView extends BaseGroupView<ViewGroupSkuBinding> { ...@@ -55,7 +55,7 @@ public class GroupSkuView extends BaseGroupView<ViewGroupSkuBinding> {
public void loadSssku(Sssku sssku) { public void loadSssku(Sssku sssku) {
this.mSssku = sssku; this.mSssku = sssku;
if (sssku != null) { if (sssku != null) {
mViewBinding.etKeyword.setText(ConvertUtil.longToString(sssku.getSpuBarcode())); // mViewBinding.etKeyword.setText(ConvertUtil.longToString(sssku.getSpuBarcode()));
mViewBinding.tvProductName.setText(getString(R.string.ms_editor_group_sku_name) + sssku.getSpuName()); 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)); mViewBinding.tvProductPrice.setText(getString(R.string.ms_editor_group_sku_price) + ConvertUtil.fenToYuan(sssku.getSkuRetailPrice1(), true));
mViewBinding.llProduct.setVisibility(View.VISIBLE); mViewBinding.llProduct.setVisibility(View.VISIBLE);
......
...@@ -288,13 +288,15 @@ ...@@ -288,13 +288,15 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:background="@color/white_caocao">
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/rl_group" android:id="@+id/rl_group"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" /> android:layout_weight="1"
android:background="@color/gray_zhouyu" />
<FrameLayout <FrameLayout
android:id="@+id/f_group" android:id="@+id/f_group"
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/transparent"> android:background="@color/white_caocao">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/transparent" android:background="@color/white_caocao"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
...@@ -18,31 +18,25 @@ ...@@ -18,31 +18,25 @@
<org.angmarch.views.NiceSpinner <org.angmarch.views.NiceSpinner
android:id="@+id/ns_type_1" android:id="@+id/ns_type_1"
style="@style/editor_edit"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_spacing" android:layout_marginStart="@dimen/all_spacing"
android:minWidth="@dimen/et_min_width_short" android:minWidth="@dimen/et_min_width_short" />
app:backgroundSelector="@drawable/selector_white_background_stroke_2" />
<org.angmarch.views.NiceSpinner <org.angmarch.views.NiceSpinner
android:id="@+id/ns_type_2" android:id="@+id/ns_type_2"
style="@style/editor_edit"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_spacing" android:layout_marginStart="@dimen/all_spacing"
android:minWidth="@dimen/et_min_width_short" android:minWidth="@dimen/et_min_width_short" />
app:backgroundSelector="@drawable/selector_white_background_stroke_2" />
<org.angmarch.views.NiceSpinner <org.angmarch.views.NiceSpinner
android:id="@+id/ns_type_3" android:id="@+id/ns_type_3"
style="@style/editor_edit"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_spacing" android:layout_marginStart="@dimen/all_spacing"
android:minWidth="@dimen/et_min_width_short" android:minWidth="@dimen/et_min_width_short"
android:visibility="gone" android:visibility="gone" />
app:backgroundSelector="@drawable/selector_white_background_stroke_2" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment