From 4895991f746d5307c549e54ed9d26f6f5fb25cd1 Mon Sep 17 00:00:00 2001 From: hwf453 Date: Tue, 25 Jun 2024 17:41:50 +0800 Subject: [PATCH] =?UTF-8?q?2.2.9=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 5 +- app/src/main/AndroidManifest.xml | 4 + .../adapter/WorkRiskLevelListAdapter.java | 11 ++- .../adapter/WorkRiskListTipAdapter.java | 37 +++++++++ .../rehome/zhdcoa/bean/HazardListBean.java | 25 ++++++ .../zhdcoa/bean/WorkRiskLevelListBean.java | 9 +++ .../zhdcoa/bean/WorkRiskLevelTipListBean.java | 22 +++++ .../ui/activity/WorkRiskListActivity.kt | 18 ++++- .../ui/activity/WorkRiskListTipActivity.kt | 71 ++++++++++++++++ .../zhdcoa/ui/activity/WztpblScActivity.kt | 20 ++--- .../ui/activity/WztpblScDetailActivity.java | 4 + .../utils/AuthenticationLoginAIUtils.java | 5 +- .../rehome/zhdcoa/weiget/GridViewDialog.java | 1 + .../layout/activity_work_risk_list_tip.xml | 45 +++++++++++ .../adapter_item_work_risk_list_tip.xml | 75 +++++++++++++++++ .../res/layout/item_work_risk_list_tip.xml | 81 +++++++++++++++++++ 16 files changed, 417 insertions(+), 16 deletions(-) create mode 100644 app/src/main/java/com/rehome/zhdcoa/adapter/WorkRiskListTipAdapter.java create mode 100644 app/src/main/java/com/rehome/zhdcoa/bean/HazardListBean.java create mode 100644 app/src/main/java/com/rehome/zhdcoa/bean/WorkRiskLevelTipListBean.java create mode 100644 app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListTipActivity.kt create mode 100644 app/src/main/res/layout/activity_work_risk_list_tip.xml create mode 100644 app/src/main/res/layout/adapter_item_work_risk_list_tip.xml create mode 100644 app/src/main/res/layout/item_work_risk_list_tip.xml diff --git a/app/build.gradle b/app/build.gradle index ccf8ae6..7416101 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { applicationId "com.rehome.zhdcoa" minSdk 24 targetSdk 34 - versionCode 12 - versionName "2.2.8" + versionCode 13 + versionName "2.2.9" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" //每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装 @@ -125,6 +125,7 @@ dependencies { implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30' implementation files('../libs/poi-3.9-20121203.jar') implementation files('../libs/poi-scratchpad-3.9-20121203.jar') + implementation 'androidx.activity:activity:1.8.0' testImplementation 'junit:junit:4.13.1' androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 844aba0..fd84500 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1129,6 +1129,10 @@ android:name=".ui.activity.WorkRiskListActivity" android:screenOrientation="portrait" android:windowSoftInputMode="adjustResize|stateHidden" /> + "; + TextView tv_content =viewHolder.getView(R.id.tv_content); + tv_content.setText(Html.fromHtml(tv_precaution)); + tv_content.setTextColor(Color.parseColor("#0099ff")); + } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/adapter/WorkRiskListTipAdapter.java b/app/src/main/java/com/rehome/zhdcoa/adapter/WorkRiskListTipAdapter.java new file mode 100644 index 0000000..082cef3 --- /dev/null +++ b/app/src/main/java/com/rehome/zhdcoa/adapter/WorkRiskListTipAdapter.java @@ -0,0 +1,37 @@ +package com.rehome.zhdcoa.adapter; + + +import static android.text.Html.FROM_HTML_MODE_LEGACY; + +import android.content.Context; +import android.text.Html; +import android.widget.TextView; + +import com.rehome.zhdcoa.R; +import com.rehome.zhdcoa.bean.WorkRiskLevelTipListBean; +import java.util.List; + +public class WorkRiskListTipAdapter extends CommonAdapter { + + private final Context context; + private List datas; + + public WorkRiskListTipAdapter(Context context, List datas) { + super(context, R.layout.adapter_item_work_risk_list_tip, datas); + this.context = context; + this.datas = datas; + } + + @Override + protected void convert(ViewHolder viewHolder, WorkRiskLevelTipListBean item, int position) { + if (item != null) { + viewHolder.setText(R.id.tv_xh, String.valueOf(position+1)); + viewHolder.setText(R.id.tv_weiHai, item.getType()); + viewHolder.setText(R.id.tv_yuFang, item.getPrecaution()); + +// String tv_precaution = " color='#999999'>" + item.getPrecaution() +""; +// TextView tv =viewHolder.getView(R.id.tv_yuFang); +// tv.setText(Html.fromHtml(tv_precaution)); + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/HazardListBean.java b/app/src/main/java/com/rehome/zhdcoa/bean/HazardListBean.java new file mode 100644 index 0000000..44d9f2a --- /dev/null +++ b/app/src/main/java/com/rehome/zhdcoa/bean/HazardListBean.java @@ -0,0 +1,25 @@ +package com.rehome.zhdcoa.bean; + +import java.util.List; + +public class HazardListBean { + private String type; + + private List precautionList; + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public List getPrecautionList() { + return precautionList; + } + + public void setPrecautionList(List precautionList) { + this.precautionList = precautionList; + } +} diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/WorkRiskLevelListBean.java b/app/src/main/java/com/rehome/zhdcoa/bean/WorkRiskLevelListBean.java index f09369b..490e3a0 100644 --- a/app/src/main/java/com/rehome/zhdcoa/bean/WorkRiskLevelListBean.java +++ b/app/src/main/java/com/rehome/zhdcoa/bean/WorkRiskLevelListBean.java @@ -31,6 +31,7 @@ public class WorkRiskLevelListBean extends AIBaseBean{ private String id; //工作票状态 private String status; + private List hazardList; public String getCode() { return code; @@ -79,5 +80,13 @@ public class WorkRiskLevelListBean extends AIBaseBean{ public void setStatus(String status) { this.status = status; } + + public List getHazardList() { + return hazardList; + } + + public void setHazardList(List hazardList) { + this.hazardList = hazardList; + } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/WorkRiskLevelTipListBean.java b/app/src/main/java/com/rehome/zhdcoa/bean/WorkRiskLevelTipListBean.java new file mode 100644 index 0000000..d428d44 --- /dev/null +++ b/app/src/main/java/com/rehome/zhdcoa/bean/WorkRiskLevelTipListBean.java @@ -0,0 +1,22 @@ +package com.rehome.zhdcoa.bean; + +public class WorkRiskLevelTipListBean { + private String type; + private String precaution; + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getPrecaution() { + return precaution; + } + + public void setPrecaution(String precaution) { + this.precaution = precaution; + } +} diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListActivity.kt index f26e190..44ff0b0 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListActivity.kt @@ -1,10 +1,13 @@ package com.rehome.zhdcoa.ui.activity +import android.content.Intent import android.view.View +import android.widget.AdapterView import com.rehome.zhdcoa.Contans import com.rehome.zhdcoa.R import com.rehome.zhdcoa.adapter.WorkRiskLevelListAdapter import com.rehome.zhdcoa.base.BaseActivityOaToolbarViewBinding +import com.rehome.zhdcoa.bean.HazardListBean import com.rehome.zhdcoa.bean.WorkRiskLevelListBean import com.rehome.zhdcoa.databinding.ActivityWorkRiskListBinding import com.rehome.zhdcoa.utils.AuthenticationLoginAIUtils @@ -49,6 +52,20 @@ class WorkRiskListActivity : BaseActivityOaToolbarViewBinding?, _: View?, position: Int, _: Long -> + val item = datas[position] + if(item.hazardList!=null&&item.hazardList.size>0){ + //进入风险提示页面 + val intent = Intent(context, WorkRiskListTipActivity::class.java) + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) + intent.putExtra("hazardList", GsonUtils.GsonString(item.hazardList)) + startActivity(intent) + }else{ + showToast("无清单提示数据") + } + } + //格式化日期的对象(转化成习惯的时间格式) val sdFormat = SimpleDateFormat("yyyy.MM.dd") //静态方法getInstance()使用默认时区和语言环境获得一个日历。 @@ -128,6 +145,5 @@ class WorkRiskListActivity : BaseActivityOaToolbarViewBinding() { + + private lateinit var headView: View + private var datas: MutableList = mutableListOf() + + private lateinit var mAdapter: WorkRiskListTipAdapter + + + override fun getViewBinding() = ActivityWorkRiskListTipBinding.inflate(layoutInflater) + + override fun getToolbar() = binding.toolbarView.toolbar + override fun initView() { + + initToolbar("危害后果及防范措施") + setLeftOnClickListener { + finish() + } + + binding.lv.emptyView = binding.tvNodata + headView = View.inflate(this, R.layout.item_work_risk_list, null) + + mAdapter = WorkRiskListTipAdapter(this,datas); + binding.lv.adapter = mAdapter + + + } + + override fun initData() { + datas.clear() + val hazardListStr = intent.getStringExtra("hazardList")!! + val gson = Gson(); + var hazardList: MutableList = gson.fromJson(hazardListStr,object : TypeToken?>() {}.type) + if(hazardList!=null){ +// showLog(hazardList.size.toString()) +// showLog(hazardListStr) +// showLog(GsonUtils.GsonString(hazardList)) + for (hazardListBean in hazardList) { + //showLog("item：${hazardListBean.type}") + //showLog("item：${hazardListBean.precautionList[0]}") + if(hazardListBean.precautionList!=null&&hazardListBean.precautionList.size>0){ + for (item in hazardListBean.precautionList) {// 适合不需要下标的场景，例如直接显示集合数据，而且展示样式都一样 + //showLog("$item") + var workRiskLevelTipListBean = WorkRiskLevelTipListBean() + workRiskLevelTipListBean.type = hazardListBean.type + workRiskLevelTipListBean.precaution = item + datas.add(workRiskLevelTipListBean) + } + } + } + mAdapter.notifyDataSetChanged() + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpblScActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpblScActivity.kt index ced6d2d..cd44a48 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpblScActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpblScActivity.kt @@ -74,7 +74,7 @@ class WztpblScActivity : BaseActivityAutoToolbarViewBinding { override fun onSucceed(what: Int, response: Response?) { if (response != null) { val result = response.get() - Log.i("app", result) + showLog( result) val bean = GsonUtils.GsonToBean(result, WarehouseDropdownBean::class.java) if (bean != null && bean.total != "0") { spinnerParent.clear() spinnerParent.addAll(bean.rows) - Log.i("app", "size:" + bean.rows.count()) + showLog("size:" + bean.rows.count()) // 在我们的这个位置的话创建我们的数组 // 在我们的这个位置的话创建我们的数组 @@ -163,18 +163,18 @@ class WztpblScActivity : BaseActivityAutoToolbarViewBinding { override fun onSucceed(what: Int, response: Response?) { if (response != null) { val result = response.get() - Log.i("app", result) + showLog( result) val bean = GsonUtils.GsonToBean(result, WarehouseDropdownBean::class.java) if (bean != null && bean.total != "0") { spinnerSon.clear() spinnerSon.addAll(bean.rows) - Log.i("app", "size:" + bean.rows.count()) + showLog("size:" + bean.rows.count()) // 在我们的这个位置的话创建我们的数组 val arraySon = arrayOfNulls(spinnerSon.size) @@ -233,19 +233,19 @@ class WztpblScActivity : BaseActivityAutoToolbarViewBinding { override fun onSucceed(what: Int, response: Response?) { if (response != null) { val result = response.get() - Log.i("app", result) + showLog( result) val bean = GsonUtils.GsonToBean(result, WarehouseHuoJiaBean::class.java) if (bean != null && bean.total != "0") { warehouseHuoJiaList.clear() warehouseHuoJiaList.addAll(bean.rows) wztpblAdapter.notifyDataSetChanged() - Log.i("app", "size:" + bean.rows.count()) + showLog( "size:" + bean.rows.count()) }else{ warehouseHuoJiaList.clear() wztpblAdapter.notifyDataSetChanged() diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpblScDetailActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpblScDetailActivity.java index 62bc9bc..c2bfa99 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpblScDetailActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpblScDetailActivity.java @@ -1048,6 +1048,8 @@ public class WztpblScDetailActivity extends BaseActivityOaToolbarViewBinding response) { - //showLog("----------------"); + showLog("----------------"); String result = response.get(); - //showLog(result); + showLog(result); String jsonDecode = RSAUtils.decryptBASE64StrClient(result); if (TextUtils.isEmpty(jsonDecode)) { @@ -140,6 +140,7 @@ public class AuthenticationLoginAIUtils { @Override public void onFailed(int what, Response response) { + showLog("onFailed"); listener.onAuthenticationSuccess(false, ""); } }); diff --git a/app/src/main/java/com/rehome/zhdcoa/weiget/GridViewDialog.java b/app/src/main/java/com/rehome/zhdcoa/weiget/GridViewDialog.java index ad15f3a..701cab4 100644 --- a/app/src/main/java/com/rehome/zhdcoa/weiget/GridViewDialog.java +++ b/app/src/main/java/com/rehome/zhdcoa/weiget/GridViewDialog.java @@ -323,6 +323,7 @@ public class GridViewDialog extends Dialog { break; } if (intent != null) { + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP|Intent.FLAG_ACTIVITY_SINGLE_TOP); getContext().startActivity(intent); } dismiss(); diff --git a/app/src/main/res/layout/activity_work_risk_list_tip.xml b/app/src/main/res/layout/activity_work_risk_list_tip.xml new file mode 100644 index 0000000..3b766ab --- /dev/null +++ b/app/src/main/res/layout/activity_work_risk_list_tip.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/adapter_item_work_risk_list_tip.xml b/app/src/main/res/layout/adapter_item_work_risk_list_tip.xml new file mode 100644 index 0000000..18786b9 --- /dev/null +++ b/app/src/main/res/layout/adapter_item_work_risk_list_tip.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/item_work_risk_list_tip.xml b/app/src/main/res/layout/item_work_risk_list_tip.xml new file mode 100644 index 0000000..3b139ec --- /dev/null +++ b/app/src/main/res/layout/item_work_risk_list_tip.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +