diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8898812..844aba0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1125,6 +1125,10 @@
android:name=".ui.activity.ActivityFactoryWorkerInfo"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustResize|stateHidden" />
+
{
+
+ private final Context context;
+ private List datas;
+
+ public WorkRiskLevelListAdapter(Context context, List datas) {
+ super(context, R.layout.adapter_work_risk_level_list, datas);
+ this.context = context;
+ this.datas = datas;
+ }
+
+ @Override
+ protected void convert(ViewHolder viewHolder, WorkRiskLevelListBean.RowsBean item, int position) {
+ if (item != null) {
+ viewHolder.setText(R.id.tv_xh, String.valueOf(position+1));
+ viewHolder.setText(R.id.tv_paiHao, item.getCode());
+ viewHolder.setText(R.id.tv_content, item.getContent());
+ viewHolder.setText(R.id.tv_level, item.getLevel());
+ }
+ }
+}
diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/WorkRiskLevelListBean.java b/app/src/main/java/com/rehome/zhdcoa/bean/WorkRiskLevelListBean.java
new file mode 100644
index 0000000..f09369b
--- /dev/null
+++ b/app/src/main/java/com/rehome/zhdcoa/bean/WorkRiskLevelListBean.java
@@ -0,0 +1,83 @@
+package com.rehome.zhdcoa.bean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 每日作业风险清单
+ */
+public class WorkRiskLevelListBean extends AIBaseBean{
+ //每日作业风险清单
+ private List data;
+
+ public List getData() {
+ return data;
+ }
+
+ public void setData(List data) {
+ this.data = data;
+ }
+
+ public static class RowsBean {
+ //工作票编号
+ private String code;
+ //工作票等级：A、B、C1、C2、C3、低风险
+ private String level;
+ //工作内容
+ private String content;
+ //记录号
+ private int number;
+ //工作票ID
+ private String id;
+ //工作票状态
+ private String status;
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ public int getNumber() {
+ return number;
+ }
+
+ public void setNumber(int number) {
+ this.number = number;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getLevel() {
+ return level;
+ }
+
+ public void setLevel(String level) {
+ this.level = level;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+ }
+}
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
new file mode 100644
index 0000000..f26e190
--- /dev/null
+++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListActivity.kt
@@ -0,0 +1,133 @@
+package com.rehome.zhdcoa.ui.activity
+
+import android.view.View
+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.WorkRiskLevelListBean
+import com.rehome.zhdcoa.databinding.ActivityWorkRiskListBinding
+import com.rehome.zhdcoa.utils.AuthenticationLoginAIUtils
+import com.rehome.zhdcoa.utils.GsonUtils
+import com.rehome.zhdcoa.utils.HttpListener
+import com.rehome.zhdcoa.utils.NohttpUtils
+import com.rehome.zhdcoa.utils.RSAAndroid
+import com.yolanda.nohttp.NoHttp
+import com.yolanda.nohttp.RequestMethod
+import com.yolanda.nohttp.rest.Response
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import javax.net.ssl.HostnameVerifier
+
+/**
+ * Create By HuangWenFei
+ * 创建日期：2024-04-02 14:34
+ * 描述：每日作业风险清单
+ */
+class WorkRiskListActivity : BaseActivityOaToolbarViewBinding() {
+
+ private lateinit var headView: View
+
+ private var datas: MutableList = mutableListOf()
+ private lateinit var mAdapter: WorkRiskLevelListAdapter
+
+ override fun getViewBinding() = ActivityWorkRiskListBinding.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 = WorkRiskLevelListAdapter(this,datas);
+ //binding.lv.addHeaderView(headView, null, false)
+ binding.lv.adapter = mAdapter
+
+ //格式化日期的对象(转化成习惯的时间格式)
+ val sdFormat = SimpleDateFormat("yyyy.MM.dd")
+ //静态方法getInstance()使用默认时区和语言环境获得一个日历。
+ val calendar = Calendar.getInstance()
+ //输出当前系统时间;
+ binding.tvTime.text = sdFormat.format(calendar.time)
+
+ }
+
+ override fun initData() {
+ authenticationLoginAI()
+ }
+
+ private fun authenticationLoginAI() {
+ try {
+ //AI三维登录接口
+ val userName = Contans.SP.AI_ACCOUNT
+ //String strPrivateEncode=RSAAndroid.encryptByPrivateKeyForSpiltStr(Contans.SP.AI_PWD,RSAAndroid.privateRsaKeyLocal);
+ val strPublicDecode = RSAAndroid.decryptByPublicKeyForSpiltStr(
+ Contans.SP.AI_PWD_ENCODE,
+ RSAAndroid.publicRsaKeyLocal
+ )
+ AuthenticationLoginAIUtils.authenticationAILogin(
+ this, userName, strPublicDecode
+ ) { _, token ->
+ if (token != null && token == "") {
+ showToast("AI三维平台登录失败")
+ } else {
+ getWorkRiskListData()
+ }
+ }
+ } catch (e: Exception) {
+ e.printStackTrace()
+ }
+ }
+
+ private fun getWorkRiskListData() {
+ val request = NoHttp.createStringRequest(
+ Contans.BASE_URL_AI_3D_SERVER + Contans.DAYLY_RISK_LIST,
+ RequestMethod.GET
+ )
+
+ 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()
+ .addNoProgress(this, 0, request, object : HttpListener {
+
+ 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()
+ } else {
+ binding.tvNodata.visibility = View.VISIBLE
+ }
+ }
+ }
+
+ override fun onFailed(what: Int, response: Response?) {
+
+ }
+ })
+
+ }
+}
\ No newline at end of file
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 ae84b44..ad15f3a 100644
--- a/app/src/main/java/com/rehome/zhdcoa/weiget/GridViewDialog.java
+++ b/app/src/main/java/com/rehome/zhdcoa/weiget/GridViewDialog.java
@@ -55,6 +55,7 @@ import com.rehome.zhdcoa.ui.activity.SisdtDataActivity;
import com.rehome.zhdcoa.ui.activity.TaskCountActivity;
import com.rehome.zhdcoa.ui.activity.TaskDateActivity;
import com.rehome.zhdcoa.ui.activity.TrainStudyActivity;
+import com.rehome.zhdcoa.ui.activity.WorkRiskListActivity;
import com.rehome.zhdcoa.ui.activity.XfssqActivity;
import com.rehome.zhdcoa.ui.activity.XmjdActivity;
import com.rehome.zhdcoa.ui.activity.YjynMainActivity;
@@ -113,6 +114,14 @@ public class GridViewDialog extends Dialog {
TAG = tag;
+ if(TAG.equals(TAG_AF)){
+ lp.width = (getScreenWidth(context)) * 4 / 5;
+ gv.setNumColumns(3);
+ }else{
+ lp.width = (getScreenWidth(context)) * 2 / 3;
+ gv.setNumColumns(2);
+ }
+
initDatas();
if (datas != null) {
@@ -307,6 +316,9 @@ public class GridViewDialog extends Dialog {
}else if (position == 9) {
//当前厂内人员信息
intent = new Intent(getContext(), ActivityFactoryWorkerInfo.class);
+ }else if (position == 10) {
+ //作业风险清单
+ intent = new Intent(getContext(), WorkRiskListActivity.class);
}
break;
}
@@ -428,7 +440,9 @@ public class GridViewDialog extends Dialog {
//datas.add(new GridItem("危化品入厂申请", R.drawable.dager_logo, getShowString("ZNAF_ZYQYLSJRRY")));
datas.add(new GridItem("应急预案", R.drawable.icon_yjya, getShowString("ZNAF_ZYQYLSJRRY")));
datas.add(new GridItem("厂内人员信息", R.drawable.icon13, getShowString("ZNAF_ZYQYLSJRRY")));
+ datas.add(new GridItem("作业风险清单", R.drawable.icon_travel, getShowString("ZNAF_ZYQYLSJRRY")));
break;
}
}
}
+//WorkRiskListActivity
diff --git a/app/src/main/res/layout/activity_work_risk_list.xml b/app/src/main/res/layout/activity_work_risk_list.xml
new file mode 100644
index 0000000..93a4028
--- /dev/null
+++ b/app/src/main/res/layout/activity_work_risk_list.xml
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/adapter_work_risk_level_list.xml b/app/src/main/res/layout/adapter_work_risk_level_list.xml
new file mode 100644
index 0000000..77848e9
--- /dev/null
+++ b/app/src/main/res/layout/adapter_work_risk_level_list.xml
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/item_work_risk_list.xml b/app/src/main/res/layout/item_work_risk_list.xml
new file mode 100644
index 0000000..423151a
--- /dev/null
+++ b/app/src/main/res/layout/item_work_risk_list.xml
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+