diff --git a/androidpdfviewer/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/androidpdfviewer/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
index ac475a5..be2d023 100644
--- a/androidpdfviewer/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
+++ b/androidpdfviewer/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Fri Feb 14 17:09:23 CST 2025
+#Thu Feb 27 10:54:33 CST 2025
com.github.barteksc.pdfviewer.androidpdfviewer-main-6\:/drawable/default_scroll_handle_bottom.xml=/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/debug/packageDebugResources/drawable/default_scroll_handle_bottom.xml
com.github.barteksc.pdfviewer.androidpdfviewer-main-6\:/drawable/default_scroll_handle_left.xml=/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/debug/packageDebugResources/drawable/default_scroll_handle_left.xml
com.github.barteksc.pdfviewer.androidpdfviewer-main-6\:/drawable/default_scroll_handle_right.xml=/home/admin/AndroidStudioProjects/ZHDCOA/androidpdfviewer/build/intermediates/packaged_res/debug/packageDebugResources/drawable/default_scroll_handle_right.xml
diff --git a/androidslantedtextview/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/androidslantedtextview/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
index 677d37d..b14c14e 100644
--- a/androidslantedtextview/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
+++ b/androidslantedtextview/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
@@ -1 +1 @@
-#Fri Feb 14 17:09:23 CST 2025
+#Thu Feb 27 10:54:33 CST 2025
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c5e8cc5..d32e21a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -83,6 +83,7 @@
tools:targetApi="s">
+
@@ -445,8 +446,7 @@
-
+ android:screenOrientation="portrait" />
+
{
+ private final Context context;
+ private final List data;
+ private CallBack mCallBack;
+
+ public interface CallBack {
+ void Click(@NonNull View view,int position);
+ }
+
+ public WorkTickerSelectListAdapter(Context context, List datas, CallBack mCallBack) {
+ super(context);
+ this.context=context;
+ this.data=datas;
+ this.mCallBack = mCallBack;
+ }
+
+
+ @Override
+ protected void handleData(int position, @NonNull AdapterWorkTicketSelectListBinding binding) {
+ WorkRiskLevelListBean.RowsBean item = data.get(position);
+
+ binding.tvPaiHao.setText(item.getCode());
+ binding.tvContent.setText(item.getContent());
+ binding.tvLevel.setText(item.getLevel());
+ binding.cb.setChecked(item.isChecked());
+ binding.cb.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ mCallBack.Click(view,position);
+ }
+ });
+ }
+
+ @Override
+ protected AdapterWorkTicketSelectListBinding getBinding(@NonNull LayoutInflater inflater, ViewGroup parent) {
+ return AdapterWorkTicketSelectListBinding.inflate(inflater, parent, false);
+ }
+
+ @Override
+ public int getCount() {
+ return data.size();
+ }
+
+ @Override
+ public Object getItem(int position) {
+ return data.get(position);
+ }
+
+ @Override
+ public long getItemId(int position) {
+ return Long.valueOf(position);
+ }
+}
\ No newline at end of file
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 490e3a0..bca8705 100644
--- a/app/src/main/java/com/rehome/zhdcoa/bean/WorkRiskLevelListBean.java
+++ b/app/src/main/java/com/rehome/zhdcoa/bean/WorkRiskLevelListBean.java
@@ -32,6 +32,7 @@ public class WorkRiskLevelListBean extends AIBaseBean{
//工作票状态
private String status;
private List hazardList;
+ private boolean checked;//0:未选中,1:已选中
public String getCode() {
return code;
@@ -88,5 +89,13 @@ public class WorkRiskLevelListBean extends AIBaseBean{
public void setHazardList(List hazardList) {
this.hazardList = hazardList;
}
+
+ public boolean isChecked() {
+ return checked;
+ }
+
+ public void setChecked(boolean checked) {
+ this.checked = checked;
+ }
}
}
diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt
index bf2aabd..7d97ac4 100644
--- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt
+++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt
@@ -174,8 +174,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() {
if (isApkInDebug(context)) {
// 管理员
-// binding.etUsername.setText("ZHPS_Admin")
-// binding.etPassword.setText("Rehome.zhps@996")
+ binding.etUsername.setText("ZHPS_Admin")
+ binding.etPassword.setText("Rehome.zhps@996")
//公司内网215管理员
// binding.etUsername.setText("ZHPS_Admin")
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 2cfa568..629c420 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
@@ -2,12 +2,10 @@ 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
@@ -34,6 +32,8 @@ class WorkRiskListActivity : BaseActivityOaToolbarViewBinding = mutableListOf()
private lateinit var mAdapter: WorkRiskLevelListAdapter
+ private var selectList: MutableList = mutableListOf()
+
private var dataA: MutableList = mutableListOf()
private var dataB: MutableList = mutableListOf()
private var dataC1: MutableList = mutableListOf()
@@ -47,9 +47,13 @@ class WorkRiskListActivity : BaseActivityOaToolbarViewBinding {
- override fun onSucceed(what: Int, response: Response?) {
- val result = response?.get()
- showLog("----------------")
- showLog(result)
- val bean = GsonUtils.GsonToBean(
- result,
- WorkRiskLevelListBean::class.java
- )
- if (bean != null && bean.data != null) {
- val workRiskLevelLists = bean.data
- if (workRiskLevelLists != null && workRiskLevelLists.size > 0) {
- binding.tvNodata.visibility = View.GONE
- headView.visibility = View.VISIBLE
- datas.clear()
- datas.addAll(workRiskLevelLists)
- mAdapter.notifyDataSetChanged()
+ override fun onSucceed(what: Int, response: Response?) {
+ val result = response?.get()
+ showLog("----------------")
+ showLog(result)
+ val bean = GsonUtils.GsonToBean(
+ result,
+ WorkRiskLevelListBean::class.java
+ )
+ if (bean != null && bean.data != null) {
+ val workRiskLevelLists = bean.data
+ if (workRiskLevelLists != null && workRiskLevelLists.size > 0) {
+ binding.tvNodata.visibility = View.GONE
+ headView.visibility = View.VISIBLE
+ datas.clear()
+ datas.addAll(workRiskLevelLists)
+ mAdapter.notifyDataSetChanged()
- dataA.clear()
- dataB.clear()
- dataC1.clear()
- dataC2.clear()
- dataC3.clear()
- dataLowRisk.clear()
+ dataA.clear()
+ dataB.clear()
+ dataC1.clear()
+ dataC2.clear()
+ dataC3.clear()
+ dataLowRisk.clear()
- for(item in datas){
- showLog(GsonUtils.GsonString(item))
- if(item.level!=null&&item.level=="A"){
- dataA.add(item)
- }
- if(item.level!=null&&item.level=="B"){
- dataB.add(item)
- }
- if(item.level!=null&&item.level=="C1"){
- dataC1.add(item)
- }
- if(item.level!=null&&item.level=="C2"){
- dataC2.add(item)
- }
- if(item.level!=null&&item.level=="C3"){
- dataC3.add(item)
- }
- if(item.level!=null&&item.level=="低风险"){
- dataLowRisk.add(item)
- }
+ for(item in datas){
+ showLog(GsonUtils.GsonString(item))
+ if(item.level!=null&&item.level=="A"){
+ dataA.add(item)
+ }
+ if(item.level!=null&&item.level=="B"){
+ dataB.add(item)
+ }
+ if(item.level!=null&&item.level=="C1"){
+ dataC1.add(item)
+ }
+ if(item.level!=null&&item.level=="C2"){
+ dataC2.add(item)
+ }
+ if(item.level!=null&&item.level=="C3"){
+ dataC3.add(item)
+ }
+ if(item.level!=null&&item.level=="低风险"){
+ dataLowRisk.add(item)
}
- binding.tvA.text = dataA.size.toString()
- binding.tvB.text = dataB.size.toString()
- binding.tvC1.text = dataC1.size.toString()
- binding.tvC2.text = dataC2.size.toString()
- binding.tvC3.text = dataC3.size.toString()
- binding.tvLowLisk.text = dataLowRisk.size.toString()
-
- } else {
- binding.tvNodata.visibility = View.VISIBLE
}
+ binding.tvA.text = dataA.size.toString()
+ binding.tvB.text = dataB.size.toString()
+ binding.tvC1.text = dataC1.size.toString()
+ binding.tvC2.text = dataC2.size.toString()
+ binding.tvC3.text = dataC3.size.toString()
+ binding.tvLowLisk.text = dataLowRisk.size.toString()
+
+ } else {
+ binding.tvNodata.visibility = View.VISIBLE
}
}
+ }
- override fun onFailed(what: Int, response: Response?) {
+ override fun onFailed(what: Int, response: Response?) {
- }
- })
+ }
+ })
}
private fun bindViewClick() {