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

2.3.9 release

Browse Source
master
hwf452 7 months ago
parent 87e67bc10b
commit 06e0c615d7
6 changed files with 83 additions and 19 deletions
Show Stats Download Patch File Download Diff File

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

@ -1,11 +1,14 @@
package com.rehome.zhdcoa.adapter;
import android.content.Context;
import android.graphics.Color;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import com.rehome.zhdcoa.App;
import com.rehome.zhdcoa.base.BaseViewBindingAdapter;
import com.rehome.zhdcoa.bean.WorkRiskLevelListBean;
import com.rehome.zhdcoa.databinding.AdapterWorkTicketSelectListBinding;
@ -45,6 +48,18 @@ public class WorkTickerSelectListAdapter extends BaseViewBindingAdapter<AdapterW
mCallBack.Click(view,position);
}
});
if(TextUtils.isEmpty(item.getJobNo())){
binding.cb.setEnabled(true);
}else{
if(item.getJobNo().equals(App.getInstance().getUserInfo().getManid())){
binding.cb.setEnabled(true);
}else{
binding.cb.setEnabled(false);
binding.tvPaiHao.setTextColor(Color.GRAY);
binding.tvContent.setTextColor(Color.GRAY);
binding.tvLevel.setTextColor(Color.GRAY);
}
}
}
@Override

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

@ -101,7 +101,10 @@ class CustomDialogChangeLevelActivity : Activity() {
}
}
binding.rb1.setOnCheckedChangeListener(object: CompoundButton.OnCheckedChangeListener {
override fun onCheckedChanged(buttonView: CompoundButton?, isChecked: Boolean) {
override fun onCheckedChanged(
buttonView: CompoundButton,
isChecked: Boolean
) {
if(isChecked){
binding.rb1.isChecked = true
binding.rb2.isChecked = false
@ -113,7 +116,10 @@ class CustomDialogChangeLevelActivity : Activity() {
}
})
binding.rb2.setOnCheckedChangeListener(object: CompoundButton.OnCheckedChangeListener {
override fun onCheckedChanged(buttonView: CompoundButton?, isChecked: Boolean) {
override fun onCheckedChanged(
buttonView: CompoundButton,
isChecked: Boolean
) {
if(isChecked){
binding.rb1.isChecked = false
binding.rb2.isChecked = true
@ -125,7 +131,10 @@ class CustomDialogChangeLevelActivity : Activity() {
}
})
binding.rb3.setOnCheckedChangeListener(object: CompoundButton.OnCheckedChangeListener {
override fun onCheckedChanged(buttonView: CompoundButton?, isChecked: Boolean) {
override fun onCheckedChanged(
buttonView: CompoundButton,
isChecked: Boolean
) {
if(isChecked){
binding.rb1.isChecked = false
binding.rb2.isChecked = false
@ -137,7 +146,10 @@ class CustomDialogChangeLevelActivity : Activity() {
}
})
binding.rb4.setOnCheckedChangeListener(object: CompoundButton.OnCheckedChangeListener {
override fun onCheckedChanged(buttonView: CompoundButton?, isChecked: Boolean) {
override fun onCheckedChanged(
buttonView: CompoundButton,
isChecked: Boolean
) {
if(isChecked){
binding.rb1.isChecked = false
binding.rb2.isChecked = false
@ -149,7 +161,10 @@ class CustomDialogChangeLevelActivity : Activity() {
}
})
binding.rb5.setOnCheckedChangeListener(object: CompoundButton.OnCheckedChangeListener {
override fun onCheckedChanged(buttonView: CompoundButton?, isChecked: Boolean) {
override fun onCheckedChanged(
buttonView: CompoundButton,
isChecked: Boolean
) {
if(isChecked){
binding.rb1.isChecked = false
binding.rb2.isChecked = false
@ -161,7 +176,10 @@ class CustomDialogChangeLevelActivity : Activity() {
}
})
binding.rb6.setOnCheckedChangeListener(object: CompoundButton.OnCheckedChangeListener {
override fun onCheckedChanged(buttonView: CompoundButton?, isChecked: Boolean) {
override fun onCheckedChanged(
buttonView: CompoundButton,
isChecked: Boolean
) {
if(isChecked){
binding.rb1.isChecked = false
binding.rb2.isChecked = false

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

@ -39,6 +39,7 @@ class WorkRiskListActivity : BaseActivityOaToolbarViewBinding<ActivityWorkRiskLi
private lateinit var mAdapter: WorkRiskLevelListAdapter
private var selectList: MutableList<Int> = mutableListOf()
private var jobNoList: MutableList<String> = mutableListOf()
private var dataA: MutableList<WorkRiskLevelListBean.RowsBean> = mutableListOf()
private var dataB: MutableList<WorkRiskLevelListBean.RowsBean> = mutableListOf()
@ -63,6 +64,7 @@ class WorkRiskListActivity : BaseActivityOaToolbarViewBinding<ActivityWorkRiskLi
val intent = Intent(context, WorkTickerSelectListActivity::class.java)
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
intent.putExtra("selectList", GsonUtils.GsonString(selectList))
intent.putExtra("jobNoList", GsonUtils.GsonString(jobNoList))
startActivity(intent)
}else{
showToast("列表数据加载失败，请检查网络环境或重新加载列表数据")
@ -219,8 +221,10 @@ class WorkRiskListActivity : BaseActivityOaToolbarViewBinding<ActivityWorkRiskLi
selectList.clear()
jobNoList.clear()
for(item in datas){
selectList.add(item.id)
jobNoList.add(item.jobNo)
showLog(GsonUtils.GsonString(item))
if(item.level!=null&&item.level=="A"){
dataA.add(item)

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

@ -7,6 +7,7 @@ import android.widget.CheckBox
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.WorkTickerSelectListAdapter
import com.rehome.zhdcoa.base.BaseActivityOaToolbarViewBinding
@ -49,6 +50,9 @@ class WorkTickerSelectListActivity : BaseActivityOaToolbarViewBinding<ActivityWo
private var deleteIdList : MutableList<Int> = mutableListOf()
private var selectList: MutableList<Int> = mutableListOf()
private var jobNoList: MutableList<String> = mutableListOf()
private lateinit var calendar: Calendar
//格式化日期的对象(转化成习惯的时间格式)
@ -69,13 +73,20 @@ class WorkTickerSelectListActivity : BaseActivityOaToolbarViewBinding<ActivityWo
val selectListStr = intent.getStringExtra("selectList")!!
showLog(selectListStr)
val gson = Gson()
// if("".equals(selectListStr))
val selectListTemp:MutableList<Int> = gson.fromJson<MutableList<Int>>(selectListStr,object:TypeToken<MutableList<Int>>() {}.type)
showLog(GsonUtils.GsonString(selectListTemp))
if(selectListTemp.isNotEmpty()){
selectList.addAll(selectListTemp)
}
val jobNoListStr = intent.getStringExtra("jobNoList")!!
showLog(jobNoListStr)
val jobNoListTemp:MutableList<String> = gson.fromJson<MutableList<String>>(jobNoListStr,object:TypeToken<MutableList<String>>() {}.type)
showLog(GsonUtils.GsonString(jobNoListTemp))
if(jobNoListTemp.isNotEmpty()){
jobNoList.addAll(jobNoListTemp)
}
binding.tvSt.setOnClickListener(View.OnClickListener { view: View? ->
@ -217,15 +228,16 @@ class WorkTickerSelectListActivity : BaseActivityOaToolbarViewBinding<ActivityWo
)
if (bean != null && bean.data != null) {
val workRiskLevelLists = bean.data
if (workRiskLevelLists != null && workRiskLevelLists.size > 0) {
if (workRiskLevelLists != null && workRiskLevelLists.isNotEmpty()) {
binding.tvNodata.visibility = View.GONE
datas.clear()
if(selectList.size>0){
if(selectList.isNotEmpty()){
for (i in workRiskLevelLists.indices) {
for (j in selectList.indices) {
if (workRiskLevelLists[i].id==selectList[j]) {
workRiskLevelLists[i].isChecked = true
workRiskLevelLists[i].jobNo = jobNoList[j]
}
}
}
@ -291,6 +303,7 @@ class WorkTickerSelectListActivity : BaseActivityOaToolbarViewBinding<ActivityWo
param["assignmentDate"] = binding.tvSt.text.toString().trim()
param["ticketIdList"] = ticketIdList
param["deleteIdList"]= deleteIdList
param["jobNo"]= App.getInstance().userInfo.manid
val json = GsonUtils.GsonString(param)
showLog(json)

12
app/src/main/res/layout/adapter_work_ticket_select_list.xml
Unescape Escape View File

@ -48,7 +48,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="0.7"
android:layout_weight="0.9"
android:gravity="center"
android:text="工作票号" />
@ -63,7 +63,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:layout_marginLeft="10px"
android:layout_marginStart="1dp"
android:layout_weight="2"
android:text="工作内容" />
@ -79,8 +79,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:layout_marginLeft="10px"
android:layout_weight="0.7"
android:layout_marginStart="1dp"
android:layout_weight="0.8"
android:text="风险等级" />
<View
@ -94,8 +94,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:layout_marginLeft="10px"
android:layout_weight="0.7"
android:layout_marginStart="1dp"
android:layout_weight="0.6"
android:text="专业" />
<View

22
app/src/main/res/layout/header_work_ticket_select_list.xml
Unescape Escape View File

@ -47,7 +47,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="0.7"
android:layout_weight="0.9"
android:gravity="center"
android:text="工作票号" />
@ -62,7 +62,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:layout_marginLeft="10px"
android:layout_marginStart="1dp"
android:layout_weight="2"
android:text="工作内容" />
@ -78,10 +78,24 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:layout_marginLeft="10px"
android:layout_weight="0.7"
android:layout_marginStart="1dp"
android:layout_weight="0.8"
android:text="风险等级" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="#524658" />
<TextView
android:id="@+id/tv_zy"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:layout_marginStart="1dp"
android:layout_weight="0.6"
android:text="专业" />
<View
android:layout_width="1dp"

Write Preview
Loading…
Cancel
Save