hwf453
/
ZHDCOA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

作业风险清单右上角 新增 已授权工作票

Browse Source
master
hwf452 9 months ago
parent dfaa12e93a
commit ef3b26d040
8 changed files with 153 additions and 66 deletions
Show Stats Download Patch File Download Diff File

2
androidpdfviewer/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
Unescape Escape View File

@ -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

2
androidslantedtextview/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
Unescape Escape View File

@ -1 +1 @@
#Fri Feb 14 17:09:23 CST 2025
#Thu Feb 27 10:54:33 CST 2025

8
app/src/main/AndroidManifest.xml
Unescape Escape View File

@ -83,6 +83,7 @@
tools:targetApi="s">
<meta-data
android:name="design_width"
android:value="768" />
@ -445,8 +446,7 @@
<activity
android:name=".ui.activity.QrCodeNewActivity"
android:exported="false"
android:screenOrientation="portrait" />
<!-- <activity -->
android:screenOrientation="portrait" /> <!-- <activity -->
<!-- android:name=".ui.activity.CaptureActivity" -->
<!-- android:screenOrientation="portrait" /> -->
<activity
@ -1138,6 +1138,10 @@
android:name=".ui.activity.WorkRiskListActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustResize|stateHidden" /> <!-- 作业风险清单 -->
<activity
android:name=".ui.activity.WorkTickerSelectListActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustResize|stateHidden" /> <!-- 作业风险清单-右上角工作票 点击进入已审批通过的工作票汇列表选择 -->
<activity
android:name=".ui.activity.WorkRiskListHuiBaoActivity"
android:screenOrientation="portrait"

3
app/src/main/java/com/rehome/zhdcoa/Contans.java
Unescape Escape View File

@ -522,6 +522,9 @@ public class Contans {
//查询每日工作报告
public final static String DAYLY_RISK_LIST_DAYLY = "/sc_v1/api/work/report/page";
//查询每日作业风险清单新接口
public final static String DAYLY_RISK_LIST_NEW = "sc_v1/api/ticket/active/listSummaryTicketAndLevel";
//通讯录
public static String GETCONTACTLIST_URL="PubFile/Data/GetAddressbookRsa.ashx";

65
app/src/main/java/com/rehome/zhdcoa/adapter/WorkTickerSelectListAdapter.java
Unescape Escape View File

@ -0,0 +1,65 @@
package com.rehome.zhdcoa.adapter;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import com.rehome.zhdcoa.base.BaseViewBindingAdapter;
import com.rehome.zhdcoa.bean.WorkRiskLevelListBean;
import com.rehome.zhdcoa.databinding.AdapterWorkTicketSelectListBinding;
import java.util.List;
public class WorkTickerSelectListAdapter extends BaseViewBindingAdapter<AdapterWorkTicketSelectListBinding> {
private final Context context;
private final List<WorkRiskLevelListBean.RowsBean> data;
private CallBack mCallBack;
public interface CallBack {
void Click(@NonNull View view,int position);
}
public WorkTickerSelectListAdapter(Context context, List<WorkRiskLevelListBean.RowsBean> 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);
}
}

9
app/src/main/java/com/rehome/zhdcoa/bean/WorkRiskLevelListBean.java
Unescape Escape View File

@ -32,6 +32,7 @@ public class WorkRiskLevelListBean extends AIBaseBean{
//工作票状态
private String status;
private List<HazardListBean> hazardList;
private boolean checked;//0:未选中,1:已选中
public String getCode() {
return code;
@ -88,5 +89,13 @@ public class WorkRiskLevelListBean extends AIBaseBean{
public void setHazardList(List<HazardListBean> hazardList) {
this.hazardList = hazardList;
}
public boolean isChecked() {
return checked;
}
public void setChecked(boolean checked) {
this.checked = checked;
}
}
}

4
app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt
Unescape Escape View File

@ -174,8 +174,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
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")

126
app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkRiskListActivity.kt
Unescape Escape View File

@ -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<ActivityWorkRiskLi
private var datas: MutableList<WorkRiskLevelListBean.RowsBean> = mutableListOf()
private lateinit var mAdapter: WorkRiskLevelListAdapter
private var selectList: MutableList<String> = mutableListOf()
private var dataA: MutableList<WorkRiskLevelListBean.RowsBean> = mutableListOf()
private var dataB: MutableList<WorkRiskLevelListBean.RowsBean> = mutableListOf()
private var dataC1: MutableList<WorkRiskLevelListBean.RowsBean> = mutableListOf()
@ -47,9 +47,13 @@ class WorkRiskListActivity : BaseActivityOaToolbarViewBinding<ActivityWorkRiskLi
override fun initView() {
initToolbar("每日作业风险清单")
setLeftOnClickListener {
finish()
initToolbar("每日作业风险清单", "工作票") {
//进入风险提示页面 WorkTickerSelectListActivity
val intent = Intent(context, WorkTickerSelectListActivity::class.java)
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
intent.putExtra("ticketIdList", GsonUtils.GsonString(selectList))
startActivity(intent)
}
binding.lv.emptyView = binding.tvNodata
@ -130,10 +134,12 @@ class WorkRiskListActivity : BaseActivityOaToolbarViewBinding<ActivityWorkRiskLi
private fun getWorkRiskListData() {
val request = NoHttp.createStringRequest(
Contans.BASE_URL_AI_3D_SERVER + Contans.DAYLY_RISK_LIST,
Contans.BASE_URL_AI_3D_SERVER + Contans.DAYLY_RISK_LIST_NEW,
RequestMethod.GET
)
request.add("filter",true);
if (Contans.BASE_URL_AI_3D_SERVER == Contans.BASE_URL_AI_3D_SERVER_EXTRANET) {
val socketFactory = NohttpUtils.getSSLSocketFactory(context)
if (socketFactory != null) {
@ -144,69 +150,69 @@ class WorkRiskListActivity : BaseActivityOaToolbarViewBinding<ActivityWorkRiskLi
NohttpUtils.getInstance().add(this, 0, request, object : HttpListener<String?> {
override fun onSucceed(what: Int, response: Response<String?>?) {
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<String?>?) {
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<String?>?) {
override fun onFailed(what: Int, response: Response<String?>?) {
}
})
}
})
}
private fun bindViewClick() {

Write Preview
Loading…
Cancel
Save