From dafb154022b34c9b2d7bd220b486fcca09683d58 Mon Sep 17 00:00:00 2001 From: wenfei Date: Wed, 30 Apr 2025 18:01:21 +0800 Subject: [PATCH] 1.2.5 release --- app/build.gradle | 4 +- .../dywoa/adapter/SisRealDataAdapter.kt | 46 +++++++++ .../com/rehome/dywoa/bean/KksDataBean.java | 10 ++ .../com/rehome/dywoa/bean/SisBaseBean.java | 40 ++++++++ .../dywoa/ui/activity/KksSearchActivity.kt | 16 ++++ .../rehome/dywoa/ui/activity/LoginActivity.kt | 6 +- .../dywoa/ui/activity/sbxdjgl/CJFragment.java | 92 +++++++++++++----- .../ui/activity/sbxdjgl/SjcjFragment.java | 94 ++++++++++--------- .../main/res/layout/activity_kks_search.xml | 51 +++++----- .../main/res/layout/adapter_sis_real_data.xml | 77 +++++++++++++++ app/src/main/res/layout/fragment_cj.xml | 2 + app/src/main/res/values/styles.xml | 13 ++- 12 files changed, 359 insertions(+), 92 deletions(-) create mode 100644 app/src/main/java/com/rehome/dywoa/adapter/SisRealDataAdapter.kt create mode 100644 app/src/main/java/com/rehome/dywoa/bean/SisBaseBean.java create mode 100644 app/src/main/res/layout/adapter_sis_real_data.xml diff --git a/app/build.gradle b/app/build.gradle index e5a9c63..854098f 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.rehome.dywoa" minSdk 24 targetSdk 36 - versionCode 25 - versionName "1.2.4" + versionCode 26 + versionName "1.2.5" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" //每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装 diff --git a/app/src/main/java/com/rehome/dywoa/adapter/SisRealDataAdapter.kt b/app/src/main/java/com/rehome/dywoa/adapter/SisRealDataAdapter.kt new file mode 100644 index 0000000..7c40124 --- /dev/null +++ b/app/src/main/java/com/rehome/dywoa/adapter/SisRealDataAdapter.kt @@ -0,0 +1,46 @@ +package com.rehome.dywoa.adapter + + +import android.content.Context +import android.text.TextUtils +import android.view.LayoutInflater +import android.view.ViewGroup +import com.rehome.dywoa.base.BaseViewBindingAdapter +import com.rehome.dywoa.bean.SisBaseBean +import com.rehome.dywoa.bean.XjZhTjBean +import com.rehome.dywoa.databinding.AdapterSisRealDataBinding + +class SisRealDataAdapter(var context: Context, + var data: MutableList) : BaseViewBindingAdapter(context) { + override fun getCount(): Int { + return data.count() + } + + override fun getItem(position: Int): Any { + return data[position] + } + + override fun getItemId(position: Int): Long { + return position.toLong() + } + + override fun getBinding( + inflater: LayoutInflater, + parent: ViewGroup? + ) = AdapterSisRealDataBinding.inflate(inflater, parent, false) + + override fun handleData(position: Int, binding: AdapterSisRealDataBinding) { + val item: SisBaseBean = data[position] + binding.tvSisBh.text = item.sisno + + binding.tvSisMc.text = item.sisDesc + if(TextUtils.isEmpty(item.dw)){ + binding.tvSisRealValue.text = item.sisValue + }else{ + binding.tvSisRealValue.text = buildString { + append(item.sisValue) + append(item.dw) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/rehome/dywoa/bean/KksDataBean.java b/app/src/main/java/com/rehome/dywoa/bean/KksDataBean.java index 75ab71b..de5f26b 100755 --- a/app/src/main/java/com/rehome/dywoa/bean/KksDataBean.java +++ b/app/src/main/java/com/rehome/dywoa/bean/KksDataBean.java @@ -23,6 +23,8 @@ public class KksDataBean extends BaseListBean{ private String parentCode; private String sisno; + private List sisDataList; + public String getId() { return id; } @@ -86,5 +88,13 @@ public class KksDataBean extends BaseListBean{ public void setSisno(String sisno) { this.sisno = sisno; } + + public List getSisDataList() { + return sisDataList; + } + + public void setSisDataList(List sisDataList) { + this.sisDataList = sisDataList; + } } } diff --git a/app/src/main/java/com/rehome/dywoa/bean/SisBaseBean.java b/app/src/main/java/com/rehome/dywoa/bean/SisBaseBean.java new file mode 100644 index 0000000..2384d55 --- /dev/null +++ b/app/src/main/java/com/rehome/dywoa/bean/SisBaseBean.java @@ -0,0 +1,40 @@ +package com.rehome.dywoa.bean; + +public class SisBaseBean { + private String sisno; + private String sisDesc; + private String sisValue; + private String dw; + + public String getSisno() { + return sisno; + } + + public void setSisno(String sisno) { + this.sisno = sisno; + } + + public String getSisDesc() { + return sisDesc; + } + + public void setSisDesc(String sisDesc) { + this.sisDesc = sisDesc; + } + + public String getSisValue() { + return sisValue; + } + + public void setSisValue(String sisValue) { + this.sisValue = sisValue; + } + + public String getDw() { + return dw; + } + + public void setDw(String dw) { + this.dw = dw; + } +} diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/KksSearchActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/KksSearchActivity.kt index 16ecb6c..f1a817a 100755 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/KksSearchActivity.kt +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/KksSearchActivity.kt @@ -6,8 +6,12 @@ import android.view.View import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts import com.rehome.dywoa.Contans +import com.rehome.dywoa.adapter.SisRealDataAdapter +import com.rehome.dywoa.adapter.XjZhTjAdapter import com.rehome.dywoa.base.BaseActivityOaToolbarViewBinding import com.rehome.dywoa.bean.KksDataBean +import com.rehome.dywoa.bean.SisBaseBean +import com.rehome.dywoa.bean.XjZhTjBean import com.rehome.dywoa.databinding.ActivityKksSearchBinding import com.rehome.dywoa.utils.GsonUtils import com.rehome.dywoa.utils.HttpListener @@ -19,6 +23,10 @@ import com.yolanda.nohttp.rest.Response class KksSearchActivity : BaseActivityOaToolbarViewBinding() { +// SisRealDataAdapter adapter_sis_real_data + private lateinit var adapter: SisRealDataAdapter + private var datas: MutableList = mutableListOf() + private var qrCodeStrSearch: String? = null private lateinit var launcherResultQRCode: ActivityResultLauncher @@ -35,6 +43,9 @@ class KksSearchActivity : BaseActivityOaToolbarViewBinding if(qrCodeStrSearch!=null){ val intent = Intent(context, KksSearchGongDanActivity::class.java) @@ -141,6 +152,11 @@ class KksSearchActivity : BaseActivityOaToolbarViewBinding0){ + datas.clear() + datas.addAll(row.sisDataList) + adapter.notifyDataSetChanged() + } qrCodeStrSearch = row.kksCode }else { binding.tvNodata.visibility=View.VISIBLE diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt index cc98b73..70022fb 100755 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt @@ -209,8 +209,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { // binding.etPassword.setText("A000000a.") //ceshi1 - binding.etUsername.setText("ceshi1") - binding.etPassword.setText("A000000a.") +// binding.etUsername.setText("ceshi1") +// binding.etPassword.setText("A000000a.") //瑞洪 RH00002/王总 RH00002/chao工 RH00003/范红波 @@ -635,7 +635,7 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { //val json: String = "Ms97MbjVaypr+CF04BTQ+Y7hbYp+orLZbXM2u+I+PZKSPSSaqR1dcuM3tsig3UpJ7s2qEw5DsJcVd0t4eJM79ABUFWW/0Nplhx37+6jR2YVaSJgA30L0O2FbuyG7SOjP0qfISNaN1L8eC3a7W5oFPpHxkZdxUf5sxJIQHA2c6lCI+Mo/BUgU1MgTIjM3puiWx99mvxOyl9k2oLZUjcjMOygzNUYYD21SQYQ6dtvdVz3iAtqeJ+0EVCtScPXePG/CH/s0Ti/VS54/KSrlRVfdn5s2pHqw5fd2BZX+ZGtIWTGpWb+Wt1ZtrPXPdv/r1Zx84Zcw0EqKicieeuYpfUH+eg=="; val url = Contans.IP + Contans.APPLOGINRSA - //val url = "http://192.168.2.115:8601/" + Contans.APPLOGINRSA + //val url = "http://192.168.2.84:8601/" + Contans.APPLOGINRSA val request = NoHttp.createStringRequest(url, RequestMethod.POST) 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 162305a..91968fa 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 @@ -168,6 +168,26 @@ public class CJFragment extends BaseFragment { public void selectText(String text, int position) { btn_selectCheckResult.setText(text); et_jg.setText(text); + if("轻微异常".equals(text)||"明显异常".equals(text)||"明显异音".equals(text)||"异常".equals(text)||"报警".equals(text)||"超温".equals(text)|| + "超压".equals(text)||"有泄露".equals(text)||"设备异常".equals(text)||"异常跳闸".equals(text)||"有异音".equals(text)||"轻微泄漏".equals(text)|| + "严重泄漏".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); + } + }); + } } }); dialog.show(); @@ -194,8 +214,9 @@ public class CJFragment extends BaseFragment { if (!s.toString().trim().isEmpty()) { double jg = UiUtlis.getNum(s.toString().trim()); if (jg > cxsx || jg < cxxx || jg > bjsx || jg < bjxx) { - showToast("采集结果超限"); + showToast("数据采集结果存在异常、超限，请填写分析内容"); llFxnr.setVisibility(View.VISIBLE); + sv.fullScroll(View.FOCUS_DOWN); } else { llFxnr.setVisibility(View.GONE); } @@ -284,6 +305,7 @@ public class CJFragment extends BaseFragment { public void updata(DjjhRwQy info, int item, int size) { this.info = info; btn_selectCheckResult.setText("点击选择采集结果"); + llFxnr.setVisibility(View.GONE); tv_dmc.setText(info.getPOINTNAME()); tv_ff.setText(info.getMEAMETHOD()); tv_bw.setText(info.getMEAPOS()); @@ -371,6 +393,12 @@ public class CJFragment extends BaseFragment { // } if(!TextUtils.isEmpty(info.getCJJG())){ btn_selectCheckResult.setText(info.getCJJG()); + if("轻微异常".equals(info.getCJJG())||"明显异常".equals(info.getCJJG())||"明显异音".equals(info.getCJJG())||"异常".equals(info.getCJJG())||"报警".equals(info.getCJJG())||"超温".equals(info.getCJJG())|| + "超压".equals(info.getCJJG())||"有泄露".equals(info.getCJJG())||"设备异常".equals(info.getCJJG())||"异常跳闸".equals(info.getCJJG())||"有异音".equals(info.getCJJG())||"轻微泄漏".equals(info.getCJJG())|| + "严重泄漏".equals(info.getCJJG())||"液位偏低".equals(info.getCJJG())||"油位偏低".equals(info.getCJJG())||"常用源及备用源异常".equals(info.getCJJG())){ + //showToast("采集结果数据存在异常，请填写分析内容"); + llFxnr.setVisibility(View.VISIBLE); + } } } else { //未检 @@ -384,9 +412,16 @@ public class CJFragment extends BaseFragment { }else{ //观察 List selectList = stringToList(info.getMEASTANDARDSELECT()); - if(selectList!=null&&selectList.size()>0){ - btn_selectCheckResult.setText(selectList.get(0)); - et_jg.setText(selectList.get(0)); + if(!selectList.isEmpty()){ + String firstSelectText = selectList.get(0); + btn_selectCheckResult.setText(firstSelectText); + et_jg.setText(firstSelectText); + if("轻微异常".equals(firstSelectText)||"明显异常".equals(firstSelectText)||"明显异音".equals(firstSelectText)||"异常".equals(firstSelectText)||"报警".equals(firstSelectText)||"超温".equals(firstSelectText)|| + "超压".equals(firstSelectText)||"有泄露".equals(firstSelectText)||"设备异常".equals(firstSelectText)||"异常跳闸".equals(firstSelectText)||"有异音".equals(firstSelectText)||"轻微泄漏".equals(firstSelectText)|| + "严重泄漏".equals(firstSelectText)||"液位偏低".equals(firstSelectText)||"油位偏低".equals(firstSelectText)||"常用源及备用源异常".equals(firstSelectText)){ + //showToast("采集结果数据存在异常，请填写分析内容"); + llFxnr.setVisibility(View.VISIBLE); + } } } } @@ -397,29 +432,32 @@ public class CJFragment extends BaseFragment { // rb2.setChecked(!rb1.isChecked()); // rb3.setChecked(info.isBYZT()); - cxsx = UiUtlis.getNum(info.getUPPERACTION()); - cxxx = UiUtlis.getNum(info.getLOWERACTION()); - bjsx = UiUtlis.getNum(info.getUPPERWARNING()); - bjxx = UiUtlis.getNum(info.getLOWERWARNING()); + if("观察".equals(info.getMEAMETHOD())){ - if (info.getFxnr() == null) { - llFxnr.setVisibility(View.GONE); - } else { - double jg = UiUtlis.getNum(info.getCJJG()); - if (jg > cxsx || jg < cxxx || jg > bjsx || jg < bjxx) { - llFxnr.setVisibility(View.VISIBLE); - llFxnr.setVisibility(View.VISIBLE); - } else { + }else{ + cxsx = UiUtlis.getNum(info.getUPPERACTION()); + cxxx = UiUtlis.getNum(info.getLOWERACTION()); + bjsx = UiUtlis.getNum(info.getUPPERWARNING()); + bjxx = UiUtlis.getNum(info.getLOWERWARNING()); + + if (info.getFxnr() == null) { llFxnr.setVisibility(View.GONE); + } else { + double jg = UiUtlis.getNum(info.getCJJG()); + if (jg > cxsx || jg < cxxx || jg > bjsx || jg < bjxx) { + llFxnr.setVisibility(View.VISIBLE); + } else { + llFxnr.setVisibility(View.GONE); + } } - } - sv.post(new Runnable() { - @Override - public void run() { - sv.fullScroll(View.FOCUS_DOWN); - } - }); + sv.post(new Runnable() { + @Override + public void run() { + sv.fullScroll(View.FOCUS_DOWN); + } + }); + } } @@ -452,4 +490,12 @@ public class CJFragment extends BaseFragment { String str[] = strs.split(";"); return Arrays.asList(str); } + + public boolean getEditTextFxIsShow() { + return llFxnr.getVisibility()==View.VISIBLE; + } + + public String getEditTextFxContent() { + return etFxnr.getText().toString().trim(); + } } diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SjcjFragment.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SjcjFragment.java index 8d59689..372763d 100755 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SjcjFragment.java +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SjcjFragment.java @@ -50,6 +50,46 @@ public class SjcjFragment extends BaseFragment { Button btn_exit; Button btn_submit_qx; + + + private final int checkItem = 0; + + private MyFragmentYXAdapter adapter; + private List list; + private CJFragment cj; + private FfFragment ff; + private BzFragment bz; + private ArrayList lists; + private int item = 0; + private boolean isEdit = false; + + private int index = 0; + + public SjcjFragment() { + } + + public static SjcjFragment newInstance(boolean b, ArrayList lists, int item) { + Bundle bundle = new Bundle(); + bundle.putBoolean("edit", b); + bundle.putParcelableArrayList("list", lists); + bundle.putInt(Contans.KEY_ITEM, item); + SjcjFragment fragment = new SjcjFragment(); + fragment.setArguments(bundle); + return fragment; + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + Bundle bundle = getArguments(); + if (bundle != null) { + isEdit = bundle.getBoolean("edit"); + lists = bundle.getParcelableArrayList("list"); + index = bundle.getInt(Contans.KEY_ITEM); + item = bundle.getInt(Contans.KEY_ITEM) + 1; + } + } + private void findView() { vp = view.findViewById(R.id.vp); rb1 = view.findViewById(R.id.rb1); @@ -79,7 +119,15 @@ public class SjcjFragment extends BaseFragment { btn_next.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - next(); + if(cj.getEditTextFxIsShow()){ + if(TextUtils.isEmpty(cj.getEditTextFxContent())){ + showToast("数据采集结果存在异常、超限，分析内容必填，请填写分析内容"); + }else{ + next(); + } + }else{ + next(); + } } }); btn_submit_qx.setOnClickListener(new View.OnClickListener() { @@ -183,44 +231,6 @@ public class SjcjFragment extends BaseFragment { }); } - private final int checkItem = 0; - - private MyFragmentYXAdapter adapter; - private List list; - private CJFragment cj; - private FfFragment ff; - private BzFragment bz; - private ArrayList lists; - private int item = 0; - private boolean isEdit = false; - - private int index = 0; - - public SjcjFragment() { - } - - public static SjcjFragment newInstance(boolean b, ArrayList lists, int item) { - Bundle bundle = new Bundle(); - bundle.putBoolean("edit", b); - bundle.putParcelableArrayList("list", lists); - bundle.putInt(Contans.KEY_ITEM, item); - SjcjFragment fragment = new SjcjFragment(); - fragment.setArguments(bundle); - return fragment; - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - Bundle bundle = getArguments(); - if (bundle != null) { - isEdit = bundle.getBoolean("edit"); - lists = bundle.getParcelableArrayList("list"); - index = bundle.getInt(Contans.KEY_ITEM); - item = bundle.getInt(Contans.KEY_ITEM) + 1; - } - } - @Override protected void initView() { findView(); @@ -237,7 +247,7 @@ public class SjcjFragment extends BaseFragment { btn_save_next.setVisibility(View.GONE); } list = new ArrayList<>(); - if (lists.size() != 0) { + if (!lists.isEmpty()) { cj = CJFragment.newInstance(isEdit, lists.get(index), lists.size(), index + 1); ff = FfFragment.newInstance(isEdit, lists.get(index).getMEAMETHOD()); bz = BzFragment.newInstance(isEdit, lists.get(index).getMEASTANDARD()); @@ -280,7 +290,7 @@ public class SjcjFragment extends BaseFragment { } public void next() { - if (lists.size() != 0) { + if (!lists.isEmpty()) { if (!btn_last.isEnabled()) { btn_last.setEnabled(true); } @@ -345,7 +355,7 @@ public class SjcjFragment extends BaseFragment { ff.update(lists.get(item - 1).getMEAMETHOD()); } } else { - if (lists.size() != 0) { + if (!lists.isEmpty()) { ++item; if (!btn_last.isEnabled()) { btn_last.setEnabled(true); diff --git a/app/src/main/res/layout/activity_kks_search.xml b/app/src/main/res/layout/activity_kks_search.xml index 6093062..edcf6ae 100755 --- a/app/src/main/res/layout/activity_kks_search.xml +++ b/app/src/main/res/layout/activity_kks_search.xml @@ -26,7 +26,7 @@ android:orientation="vertical"> + android:layout_height="10px" /> + android:layout_height="10px" /> + android:layout_height="10px" /> + android:layout_height="10px" /> + android:layout_height="10px" /> + android:layout_height="10px" /> + android:layout_height="10px" /> + - + android:layout_height="10px" /> - + android:layout_height="match_parent"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_cj.xml b/app/src/main/res/layout/fragment_cj.xml index 6181c59..3b5758a 100755 --- a/app/src/main/res/layout/fragment_cj.xml +++ b/app/src/main/res/layout/fragment_cj.xml @@ -379,6 +379,7 @@ android:layout_width="match_parent" android:layout_height="70px" android:gravity="center_vertical" + android:layout_marginStart="@dimen/px_20" android:text="异常数据分析内容：" android:textSize="@dimen/sbtextSize" /> @@ -387,6 +388,7 @@ style="@style/editTextTheme" android:layout_width="match_parent" android:layout_height="match_parent" + android:hint="请填写分析内容" android:gravity="left|top" /> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 02525e0..f07f616 100755 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -30,7 +30,7 @@ 10px @drawable/bg_edittext #bb000000 - 36px + 18sp bold match_parent 80px @@ -193,6 +193,17 @@ 12sp @color/black + +