diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/mall/GoodsDetailActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/mall/GoodsDetailActivity.java index 57a6929..9f920c9 100644 --- a/app/src/main/java/com/tairui/industrial_operation/ui/mall/GoodsDetailActivity.java +++ b/app/src/main/java/com/tairui/industrial_operation/ui/mall/GoodsDetailActivity.java @@ -43,7 +43,7 @@ public class GoodsDetailActivity extends BaseActivity( + new BottomDialog("", "", new OnBindView( R.layout.layout_dialog_baozhang) { @Override public void onBind(BottomDialog dialog, View v) { @@ -55,7 +55,7 @@ public class GoodsDetailActivity extends BaseActivity( + new BottomDialog("", "", new OnBindView( R.layout.layout_dialog_canshu) { @Override public void onBind(BottomDialog dialog, View v) { @@ -64,12 +64,44 @@ public class GoodsDetailActivity extends BaseActivity setGone(binding.suyuanmaLayout, true)); + binding.suyuanmaLayout.setOnClickListener(view -> setGone(binding.suyuanmaLayout, false)); + binding.btnBuy.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + new BottomDialog("", "", new OnBindView( + R.layout.layout_dialog_guige) { + @Override + public void onBind(BottomDialog dialog, View v) { + v.setOnClickListener(v1 -> dialog.dismiss()); + } + }).setBackgroundColor(getResColor(R.color.white)).show(); + } + }); + binding.wuliu.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + new BottomDialog("", "", new OnBindView( + R.layout.layout_dialog_wuliu) { + @Override + public void onBind(BottomDialog dialog, View v) { + v.setOnClickListener(v1 -> dialog.dismiss()); + } + }).setBackgroundColor(getResColor(R.color.white)).show(); + } + }); } @Override protected void onApplyData() { } - private void requestGoodsDetailInfo(String goodsId) { + @Override + public void onBackPressed() { + if (binding.suyuanmaLayout.getVisibility() == View.VISIBLE) { + setGone(binding.suyuanmaLayout, false); + } else { + super.onBackPressed(); + } } } diff --git a/app/src/main/res/drawable/bg_container_f5_gray_border_raduis_10.xml b/app/src/main/res/drawable/bg_container_f5_gray_border_raduis_10.xml new file mode 100644 index 0000000..0d7605a --- /dev/null +++ b/app/src/main/res/drawable/bg_container_f5_gray_border_raduis_10.xml @@ -0,0 +1,15 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_container_f5_gray_border_raduis_5.xml b/app/src/main/res/drawable/bg_container_f5_gray_border_raduis_5.xml new file mode 100644 index 0000000..d4544e7 --- /dev/null +++ b/app/src/main/res/drawable/bg_container_f5_gray_border_raduis_5.xml @@ -0,0 +1,15 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_container_f5_raduis_5.xml b/app/src/main/res/drawable/bg_container_f5_raduis_5.xml new file mode 100644 index 0000000..00f2da4 --- /dev/null +++ b/app/src/main/res/drawable/bg_container_f5_raduis_5.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_container_f5_top_raduis_10.xml b/app/src/main/res/drawable/bg_container_f5_top_raduis_10.xml new file mode 100644 index 0000000..ea2cd69 --- /dev/null +++ b/app/src/main/res/drawable/bg_container_f5_top_raduis_10.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_container_green_raduis_5.xml b/app/src/main/res/drawable/bg_container_green_raduis_5.xml new file mode 100644 index 0000000..ccb6d29 --- /dev/null +++ b/app/src/main/res/drawable/bg_container_green_raduis_5.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_container_light_green_green_border_raduis_5.xml b/app/src/main/res/drawable/bg_container_light_green_green_border_raduis_5.xml new file mode 100644 index 0000000..1fdf64e --- /dev/null +++ b/app/src/main/res/drawable/bg_container_light_green_green_border_raduis_5.xml @@ -0,0 +1,15 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_container_white_top_raduis_10.xml b/app/src/main/res/drawable/bg_container_white_top_raduis_10.xml new file mode 100644 index 0000000..d562c36 --- /dev/null +++ b/app/src/main/res/drawable/bg_container_white_top_raduis_10.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_goods_detail.xml b/app/src/main/res/layout/activity_goods_detail.xml index acfdb5b..b98c8c9 100644 --- a/app/src/main/res/layout/activity_goods_detail.xml +++ b/app/src/main/res/layout/activity_goods_detail.xml @@ -92,6 +92,7 @@ + + + + @@ -401,4 +416,187 @@ app:layout_constraintTop_toBottomOf="@id/statusbar" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_dialog_guige.xml b/app/src/main/res/layout/layout_dialog_guige.xml new file mode 100644 index 0000000..ddd49c8 --- /dev/null +++ b/app/src/main/res/layout/layout_dialog_guige.xml @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_dialog_wuliu.xml b/app/src/main/res/layout/layout_dialog_wuliu.xml new file mode 100644 index 0000000..f0c4df1 --- /dev/null +++ b/app/src/main/res/layout/layout_dialog_wuliu.xml @@ -0,0 +1,268 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-xxhdpi/ic_add_green_small.png b/app/src/main/res/mipmap-xxhdpi/ic_add_green_small.png new file mode 100644 index 0000000..2441f68 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_add_green_small.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_address_end.png b/app/src/main/res/mipmap-xxhdpi/ic_address_end.png new file mode 100644 index 0000000..1ceb908 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_address_end.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_address_green.png b/app/src/main/res/mipmap-xxhdpi/ic_address_green.png new file mode 100644 index 0000000..2803d03 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_address_green.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_address_start.png b/app/src/main/res/mipmap-xxhdpi/ic_address_start.png new file mode 100644 index 0000000..5afcf81 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_address_start.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_copy_code.png b/app/src/main/res/mipmap-xxhdpi/ic_copy_code.png new file mode 100644 index 0000000..fa2c3bf Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_copy_code.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_copy_link.png b/app/src/main/res/mipmap-xxhdpi/ic_copy_link.png new file mode 100644 index 0000000..da09d2c Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_copy_link.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_download_barcode.png b/app/src/main/res/mipmap-xxhdpi/ic_download_barcode.png new file mode 100644 index 0000000..2acbb33 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_download_barcode.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_edit_gray_small.png b/app/src/main/res/mipmap-xxhdpi/ic_edit_gray_small.png new file mode 100644 index 0000000..d08a84a Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_edit_gray_small.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_share_douyin.png b/app/src/main/res/mipmap-xxhdpi/ic_share_douyin.png new file mode 100644 index 0000000..255bc4c Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_share_douyin.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_share_wx.png b/app/src/main/res/mipmap-xxhdpi/ic_share_wx.png new file mode 100644 index 0000000..19c0e8c Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_share_wx.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/pic_goods_detail_7.png b/app/src/main/res/mipmap-xxhdpi/pic_goods_detail_7.png new file mode 100644 index 0000000..ea47ea2 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/pic_goods_detail_7.png differ