From 2c800dc7008f2ad504cd5530a28b424fbf846ec4 Mon Sep 17 00:00:00 2001 From: wenfei Date: Tue, 1 Jul 2025 17:28:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E5=B7=A5=E5=8D=95=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=9C=AC=E5=9C=B0=E4=BF=9D=E5=AD=98=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E5=90=8E=E8=B7=B3=E8=BD=AC=E5=88=B0=E7=BC=BA=E9=99=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dywoa/ui/activity/sbxdjgl/CJFragment.java | 23 +++++++++++-------- .../ui/activity/sbxdjgl/MjApplyActivity.kt | 2 ++ .../ui/activity/sbxdjgl/SQxgdlrfActivity.java | 4 ++++ .../ui/activity/sbxj/XjMjApplyActivity.kt | 2 ++ gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 3 ++- 6 files changed, 25 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/CJFragment.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/CJFragment.java index 0103e05..14c766a 100755 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/CJFragment.java +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/CJFragment.java @@ -173,20 +173,18 @@ public class CJFragment extends BaseFragment { "严重泄漏".equals(text)||"液位偏低".equals(text)||"油位偏低".equals(text)||"常用源及备用源异常".equals(text)){ showToast("采集结果数据存在异常，请填写分析内容"); llFxnr.setVisibility(View.VISIBLE); -// View view = sv.getChildAt(sv.getChildCount() - 1); -// int height = view.getBottom(); -// sv.post(new Runnable() { -// @Override -// public void run() { -// sv.smoothScrollTo(0, height); -// } -// }); sv.post(new Runnable() { @Override public void run() { sv.fullScroll(View.FOCUS_DOWN); } }); +// sv.post(new Runnable() { +// @Override +// public void run() { +// sv.scrollTo(0, sv.getBottom()); +// } +// }); } } }); @@ -216,7 +214,14 @@ public class CJFragment extends BaseFragment { if (jg > cxsx || jg < cxxx || jg > bjsx || jg < bjxx) { showToast("数据采集结果存在异常、超限，请填写分析内容"); llFxnr.setVisibility(View.VISIBLE); - sv.fullScroll(View.FOCUS_DOWN); + //sv.fullScroll(View.FOCUS_DOWN); + //sv.scrollTo(0, sv.getBottom()); + sv.post(new Runnable() { + @Override + public void run() { + sv.scrollTo(0, sv.getBottom()); + } + }); } else { llFxnr.setVisibility(View.GONE); } diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/MjApplyActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/MjApplyActivity.kt index 8c854d0..36c14a8 100755 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/MjApplyActivity.kt +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/MjApplyActivity.kt @@ -472,12 +472,14 @@ class MjApplyActivity : BaseActivityOaToolbarViewBinding adapter.notifyDataSetChanged() binding.tvNodata.visibility= View.VISIBLE binding.lv.visibility= View.GONE + binding.tvLjzrws.text="0" } }else { datas.clear() adapter.notifyDataSetChanged() binding.tvNodata.visibility= View.VISIBLE binding.lv.visibility=View.GONE + binding.tvLjzrws.text="0" } } } diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SQxgdlrfActivity.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SQxgdlrfActivity.java index ca1a8d0..476192a 100755 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SQxgdlrfActivity.java +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SQxgdlrfActivity.java @@ -302,6 +302,10 @@ public class SQxgdlrfActivity extends BaseActivity { if (savaData()) { showToast("保存成功"); clearView(); + Intent intent = new Intent(SQxgdlrfActivity.this, QxgdListActivity.class); + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); + startActivity(intent); + finish(); } } } else { diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XjMjApplyActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XjMjApplyActivity.kt index 3f8a3f5..f21a6a1 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XjMjApplyActivity.kt +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XjMjApplyActivity.kt @@ -474,12 +474,14 @@ class XjMjApplyActivity : BaseActivityOaToolbarViewBinding