From 7e85c901243f3b37a7b8b6265315c3532a58d758 Mon Sep 17 00:00:00 2001 From: wenfei Date: Tue, 12 Aug 2025 18:00:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=B7=BB=E5=8A=A0=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E9=A3=8E=E9=99=A9=E4=BF=A1=E6=81=AF=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=8E=A5=E5=8F=A3=E5=AE=8C=E6=88=90=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/WorkTickerCustomListAdapter.java | 20 +-- .../zhdcoa/bean/WorkRiskLevelListBean.java | 20 +++ .../activity/WorkTickerCustomAddActivity.kt | 118 +++++++++++++- .../activity/WorkTickerCustomListActivity.kt | 146 ++++++++++++++---- .../activity_work_ticker_custom_list.xml | 1 + .../adapter_work_ticket_custom_list.xml | 32 ++-- .../layout/header_work_ticket_custom_list.xml | 19 --- 7 files changed, 276 insertions(+), 80 deletions(-) diff --git a/app/src/main/java/com/rehome/zhdcoa/adapter/WorkTickerCustomListAdapter.java b/app/src/main/java/com/rehome/zhdcoa/adapter/WorkTickerCustomListAdapter.java index eacdf59..92114e8 100644 --- a/app/src/main/java/com/rehome/zhdcoa/adapter/WorkTickerCustomListAdapter.java +++ b/app/src/main/java/com/rehome/zhdcoa/adapter/WorkTickerCustomListAdapter.java @@ -49,13 +49,13 @@ public class WorkTickerCustomListAdapter extends BaseViewBindingAdapter hazardList; //工单编号 private String orderNo; + //开始时间，yyyy-MM-dd HH:mm + private String startTime; + //结束时间，yyyy-MM-dd HH:mm + private String endTime; private boolean checked;//0:未选中,1:已选中 public String getCode() { @@ -138,5 +142,21 @@ public class WorkRiskLevelListBean extends AIBaseBean{ public void setOrderNo(String orderNo) { this.orderNo = orderNo; } + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkTickerCustomAddActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkTickerCustomAddActivity.kt index 188777d..0bf1e9a 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkTickerCustomAddActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkTickerCustomAddActivity.kt @@ -9,6 +9,8 @@ import android.widget.ArrayAdapter import android.widget.CompoundButton import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken import com.rehome.zhdcoa.App import com.rehome.zhdcoa.Contans import com.rehome.zhdcoa.adapter.WorkRiskListTipAdapter @@ -71,6 +73,7 @@ class WorkTickerCustomAddActivity : BaseActivityOaToolbarViewBinding() {}.type) + showLog(GsonUtils.GsonString(item)) + binding.etMs.setText(item.content) + val level:String = item.level + if("A" == level){ + binding.rb1.isChecked = true + binding.rb2.isChecked = false + binding.rb3.isChecked = false + binding.rb4.isChecked = false + binding.rb5.isChecked = false + binding.rb6.isChecked = false + } + if("B" == level){ + binding.rb1.isChecked = false + binding.rb2.isChecked = true + binding.rb3.isChecked = false + binding.rb4.isChecked = false + binding.rb5.isChecked = false + binding.rb6.isChecked = false + } + if("C1" == level){ + binding.rb1.isChecked = false + binding.rb2.isChecked = false + binding.rb3.isChecked = true + binding.rb4.isChecked = false + binding.rb5.isChecked = false + binding.rb6.isChecked = false + } + if("C2" == level){ + binding.rb1.isChecked = false + binding.rb2.isChecked = false + binding.rb3.isChecked = false + binding.rb4.isChecked = true + binding.rb5.isChecked = false + binding.rb6.isChecked = false + } + if("C3" == level){ + binding.rb1.isChecked = false + binding.rb2.isChecked = false + binding.rb3.isChecked = false + binding.rb4.isChecked = false + binding.rb5.isChecked = true + binding.rb6.isChecked = false + } + if("低风险" == level){ + binding.rb1.isChecked = false + binding.rb2.isChecked = false + binding.rb3.isChecked = false + binding.rb4.isChecked = false + binding.rb5.isChecked = false + binding.rb6.isChecked = true + } + initStartDateAndEndDate() + if(item.hazardList!=null&&item.hazardList.size>0){ + workRiskLevelTipListBeanList.clear() + for(itemHazard in item.hazardList){ + if(itemHazard.precautionList.size>0){ + for(itemPrecaution in itemHazard.precautionList){ + val workRiskLevelTipListBean = WorkRiskLevelTipListBean() + workRiskLevelTipListBean.type=itemHazard.type + workRiskLevelTipListBean.precaution = itemPrecaution + workRiskLevelTipListBeanList.add(workRiskLevelTipListBean) + } + + } + } + mAdapterHazard.notifyDataSetChanged() + } + if(item.major!=null){ + for (i in items.indices) { + val major = items[i] + if(major==item.major){ + binding.spinnerZy.setSelection(i) + } + } + } + } binding.tvSt.setOnClickListener(View.OnClickListener { view: View? -> @@ -256,7 +344,7 @@ class WorkTickerCustomAddActivity : BaseActivityOaToolbarViewBinding(R.id.cb) as CheckBox - binding.itemHead.cb.setOnClickListener { - if (binding.itemHead.cb.isChecked) { - for (i in datas.indices) { - datas[i].isChecked = true - mAdapter.notifyDataSetChanged() - } - deleteIdList.clear() - } else { - for (i in datas.indices) { - datas[i].isChecked = false - mAdapter.notifyDataSetChanged() - } - if(selectList.size>0){ - deleteIdList.addAll(selectList) - } - } - } +// binding.itemHead.cb.setOnClickListener { +// if (binding.itemHead.cb.isChecked) { +// for (i in datas.indices) { +// datas[i].isChecked = true +// mAdapter.notifyDataSetChanged() +// } +// deleteIdList.clear() +// } else { +// for (i in datas.indices) { +// datas[i].isChecked = false +// mAdapter.notifyDataSetChanged() +// } +// if(selectList.size>0){ +// deleteIdList.addAll(selectList) +// } +// } +// } mAdapter = WorkTickerCustomListAdapter(this,datas,{ view, position -> val checkBox = view as CheckBox @@ -147,17 +147,22 @@ class WorkTickerCustomListActivity : BaseActivityOaToolbarViewBinding val item:WorkRiskLevelListBean.RowsBean = datas[position] //showToast("修改") + val intent = Intent(context, WorkTickerCustomAddActivity::class.java) + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) + intent.putExtra("isEdit", true) + intent.putExtra("item", GsonUtils.GsonString(item)) + startActivity(intent) },{ position -> val item:WorkRiskLevelListBean.RowsBean = datas[position] //showToast("删除") val dialog = CommitDialog(context, object : CommitDialogListener { override fun confirm() { - //authenticationLoginAISubmit() + authenticationLoginAIDelete(item.id) } override fun cancel() { @@ -332,6 +337,29 @@ class WorkTickerCustomListActivity : BaseActivityOaToolbarViewBinding + if (token != null && token == "") { + showToast("AI三维平台登录失败") + } else { + deleteWorkTicketData(id) + } + } + } catch (e: Exception) { + e.printStackTrace() + } + } + private fun getSubmitJsonData(): String { val param = HashMap() param["assignmentDate"] = binding.tvSt.text.toString().trim() @@ -345,6 +373,15 @@ class WorkTickerCustomListActivity : BaseActivityOaToolbarViewBinding() + param["id"] = id + val json = GsonUtils.GsonString(param) + showLog(json) + return json + } + + private fun submitWorkTicketData() { val url = Contans.BASE_URL_AI_3D_SERVER + Contans.DAYLY_RISK_LIST_SUBMIT_WORK_TICKET_LIST val request = NoHttp.createStringRequest( @@ -393,17 +430,62 @@ class WorkTickerCustomListActivity : BaseActivityOaToolbarViewBinding -// val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) -// v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) -// insets -// } -// } -//} \ No newline at end of file + val json: String = getDeleteJsonData(id) + request.setDefineRequestBodyForJson(json) + + if (Contans.BASE_URL_AI_3D_SERVER == Contans.BASE_URL_AI_3D_SERVER_EXTRANET) { + val socketFactory = NohttpUtils.getSSLSocketFactory(context) + if (socketFactory != null) { + request.sslSocketFactory = socketFactory + request.hostnameVerifier = HostnameVerifier { _, _ -> true } + } + } + + NohttpUtils.getInstance().add(this, 0, request, object : HttpListener { + + override fun onSucceed(what: Int, response: Response?) { + val result = response?.get() + showLog("--------删除手动添加的作业风险信息成功--------") + showLog(url) + showLog(result) + val bean = GsonUtils.GsonToBean( + result, + AIBaseBean::class.java + ) + if (bean != null && bean.isSuccess) { + if(datas.size>0){ + for(item in datas){ + if(item.id==id){ + datas.remove(item) + } + } + } + mAdapter.notifyDataSetChanged() + //提交成功 + val confirmDialog = ConfirmDialog( + context, "删除手动添加的作业风险信息成功" + ) { + + } + confirmDialog.setTvTitle("提示") + confirmDialog.setCancelable(true) + confirmDialog.show() + }else{ + showToast("删除手动添加的作业风险信息失败") + } + } + + override fun onFailed(what: Int, response: Response?) { + + } + }) + } + +} diff --git a/app/src/main/res/layout/activity_work_ticker_custom_list.xml b/app/src/main/res/layout/activity_work_ticker_custom_list.xml index 93bef1a..f8d5cc7 100644 --- a/app/src/main/res/layout/activity_work_ticker_custom_list.xml +++ b/app/src/main/res/layout/activity_work_ticker_custom_list.xml @@ -74,6 +74,7 @@ android:layout_width="match_parent" android:layout_height="50dp" android:background="@color/colorPrimary" + android:visibility="gone" android:orientation="vertical"> - + + + + + + - - + + + + + + - + + + + - - - - - - -