From da81e4b577413cf7039a333b4ef51306aac87401 Mon Sep 17 00:00:00 2001 From: liup <1454939542@qq.com> Date: Mon, 23 Dec 2024 16:06:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/other.xml | 340 ++++++++++++++++++ app/build.gradle | 1 + .../bnframework/common/glide/GlideUtil.java | 29 ++ .../adapter/goods/CloudGoodsAdapter.java | 4 +- .../newui/adapter/goods/HomeGoodsAdapter.java | 3 +- .../adapter/goods/LocalGoodsAdapter.java | 3 +- .../fragment/goods/LocalGoodsHFragment.java | 4 +- .../layout/new/layout/fragment_home_mains.xml | 16 +- .../layout/svg/drawable/home_caiping_ic.xml | 66 ++++ .../layout/svg/drawable/home_classify_ic.xml | 9 + .../res/layout/svg/drawable/home_log_ic.xml | 15 + .../res/layout/svg/drawable/home_order_ic.xml | 12 + .../layout/svg/drawable/home_setting_ic.xml | 9 + .../res/layout/svg/drawable/ic_delete_x.xml | 9 + .../res/layout/svg/drawable/ic_logout2.xml | 9 + .../main/res/layout/svg/drawable/ic_silos.xml | 12 + .../res/layout/svg/drawable/ic_update.xml | 9 + 17 files changed, 537 insertions(+), 13 deletions(-) create mode 100644 .idea/other.xml create mode 100644 app/src/main/res/layout/svg/drawable/home_caiping_ic.xml create mode 100644 app/src/main/res/layout/svg/drawable/home_classify_ic.xml create mode 100644 app/src/main/res/layout/svg/drawable/home_log_ic.xml create mode 100644 app/src/main/res/layout/svg/drawable/home_order_ic.xml create mode 100644 app/src/main/res/layout/svg/drawable/home_setting_ic.xml create mode 100644 app/src/main/res/layout/svg/drawable/ic_delete_x.xml create mode 100644 app/src/main/res/layout/svg/drawable/ic_logout2.xml create mode 100644 app/src/main/res/layout/svg/drawable/ic_silos.xml create mode 100644 app/src/main/res/layout/svg/drawable/ic_update.xml diff --git a/.idea/other.xml b/.idea/other.xml new file mode 100644 index 00000000..b45a6e02 --- /dev/null +++ b/.idea/other.xml @@ -0,0 +1,340 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 4a254f62..dce49e72 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -67,6 +67,7 @@ android { jni.srcDirs = []//禁止gradle 自动编译，使用已经编译好的So库 jniLibs.srcDirs = ['libs']//指向要使用的库文件//的路径，前边的是自己项目的，后边的是第三方的so 'src/main/jniLibs', res.srcDirs = [ + 'src/main/res/layout/svg', 'src/main/res/layout/dialog', 'src/main/res/layout/datatab', 'src/main/res/layout/item', diff --git a/app/src/main/java/com/bonait/bnframework/common/glide/GlideUtil.java b/app/src/main/java/com/bonait/bnframework/common/glide/GlideUtil.java index 208b6e98..3dcb5604 100644 --- a/app/src/main/java/com/bonait/bnframework/common/glide/GlideUtil.java +++ b/app/src/main/java/com/bonait/bnframework/common/glide/GlideUtil.java @@ -95,6 +95,35 @@ public class GlideUtil { .into(imageView); } + public static void showImageById(Context context, ImageView imageView,int placeId) { + if (context == null) { + return; + } + + GlideApp.with(context) + .load(placeId) + .addListener(new RequestListener() { + @Override + public boolean onLoadFailed(@Nullable GlideException e, Object model, + Target target, boolean isFirstResource) { + return false; + } + + @Override + public boolean onResourceReady(Drawable resource, Object model, + Target target, DataSource dataSource, + boolean isFirstResource) { + if (imageView == null) { + return false; + } + imageView.setBackground(null); + return false; + } + }) + .transition(DrawableTransitionOptions.withCrossFade(CROSS_FADE_DURATION)) + .into(imageView); + } + public static void showImageWithRadius(Context context, String path, ImageView imageView,int placeId,int radius) { if (context == null||path==null) { return; diff --git a/app/src/main/java/com/bonait/bnframework/newui/adapter/goods/CloudGoodsAdapter.java b/app/src/main/java/com/bonait/bnframework/newui/adapter/goods/CloudGoodsAdapter.java index ba538de7..ae4ead75 100644 --- a/app/src/main/java/com/bonait/bnframework/newui/adapter/goods/CloudGoodsAdapter.java +++ b/app/src/main/java/com/bonait/bnframework/newui/adapter/goods/CloudGoodsAdapter.java @@ -10,6 +10,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.apkfuns.logutils.LogUtils; import com.bonait.bnframework.R; +import com.bonait.bnframework.common.glide.GlideUtil; import com.bonait.bnframework.newui.adapter.base.BaseAdapter; import com.bonait.bnframework.common.db.mode.BPA_GOODS; import com.bonait.bnframework.common.db.util.GoodsDBUtil; @@ -53,7 +54,8 @@ public abstract class CloudGoodsAdapter extends BaseAdapter0?false:true); diff --git a/app/src/main/java/com/bonait/bnframework/newui/fragment/goods/LocalGoodsHFragment.java b/app/src/main/java/com/bonait/bnframework/newui/fragment/goods/LocalGoodsHFragment.java index 928a08d5..d5335d1b 100644 --- a/app/src/main/java/com/bonait/bnframework/newui/fragment/goods/LocalGoodsHFragment.java +++ b/app/src/main/java/com/bonait/bnframework/newui/fragment/goods/LocalGoodsHFragment.java @@ -194,7 +194,7 @@ public class LocalGoodsHFragment extends BaseFragment { NewToastUtil.getInstance().showToast("点击过快！"); return; } - AlertDialogUtils.showTipDialog((AppCompatActivity) getActivity(), "请确认", "确认上传全部分类、全部商品、全部工序信息？上传将会覆盖云端商品，请确认", new AlertDialogUtils.DialogClickListener() { + AlertDialogUtils.showTipDialog((AppCompatActivity) getActivity(), "请确认", "确认上传选中商品？上传将会覆盖云端商品，请确认", new AlertDialogUtils.DialogClickListener() { @Override public void onConfirm() { List res = goodsList.stream().filter(p->p.status==1).collect(Collectors.toList()); @@ -222,7 +222,7 @@ public class LocalGoodsHFragment extends BaseFragment { }); viewBinding.deleteAll.setVisibility(isEdit?View.VISIBLE:View.GONE); viewBinding.deleteAll.setOnClickListener(v->{ - AlertDialogUtils.showTipDialog((AppCompatActivity) getActivity(), "请确认", "确认删除全部分类、全部商品、全部工序信息？", new AlertDialogUtils.DialogClickListener() { + AlertDialogUtils.showTipDialog((AppCompatActivity) getActivity(), "请确认", "确认删除选中商品？", new AlertDialogUtils.DialogClickListener() { @Override public void onConfirm() { if(ConfigName.getInstance().isFastClick()){ diff --git a/app/src/main/res/layout/new/layout/fragment_home_mains.xml b/app/src/main/res/layout/new/layout/fragment_home_mains.xml index 195e7266..1fd3c056 100644 --- a/app/src/main/res/layout/new/layout/fragment_home_mains.xml +++ b/app/src/main/res/layout/new/layout/fragment_home_mains.xml @@ -44,7 +44,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:src="@mipmap/home_classify_ic" /> + android:src="@drawable/home_classify_ic" /> + android:src="@drawable/home_caiping_ic" /> + android:src="@drawable/ic_silos" /> + android:src="@drawable/home_log_ic" /> + android:src="@drawable/home_order_ic" /> + android:src="@drawable/home_setting_ic" /> + android:src="@drawable/ic_update" /> + android:src="@drawable/ic_logout2" /> + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/svg/drawable/home_classify_ic.xml b/app/src/main/res/layout/svg/drawable/home_classify_ic.xml new file mode 100644 index 00000000..7607a9ce --- /dev/null +++ b/app/src/main/res/layout/svg/drawable/home_classify_ic.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/svg/drawable/home_log_ic.xml b/app/src/main/res/layout/svg/drawable/home_log_ic.xml new file mode 100644 index 00000000..fbae9da4 --- /dev/null +++ b/app/src/main/res/layout/svg/drawable/home_log_ic.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/layout/svg/drawable/home_order_ic.xml b/app/src/main/res/layout/svg/drawable/home_order_ic.xml new file mode 100644 index 00000000..2a2df805 --- /dev/null +++ b/app/src/main/res/layout/svg/drawable/home_order_ic.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/svg/drawable/home_setting_ic.xml b/app/src/main/res/layout/svg/drawable/home_setting_ic.xml new file mode 100644 index 00000000..af05754a --- /dev/null +++ b/app/src/main/res/layout/svg/drawable/home_setting_ic.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/svg/drawable/ic_delete_x.xml b/app/src/main/res/layout/svg/drawable/ic_delete_x.xml new file mode 100644 index 00000000..81eb25f1 --- /dev/null +++ b/app/src/main/res/layout/svg/drawable/ic_delete_x.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/svg/drawable/ic_logout2.xml b/app/src/main/res/layout/svg/drawable/ic_logout2.xml new file mode 100644 index 00000000..31d4d41e --- /dev/null +++ b/app/src/main/res/layout/svg/drawable/ic_logout2.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/svg/drawable/ic_silos.xml b/app/src/main/res/layout/svg/drawable/ic_silos.xml new file mode 100644 index 00000000..6f6b5a70 --- /dev/null +++ b/app/src/main/res/layout/svg/drawable/ic_silos.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/svg/drawable/ic_update.xml b/app/src/main/res/layout/svg/drawable/ic_update.xml new file mode 100644 index 00000000..8705e92c --- /dev/null +++ b/app/src/main/res/layout/svg/drawable/ic_update.xml @@ -0,0 +1,9 @@ + + +