diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index db1fd76..05fd9fa 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index db1fd76..05fd9fa 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index fe9bf46..d7f7073 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index db1fd76..05fd9fa 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index fe9bf46..d7f7073 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 6dd8cb7..3a80c94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -34,12 +34,12 @@ @NonNull @Override public DeptTodoOrHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -58,14 +58,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -77,7 +77,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index db1fd76..05fd9fa 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index fe9bf46..d7f7073 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 6dd8cb7..3a80c94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -34,12 +34,12 @@ @NonNull @Override public DeptTodoOrHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -58,14 +58,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -77,7 +77,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index 12707a2..7ad05ff 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index db1fd76..05fd9fa 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index fe9bf46..d7f7073 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 6dd8cb7..3a80c94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -34,12 +34,12 @@ @NonNull @Override public DeptTodoOrHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -58,14 +58,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -77,7 +77,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index 12707a2..7ad05ff 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 52cd5ad..1301830 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index db1fd76..05fd9fa 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index fe9bf46..d7f7073 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 6dd8cb7..3a80c94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -34,12 +34,12 @@ @NonNull @Override public DeptTodoOrHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -58,14 +58,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -77,7 +77,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index 12707a2..7ad05ff 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 52cd5ad..1301830 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java new file mode 100644 index 0000000..de27d58 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -0,0 +1,98 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class VerifyCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public VerifyCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull VerifyCaseListAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + //核实图片 + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index db1fd76..05fd9fa 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index fe9bf46..d7f7073 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 6dd8cb7..3a80c94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -34,12 +34,12 @@ @NonNull @Override public DeptTodoOrHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -58,14 +58,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -77,7 +77,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index 12707a2..7ad05ff 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 52cd5ad..1301830 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java new file mode 100644 index 0000000..de27d58 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -0,0 +1,98 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class VerifyCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public VerifyCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull VerifyCaseListAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + //核实图片 + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java index 831d676..9dd7c2d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java @@ -313,10 +313,10 @@ EasyToast.show(context, "核查情况还未选择"); return; } - caseViewModel.checkCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, remarks, - StringHelper.reformatURL(imageList) - ); +// caseViewModel.checkCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, remarks, +// StringHelper.reformatURL(imageList) +// ); } }); } diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index db1fd76..05fd9fa 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index fe9bf46..d7f7073 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 6dd8cb7..3a80c94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -34,12 +34,12 @@ @NonNull @Override public DeptTodoOrHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -58,14 +58,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -77,7 +77,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index 12707a2..7ad05ff 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 52cd5ad..1301830 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java new file mode 100644 index 0000000..de27d58 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -0,0 +1,98 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class VerifyCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public VerifyCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull VerifyCaseListAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + //核实图片 + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java index 831d676..9dd7c2d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java @@ -313,10 +313,10 @@ EasyToast.show(context, "核查情况还未选择"); return; } - caseViewModel.checkCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, remarks, - StringHelper.reformatURL(imageList) - ); +// caseViewModel.checkCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, remarks, +// StringHelper.reformatURL(imageList) +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 5d844b3..1328d81 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -300,10 +300,10 @@ return; } } - caseViewModel.handleOvertimeCase( - data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult - ); +// caseViewModel.handleOvertimeCase( +// data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult +// ); } }); } diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index db1fd76..05fd9fa 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index fe9bf46..d7f7073 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 6dd8cb7..3a80c94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -34,12 +34,12 @@ @NonNull @Override public DeptTodoOrHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -58,14 +58,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -77,7 +77,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index 12707a2..7ad05ff 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 52cd5ad..1301830 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java new file mode 100644 index 0000000..de27d58 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -0,0 +1,98 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class VerifyCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public VerifyCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull VerifyCaseListAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + //核实图片 + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java index 831d676..9dd7c2d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java @@ -313,10 +313,10 @@ EasyToast.show(context, "核查情况还未选择"); return; } - caseViewModel.checkCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, remarks, - StringHelper.reformatURL(imageList) - ); +// caseViewModel.checkCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, remarks, +// StringHelper.reformatURL(imageList) +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 5d844b3..1328d81 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -300,10 +300,10 @@ return; } } - caseViewModel.handleOvertimeCase( - data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult - ); +// caseViewModel.handleOvertimeCase( +// data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java index ba820a3..cdc9499 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java @@ -188,7 +188,7 @@ EasyToast.show(this, "督办意见不能为空"); return; } - caseViewModel.updateCaseSupervise(id, remarks); +// caseViewModel.updateCaseSupervise(id, remarks); } @Override diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index db1fd76..05fd9fa 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index fe9bf46..d7f7073 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 6dd8cb7..3a80c94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -34,12 +34,12 @@ @NonNull @Override public DeptTodoOrHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -58,14 +58,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -77,7 +77,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index 12707a2..7ad05ff 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 52cd5ad..1301830 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java new file mode 100644 index 0000000..de27d58 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -0,0 +1,98 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class VerifyCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public VerifyCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull VerifyCaseListAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + //核实图片 + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java index 831d676..9dd7c2d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java @@ -313,10 +313,10 @@ EasyToast.show(context, "核查情况还未选择"); return; } - caseViewModel.checkCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, remarks, - StringHelper.reformatURL(imageList) - ); +// caseViewModel.checkCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, remarks, +// StringHelper.reformatURL(imageList) +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 5d844b3..1328d81 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -300,10 +300,10 @@ return; } } - caseViewModel.handleOvertimeCase( - data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult - ); +// caseViewModel.handleOvertimeCase( +// data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java index ba820a3..cdc9499 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java @@ -188,7 +188,7 @@ EasyToast.show(this, "督办意见不能为空"); return; } - caseViewModel.updateCaseSupervise(id, remarks); +// caseViewModel.updateCaseSupervise(id, remarks); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java index 3351929..df2ca25 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java @@ -26,6 +26,7 @@ import com.casic.dcms.mvvm.model.CaseLargeTypeBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; import com.casic.dcms.mvvm.model.CaseSmallTypeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.CommonDataViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; @@ -65,6 +66,7 @@ private CommonDataViewModel commonDataViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private List largeTypeBeans; private List smallTypeBeans; private String id; @@ -120,6 +122,7 @@ commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); caseViewModel.obtainCaseDetail(id); @@ -154,12 +157,12 @@ viewBinding.caseEndTimeView.setText(data.getNodeLimittime()); viewBinding.caseSituationView.setText(StringHelper.filterString(data.getDescription())); - //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，其他类型不可修改 + //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，案卷类型可修改；否则不可修改 int source = data.getSource(); if (source != 11 && source != 12) { - viewBinding.i.setVisibility(View.GONE); - viewBinding.ii.setVisibility(View.GONE); - viewBinding.iii.setVisibility(View.GONE); + viewBinding.caseTypeRightImage.setVisibility(View.GONE); + viewBinding.largeTypeRightImage.setVisibility(View.GONE); + viewBinding.smallTypeRightImage.setVisibility(View.GONE); viewBinding.caseClassLayout.setClickable(false); viewBinding.caseLargeClassLayout.setClickable(false); @@ -186,7 +189,7 @@ if (urls.get(position).isEmpty()) { EasyToast.show(context, "图片加载失败，无法查看大图"); } else { - OtherUtils.showBigImage(context, position, urls); + ContextUtil.navigatePageTo(context, BigImageActivity.class, position, urls); } } }); @@ -364,7 +367,6 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - viewBinding.caseOpinionView.setText(dataBean.getNextOperation()); viewBinding.caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -379,24 +381,7 @@ verifyImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseVerifyDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseVerifyDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -418,7 +403,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.isSuccess()) { - if (verifyImageAdapter.getItemCount() <= 2) { + if (verifyImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -446,7 +431,7 @@ submitCase(); } }); - caseViewModel.loadState.observe(this, new Observer() { + operateViewModel.loadState.observe(this, new Observer() { @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { @@ -462,44 +447,25 @@ }); } - private void submitCase() { - String remarks = viewBinding.caseOpinionView.getText().toString(); - if (TextUtils.isEmpty(remarks)) { - EasyToast.show(this, "核实意见不能为空"); - return; - } - if (TextUtils.isEmpty(changeState)) { - EasyToast.show(this, "核实情况还未选择"); - return; - } - int source = data.getSource(); - if (source != 11 && source != 12) { - //修改案卷 - caseViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList)); - } else { - //补全案卷 - if (TextUtils.isEmpty(gridId)) { - EasyToast.show(this, "网格ID异常，请重新选择"); - return; - } - String fieldIntro = viewBinding.casePlaceView.getText().toString(); - if (TextUtils.isEmpty(fieldIntro)) { - EasyToast.show(this, "案卷地点还未填写"); - } - if (longitude == 0 || latitude == 0) { - EasyToast.show(this, "经纬度异常，请重新选择位置"); - return; - } - caseViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList), - eorc == null ? data.getEorc() : eorc, - typeCode == null ? data.getCasetypeCode() : typeCode, - typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, - String.valueOf(longitude), String.valueOf(latitude), - "1", gridId.substring(0, 6), - gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); - } + private void selectPicture() { + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseVerifyDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override @@ -528,6 +494,46 @@ } } + private void submitCase() { + String remarks = viewBinding.caseConditionView.getText().toString(); + if (TextUtils.isEmpty(remarks)) { + EasyToast.show(this, "核实意见不能为空"); + return; + } + if (TextUtils.isEmpty(changeState)) { + EasyToast.show(this, "核实情况还未选择"); + return; + } + int source = data.getSource(); + if (source != 11 && source != 12) { + //修改案卷 + operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList)); + } else { + //补全案卷 + if (TextUtils.isEmpty(gridId)) { + EasyToast.show(this, "网格ID异常，请重新选择"); + return; + } + String fieldIntro = viewBinding.casePlaceView.getText().toString(); + if (TextUtils.isEmpty(fieldIntro)) { + EasyToast.show(this, "案卷地点还未填写"); + } + if (longitude == 0 || latitude == 0) { + EasyToast.show(this, "经纬度异常，请重新选择位置"); + return; + } + operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList), + eorc == null ? data.getEorc() : eorc, + typeCode == null ? data.getCasetypeCode() : typeCode, + typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, + String.valueOf(longitude), String.valueOf(latitude), + "1", gridId.substring(0, 6), + gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); + } + } + @Override protected void onDestroy() { viewBinding.audioPlayerView.release(); diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index db1fd76..05fd9fa 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index fe9bf46..d7f7073 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 6dd8cb7..3a80c94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -34,12 +34,12 @@ @NonNull @Override public DeptTodoOrHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -58,14 +58,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -77,7 +77,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index 12707a2..7ad05ff 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 52cd5ad..1301830 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java new file mode 100644 index 0000000..de27d58 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -0,0 +1,98 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class VerifyCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public VerifyCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull VerifyCaseListAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + //核实图片 + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java index 831d676..9dd7c2d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java @@ -313,10 +313,10 @@ EasyToast.show(context, "核查情况还未选择"); return; } - caseViewModel.checkCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, remarks, - StringHelper.reformatURL(imageList) - ); +// caseViewModel.checkCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, remarks, +// StringHelper.reformatURL(imageList) +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 5d844b3..1328d81 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -300,10 +300,10 @@ return; } } - caseViewModel.handleOvertimeCase( - data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult - ); +// caseViewModel.handleOvertimeCase( +// data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java index ba820a3..cdc9499 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java @@ -188,7 +188,7 @@ EasyToast.show(this, "督办意见不能为空"); return; } - caseViewModel.updateCaseSupervise(id, remarks); +// caseViewModel.updateCaseSupervise(id, remarks); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java index 3351929..df2ca25 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java @@ -26,6 +26,7 @@ import com.casic.dcms.mvvm.model.CaseLargeTypeBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; import com.casic.dcms.mvvm.model.CaseSmallTypeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.CommonDataViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; @@ -65,6 +66,7 @@ private CommonDataViewModel commonDataViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private List largeTypeBeans; private List smallTypeBeans; private String id; @@ -120,6 +122,7 @@ commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); caseViewModel.obtainCaseDetail(id); @@ -154,12 +157,12 @@ viewBinding.caseEndTimeView.setText(data.getNodeLimittime()); viewBinding.caseSituationView.setText(StringHelper.filterString(data.getDescription())); - //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，其他类型不可修改 + //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，案卷类型可修改；否则不可修改 int source = data.getSource(); if (source != 11 && source != 12) { - viewBinding.i.setVisibility(View.GONE); - viewBinding.ii.setVisibility(View.GONE); - viewBinding.iii.setVisibility(View.GONE); + viewBinding.caseTypeRightImage.setVisibility(View.GONE); + viewBinding.largeTypeRightImage.setVisibility(View.GONE); + viewBinding.smallTypeRightImage.setVisibility(View.GONE); viewBinding.caseClassLayout.setClickable(false); viewBinding.caseLargeClassLayout.setClickable(false); @@ -186,7 +189,7 @@ if (urls.get(position).isEmpty()) { EasyToast.show(context, "图片加载失败，无法查看大图"); } else { - OtherUtils.showBigImage(context, position, urls); + ContextUtil.navigatePageTo(context, BigImageActivity.class, position, urls); } } }); @@ -364,7 +367,6 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - viewBinding.caseOpinionView.setText(dataBean.getNextOperation()); viewBinding.caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -379,24 +381,7 @@ verifyImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseVerifyDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseVerifyDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -418,7 +403,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.isSuccess()) { - if (verifyImageAdapter.getItemCount() <= 2) { + if (verifyImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -446,7 +431,7 @@ submitCase(); } }); - caseViewModel.loadState.observe(this, new Observer() { + operateViewModel.loadState.observe(this, new Observer() { @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { @@ -462,44 +447,25 @@ }); } - private void submitCase() { - String remarks = viewBinding.caseOpinionView.getText().toString(); - if (TextUtils.isEmpty(remarks)) { - EasyToast.show(this, "核实意见不能为空"); - return; - } - if (TextUtils.isEmpty(changeState)) { - EasyToast.show(this, "核实情况还未选择"); - return; - } - int source = data.getSource(); - if (source != 11 && source != 12) { - //修改案卷 - caseViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList)); - } else { - //补全案卷 - if (TextUtils.isEmpty(gridId)) { - EasyToast.show(this, "网格ID异常，请重新选择"); - return; - } - String fieldIntro = viewBinding.casePlaceView.getText().toString(); - if (TextUtils.isEmpty(fieldIntro)) { - EasyToast.show(this, "案卷地点还未填写"); - } - if (longitude == 0 || latitude == 0) { - EasyToast.show(this, "经纬度异常，请重新选择位置"); - return; - } - caseViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList), - eorc == null ? data.getEorc() : eorc, - typeCode == null ? data.getCasetypeCode() : typeCode, - typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, - String.valueOf(longitude), String.valueOf(latitude), - "1", gridId.substring(0, 6), - gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); - } + private void selectPicture() { + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseVerifyDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override @@ -528,6 +494,46 @@ } } + private void submitCase() { + String remarks = viewBinding.caseConditionView.getText().toString(); + if (TextUtils.isEmpty(remarks)) { + EasyToast.show(this, "核实意见不能为空"); + return; + } + if (TextUtils.isEmpty(changeState)) { + EasyToast.show(this, "核实情况还未选择"); + return; + } + int source = data.getSource(); + if (source != 11 && source != 12) { + //修改案卷 + operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList)); + } else { + //补全案卷 + if (TextUtils.isEmpty(gridId)) { + EasyToast.show(this, "网格ID异常，请重新选择"); + return; + } + String fieldIntro = viewBinding.casePlaceView.getText().toString(); + if (TextUtils.isEmpty(fieldIntro)) { + EasyToast.show(this, "案卷地点还未填写"); + } + if (longitude == 0 || latitude == 0) { + EasyToast.show(this, "经纬度异常，请重新选择位置"); + return; + } + operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList), + eorc == null ? data.getEorc() : eorc, + typeCode == null ? data.getCasetypeCode() : typeCode, + typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, + String.valueOf(longitude), String.valueOf(latitude), + "1", gridId.substring(0, 6), + gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); + } + } + @Override protected void onDestroy() { viewBinding.audioPlayerView.release(); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java index 812ceb5..de23222 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java @@ -250,9 +250,9 @@ EasyToast.show(context, "不同意/同意的意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - data.getProcessPersonid()); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// data.getProcessPersonid()); } }); } diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index db1fd76..05fd9fa 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index fe9bf46..d7f7073 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 6dd8cb7..3a80c94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -34,12 +34,12 @@ @NonNull @Override public DeptTodoOrHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -58,14 +58,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -77,7 +77,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index 12707a2..7ad05ff 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 52cd5ad..1301830 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java new file mode 100644 index 0000000..de27d58 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -0,0 +1,98 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class VerifyCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public VerifyCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull VerifyCaseListAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + //核实图片 + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java index 831d676..9dd7c2d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java @@ -313,10 +313,10 @@ EasyToast.show(context, "核查情况还未选择"); return; } - caseViewModel.checkCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, remarks, - StringHelper.reformatURL(imageList) - ); +// caseViewModel.checkCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, remarks, +// StringHelper.reformatURL(imageList) +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 5d844b3..1328d81 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -300,10 +300,10 @@ return; } } - caseViewModel.handleOvertimeCase( - data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult - ); +// caseViewModel.handleOvertimeCase( +// data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java index ba820a3..cdc9499 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java @@ -188,7 +188,7 @@ EasyToast.show(this, "督办意见不能为空"); return; } - caseViewModel.updateCaseSupervise(id, remarks); +// caseViewModel.updateCaseSupervise(id, remarks); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java index 3351929..df2ca25 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java @@ -26,6 +26,7 @@ import com.casic.dcms.mvvm.model.CaseLargeTypeBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; import com.casic.dcms.mvvm.model.CaseSmallTypeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.CommonDataViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; @@ -65,6 +66,7 @@ private CommonDataViewModel commonDataViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private List largeTypeBeans; private List smallTypeBeans; private String id; @@ -120,6 +122,7 @@ commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); caseViewModel.obtainCaseDetail(id); @@ -154,12 +157,12 @@ viewBinding.caseEndTimeView.setText(data.getNodeLimittime()); viewBinding.caseSituationView.setText(StringHelper.filterString(data.getDescription())); - //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，其他类型不可修改 + //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，案卷类型可修改；否则不可修改 int source = data.getSource(); if (source != 11 && source != 12) { - viewBinding.i.setVisibility(View.GONE); - viewBinding.ii.setVisibility(View.GONE); - viewBinding.iii.setVisibility(View.GONE); + viewBinding.caseTypeRightImage.setVisibility(View.GONE); + viewBinding.largeTypeRightImage.setVisibility(View.GONE); + viewBinding.smallTypeRightImage.setVisibility(View.GONE); viewBinding.caseClassLayout.setClickable(false); viewBinding.caseLargeClassLayout.setClickable(false); @@ -186,7 +189,7 @@ if (urls.get(position).isEmpty()) { EasyToast.show(context, "图片加载失败，无法查看大图"); } else { - OtherUtils.showBigImage(context, position, urls); + ContextUtil.navigatePageTo(context, BigImageActivity.class, position, urls); } } }); @@ -364,7 +367,6 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - viewBinding.caseOpinionView.setText(dataBean.getNextOperation()); viewBinding.caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -379,24 +381,7 @@ verifyImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseVerifyDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseVerifyDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -418,7 +403,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.isSuccess()) { - if (verifyImageAdapter.getItemCount() <= 2) { + if (verifyImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -446,7 +431,7 @@ submitCase(); } }); - caseViewModel.loadState.observe(this, new Observer() { + operateViewModel.loadState.observe(this, new Observer() { @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { @@ -462,44 +447,25 @@ }); } - private void submitCase() { - String remarks = viewBinding.caseOpinionView.getText().toString(); - if (TextUtils.isEmpty(remarks)) { - EasyToast.show(this, "核实意见不能为空"); - return; - } - if (TextUtils.isEmpty(changeState)) { - EasyToast.show(this, "核实情况还未选择"); - return; - } - int source = data.getSource(); - if (source != 11 && source != 12) { - //修改案卷 - caseViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList)); - } else { - //补全案卷 - if (TextUtils.isEmpty(gridId)) { - EasyToast.show(this, "网格ID异常，请重新选择"); - return; - } - String fieldIntro = viewBinding.casePlaceView.getText().toString(); - if (TextUtils.isEmpty(fieldIntro)) { - EasyToast.show(this, "案卷地点还未填写"); - } - if (longitude == 0 || latitude == 0) { - EasyToast.show(this, "经纬度异常，请重新选择位置"); - return; - } - caseViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList), - eorc == null ? data.getEorc() : eorc, - typeCode == null ? data.getCasetypeCode() : typeCode, - typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, - String.valueOf(longitude), String.valueOf(latitude), - "1", gridId.substring(0, 6), - gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); - } + private void selectPicture() { + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseVerifyDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override @@ -528,6 +494,46 @@ } } + private void submitCase() { + String remarks = viewBinding.caseConditionView.getText().toString(); + if (TextUtils.isEmpty(remarks)) { + EasyToast.show(this, "核实意见不能为空"); + return; + } + if (TextUtils.isEmpty(changeState)) { + EasyToast.show(this, "核实情况还未选择"); + return; + } + int source = data.getSource(); + if (source != 11 && source != 12) { + //修改案卷 + operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList)); + } else { + //补全案卷 + if (TextUtils.isEmpty(gridId)) { + EasyToast.show(this, "网格ID异常，请重新选择"); + return; + } + String fieldIntro = viewBinding.casePlaceView.getText().toString(); + if (TextUtils.isEmpty(fieldIntro)) { + EasyToast.show(this, "案卷地点还未填写"); + } + if (longitude == 0 || latitude == 0) { + EasyToast.show(this, "经纬度异常，请重新选择位置"); + return; + } + operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList), + eorc == null ? data.getEorc() : eorc, + typeCode == null ? data.getCasetypeCode() : typeCode, + typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, + String.valueOf(longitude), String.valueOf(latitude), + "1", gridId.substring(0, 6), + gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); + } + } + @Override protected void onDestroy() { viewBinding.audioPlayerView.release(); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java index 812ceb5..de23222 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java @@ -250,9 +250,9 @@ EasyToast.show(context, "不同意/同意的意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - data.getProcessPersonid()); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// data.getProcessPersonid()); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java index 4c2badb..31fc6a0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java @@ -314,9 +314,9 @@ if (TextUtils.isEmpty(taskUserId)) { taskUserId = data.getProcessPersonid(); } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// taskUserId); } } diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index db1fd76..05fd9fa 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index fe9bf46..d7f7073 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 6dd8cb7..3a80c94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -34,12 +34,12 @@ @NonNull @Override public DeptTodoOrHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -58,14 +58,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -77,7 +77,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index 12707a2..7ad05ff 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 52cd5ad..1301830 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java new file mode 100644 index 0000000..de27d58 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -0,0 +1,98 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class VerifyCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public VerifyCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull VerifyCaseListAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + //核实图片 + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java index 831d676..9dd7c2d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java @@ -313,10 +313,10 @@ EasyToast.show(context, "核查情况还未选择"); return; } - caseViewModel.checkCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, remarks, - StringHelper.reformatURL(imageList) - ); +// caseViewModel.checkCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, remarks, +// StringHelper.reformatURL(imageList) +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 5d844b3..1328d81 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -300,10 +300,10 @@ return; } } - caseViewModel.handleOvertimeCase( - data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult - ); +// caseViewModel.handleOvertimeCase( +// data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java index ba820a3..cdc9499 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java @@ -188,7 +188,7 @@ EasyToast.show(this, "督办意见不能为空"); return; } - caseViewModel.updateCaseSupervise(id, remarks); +// caseViewModel.updateCaseSupervise(id, remarks); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java index 3351929..df2ca25 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java @@ -26,6 +26,7 @@ import com.casic.dcms.mvvm.model.CaseLargeTypeBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; import com.casic.dcms.mvvm.model.CaseSmallTypeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.CommonDataViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; @@ -65,6 +66,7 @@ private CommonDataViewModel commonDataViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private List largeTypeBeans; private List smallTypeBeans; private String id; @@ -120,6 +122,7 @@ commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); caseViewModel.obtainCaseDetail(id); @@ -154,12 +157,12 @@ viewBinding.caseEndTimeView.setText(data.getNodeLimittime()); viewBinding.caseSituationView.setText(StringHelper.filterString(data.getDescription())); - //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，其他类型不可修改 + //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，案卷类型可修改；否则不可修改 int source = data.getSource(); if (source != 11 && source != 12) { - viewBinding.i.setVisibility(View.GONE); - viewBinding.ii.setVisibility(View.GONE); - viewBinding.iii.setVisibility(View.GONE); + viewBinding.caseTypeRightImage.setVisibility(View.GONE); + viewBinding.largeTypeRightImage.setVisibility(View.GONE); + viewBinding.smallTypeRightImage.setVisibility(View.GONE); viewBinding.caseClassLayout.setClickable(false); viewBinding.caseLargeClassLayout.setClickable(false); @@ -186,7 +189,7 @@ if (urls.get(position).isEmpty()) { EasyToast.show(context, "图片加载失败，无法查看大图"); } else { - OtherUtils.showBigImage(context, position, urls); + ContextUtil.navigatePageTo(context, BigImageActivity.class, position, urls); } } }); @@ -364,7 +367,6 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - viewBinding.caseOpinionView.setText(dataBean.getNextOperation()); viewBinding.caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -379,24 +381,7 @@ verifyImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseVerifyDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseVerifyDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -418,7 +403,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.isSuccess()) { - if (verifyImageAdapter.getItemCount() <= 2) { + if (verifyImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -446,7 +431,7 @@ submitCase(); } }); - caseViewModel.loadState.observe(this, new Observer() { + operateViewModel.loadState.observe(this, new Observer() { @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { @@ -462,44 +447,25 @@ }); } - private void submitCase() { - String remarks = viewBinding.caseOpinionView.getText().toString(); - if (TextUtils.isEmpty(remarks)) { - EasyToast.show(this, "核实意见不能为空"); - return; - } - if (TextUtils.isEmpty(changeState)) { - EasyToast.show(this, "核实情况还未选择"); - return; - } - int source = data.getSource(); - if (source != 11 && source != 12) { - //修改案卷 - caseViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList)); - } else { - //补全案卷 - if (TextUtils.isEmpty(gridId)) { - EasyToast.show(this, "网格ID异常，请重新选择"); - return; - } - String fieldIntro = viewBinding.casePlaceView.getText().toString(); - if (TextUtils.isEmpty(fieldIntro)) { - EasyToast.show(this, "案卷地点还未填写"); - } - if (longitude == 0 || latitude == 0) { - EasyToast.show(this, "经纬度异常，请重新选择位置"); - return; - } - caseViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList), - eorc == null ? data.getEorc() : eorc, - typeCode == null ? data.getCasetypeCode() : typeCode, - typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, - String.valueOf(longitude), String.valueOf(latitude), - "1", gridId.substring(0, 6), - gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); - } + private void selectPicture() { + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseVerifyDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override @@ -528,6 +494,46 @@ } } + private void submitCase() { + String remarks = viewBinding.caseConditionView.getText().toString(); + if (TextUtils.isEmpty(remarks)) { + EasyToast.show(this, "核实意见不能为空"); + return; + } + if (TextUtils.isEmpty(changeState)) { + EasyToast.show(this, "核实情况还未选择"); + return; + } + int source = data.getSource(); + if (source != 11 && source != 12) { + //修改案卷 + operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList)); + } else { + //补全案卷 + if (TextUtils.isEmpty(gridId)) { + EasyToast.show(this, "网格ID异常，请重新选择"); + return; + } + String fieldIntro = viewBinding.casePlaceView.getText().toString(); + if (TextUtils.isEmpty(fieldIntro)) { + EasyToast.show(this, "案卷地点还未填写"); + } + if (longitude == 0 || latitude == 0) { + EasyToast.show(this, "经纬度异常，请重新选择位置"); + return; + } + operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList), + eorc == null ? data.getEorc() : eorc, + typeCode == null ? data.getCasetypeCode() : typeCode, + typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, + String.valueOf(longitude), String.valueOf(latitude), + "1", gridId.substring(0, 6), + gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); + } + } + @Override protected void onDestroy() { viewBinding.audioPlayerView.release(); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java index 812ceb5..de23222 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java @@ -250,9 +250,9 @@ EasyToast.show(context, "不同意/同意的意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - data.getProcessPersonid()); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// data.getProcessPersonid()); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java index 4c2badb..31fc6a0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java @@ -314,9 +314,9 @@ if (TextUtils.isEmpty(taskUserId)) { taskUserId = data.getProcessPersonid(); } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// taskUserId); } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 8fac12c..b8b9c59 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -311,8 +311,8 @@ EasyToast.show(context, "处理意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); } }); } diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index db1fd76..05fd9fa 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index fe9bf46..d7f7073 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 6dd8cb7..3a80c94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -34,12 +34,12 @@ @NonNull @Override public DeptTodoOrHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -58,14 +58,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -77,7 +77,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index 12707a2..7ad05ff 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 52cd5ad..1301830 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java new file mode 100644 index 0000000..de27d58 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -0,0 +1,98 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class VerifyCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public VerifyCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull VerifyCaseListAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + //核实图片 + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java index 831d676..9dd7c2d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java @@ -313,10 +313,10 @@ EasyToast.show(context, "核查情况还未选择"); return; } - caseViewModel.checkCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, remarks, - StringHelper.reformatURL(imageList) - ); +// caseViewModel.checkCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, remarks, +// StringHelper.reformatURL(imageList) +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 5d844b3..1328d81 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -300,10 +300,10 @@ return; } } - caseViewModel.handleOvertimeCase( - data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult - ); +// caseViewModel.handleOvertimeCase( +// data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java index ba820a3..cdc9499 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java @@ -188,7 +188,7 @@ EasyToast.show(this, "督办意见不能为空"); return; } - caseViewModel.updateCaseSupervise(id, remarks); +// caseViewModel.updateCaseSupervise(id, remarks); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java index 3351929..df2ca25 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java @@ -26,6 +26,7 @@ import com.casic.dcms.mvvm.model.CaseLargeTypeBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; import com.casic.dcms.mvvm.model.CaseSmallTypeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.CommonDataViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; @@ -65,6 +66,7 @@ private CommonDataViewModel commonDataViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private List largeTypeBeans; private List smallTypeBeans; private String id; @@ -120,6 +122,7 @@ commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); caseViewModel.obtainCaseDetail(id); @@ -154,12 +157,12 @@ viewBinding.caseEndTimeView.setText(data.getNodeLimittime()); viewBinding.caseSituationView.setText(StringHelper.filterString(data.getDescription())); - //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，其他类型不可修改 + //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，案卷类型可修改；否则不可修改 int source = data.getSource(); if (source != 11 && source != 12) { - viewBinding.i.setVisibility(View.GONE); - viewBinding.ii.setVisibility(View.GONE); - viewBinding.iii.setVisibility(View.GONE); + viewBinding.caseTypeRightImage.setVisibility(View.GONE); + viewBinding.largeTypeRightImage.setVisibility(View.GONE); + viewBinding.smallTypeRightImage.setVisibility(View.GONE); viewBinding.caseClassLayout.setClickable(false); viewBinding.caseLargeClassLayout.setClickable(false); @@ -186,7 +189,7 @@ if (urls.get(position).isEmpty()) { EasyToast.show(context, "图片加载失败，无法查看大图"); } else { - OtherUtils.showBigImage(context, position, urls); + ContextUtil.navigatePageTo(context, BigImageActivity.class, position, urls); } } }); @@ -364,7 +367,6 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - viewBinding.caseOpinionView.setText(dataBean.getNextOperation()); viewBinding.caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -379,24 +381,7 @@ verifyImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseVerifyDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseVerifyDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -418,7 +403,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.isSuccess()) { - if (verifyImageAdapter.getItemCount() <= 2) { + if (verifyImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -446,7 +431,7 @@ submitCase(); } }); - caseViewModel.loadState.observe(this, new Observer() { + operateViewModel.loadState.observe(this, new Observer() { @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { @@ -462,44 +447,25 @@ }); } - private void submitCase() { - String remarks = viewBinding.caseOpinionView.getText().toString(); - if (TextUtils.isEmpty(remarks)) { - EasyToast.show(this, "核实意见不能为空"); - return; - } - if (TextUtils.isEmpty(changeState)) { - EasyToast.show(this, "核实情况还未选择"); - return; - } - int source = data.getSource(); - if (source != 11 && source != 12) { - //修改案卷 - caseViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList)); - } else { - //补全案卷 - if (TextUtils.isEmpty(gridId)) { - EasyToast.show(this, "网格ID异常，请重新选择"); - return; - } - String fieldIntro = viewBinding.casePlaceView.getText().toString(); - if (TextUtils.isEmpty(fieldIntro)) { - EasyToast.show(this, "案卷地点还未填写"); - } - if (longitude == 0 || latitude == 0) { - EasyToast.show(this, "经纬度异常，请重新选择位置"); - return; - } - caseViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList), - eorc == null ? data.getEorc() : eorc, - typeCode == null ? data.getCasetypeCode() : typeCode, - typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, - String.valueOf(longitude), String.valueOf(latitude), - "1", gridId.substring(0, 6), - gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); - } + private void selectPicture() { + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseVerifyDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override @@ -528,6 +494,46 @@ } } + private void submitCase() { + String remarks = viewBinding.caseConditionView.getText().toString(); + if (TextUtils.isEmpty(remarks)) { + EasyToast.show(this, "核实意见不能为空"); + return; + } + if (TextUtils.isEmpty(changeState)) { + EasyToast.show(this, "核实情况还未选择"); + return; + } + int source = data.getSource(); + if (source != 11 && source != 12) { + //修改案卷 + operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList)); + } else { + //补全案卷 + if (TextUtils.isEmpty(gridId)) { + EasyToast.show(this, "网格ID异常，请重新选择"); + return; + } + String fieldIntro = viewBinding.casePlaceView.getText().toString(); + if (TextUtils.isEmpty(fieldIntro)) { + EasyToast.show(this, "案卷地点还未填写"); + } + if (longitude == 0 || latitude == 0) { + EasyToast.show(this, "经纬度异常，请重新选择位置"); + return; + } + operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList), + eorc == null ? data.getEorc() : eorc, + typeCode == null ? data.getCasetypeCode() : typeCode, + typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, + String.valueOf(longitude), String.valueOf(latitude), + "1", gridId.substring(0, 6), + gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); + } + } + @Override protected void onDestroy() { viewBinding.audioPlayerView.release(); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java index 812ceb5..de23222 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java @@ -250,9 +250,9 @@ EasyToast.show(context, "不同意/同意的意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - data.getProcessPersonid()); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// data.getProcessPersonid()); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java index 4c2badb..31fc6a0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java @@ -314,9 +314,9 @@ if (TextUtils.isEmpty(taskUserId)) { taskUserId = data.getProcessPersonid(); } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// taskUserId); } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 8fac12c..b8b9c59 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -311,8 +311,8 @@ EasyToast.show(context, "处理意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java index f758047..919b18f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java @@ -415,7 +415,7 @@ return; } } - caseViewModel.handleOvertimeCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); +// caseViewModel.handleOvertimeCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); } } diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index db1fd76..05fd9fa 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index fe9bf46..d7f7073 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 6dd8cb7..3a80c94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -34,12 +34,12 @@ @NonNull @Override public DeptTodoOrHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -58,14 +58,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -77,7 +77,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index 12707a2..7ad05ff 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 52cd5ad..1301830 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java new file mode 100644 index 0000000..de27d58 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -0,0 +1,98 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class VerifyCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public VerifyCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull VerifyCaseListAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + //核实图片 + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java index 831d676..9dd7c2d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java @@ -313,10 +313,10 @@ EasyToast.show(context, "核查情况还未选择"); return; } - caseViewModel.checkCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, remarks, - StringHelper.reformatURL(imageList) - ); +// caseViewModel.checkCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, remarks, +// StringHelper.reformatURL(imageList) +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 5d844b3..1328d81 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -300,10 +300,10 @@ return; } } - caseViewModel.handleOvertimeCase( - data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult - ); +// caseViewModel.handleOvertimeCase( +// data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java index ba820a3..cdc9499 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java @@ -188,7 +188,7 @@ EasyToast.show(this, "督办意见不能为空"); return; } - caseViewModel.updateCaseSupervise(id, remarks); +// caseViewModel.updateCaseSupervise(id, remarks); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java index 3351929..df2ca25 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java @@ -26,6 +26,7 @@ import com.casic.dcms.mvvm.model.CaseLargeTypeBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; import com.casic.dcms.mvvm.model.CaseSmallTypeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.CommonDataViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; @@ -65,6 +66,7 @@ private CommonDataViewModel commonDataViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private List largeTypeBeans; private List smallTypeBeans; private String id; @@ -120,6 +122,7 @@ commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); caseViewModel.obtainCaseDetail(id); @@ -154,12 +157,12 @@ viewBinding.caseEndTimeView.setText(data.getNodeLimittime()); viewBinding.caseSituationView.setText(StringHelper.filterString(data.getDescription())); - //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，其他类型不可修改 + //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，案卷类型可修改；否则不可修改 int source = data.getSource(); if (source != 11 && source != 12) { - viewBinding.i.setVisibility(View.GONE); - viewBinding.ii.setVisibility(View.GONE); - viewBinding.iii.setVisibility(View.GONE); + viewBinding.caseTypeRightImage.setVisibility(View.GONE); + viewBinding.largeTypeRightImage.setVisibility(View.GONE); + viewBinding.smallTypeRightImage.setVisibility(View.GONE); viewBinding.caseClassLayout.setClickable(false); viewBinding.caseLargeClassLayout.setClickable(false); @@ -186,7 +189,7 @@ if (urls.get(position).isEmpty()) { EasyToast.show(context, "图片加载失败，无法查看大图"); } else { - OtherUtils.showBigImage(context, position, urls); + ContextUtil.navigatePageTo(context, BigImageActivity.class, position, urls); } } }); @@ -364,7 +367,6 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - viewBinding.caseOpinionView.setText(dataBean.getNextOperation()); viewBinding.caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -379,24 +381,7 @@ verifyImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseVerifyDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseVerifyDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -418,7 +403,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.isSuccess()) { - if (verifyImageAdapter.getItemCount() <= 2) { + if (verifyImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -446,7 +431,7 @@ submitCase(); } }); - caseViewModel.loadState.observe(this, new Observer() { + operateViewModel.loadState.observe(this, new Observer() { @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { @@ -462,44 +447,25 @@ }); } - private void submitCase() { - String remarks = viewBinding.caseOpinionView.getText().toString(); - if (TextUtils.isEmpty(remarks)) { - EasyToast.show(this, "核实意见不能为空"); - return; - } - if (TextUtils.isEmpty(changeState)) { - EasyToast.show(this, "核实情况还未选择"); - return; - } - int source = data.getSource(); - if (source != 11 && source != 12) { - //修改案卷 - caseViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList)); - } else { - //补全案卷 - if (TextUtils.isEmpty(gridId)) { - EasyToast.show(this, "网格ID异常，请重新选择"); - return; - } - String fieldIntro = viewBinding.casePlaceView.getText().toString(); - if (TextUtils.isEmpty(fieldIntro)) { - EasyToast.show(this, "案卷地点还未填写"); - } - if (longitude == 0 || latitude == 0) { - EasyToast.show(this, "经纬度异常，请重新选择位置"); - return; - } - caseViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList), - eorc == null ? data.getEorc() : eorc, - typeCode == null ? data.getCasetypeCode() : typeCode, - typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, - String.valueOf(longitude), String.valueOf(latitude), - "1", gridId.substring(0, 6), - gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); - } + private void selectPicture() { + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseVerifyDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override @@ -528,6 +494,46 @@ } } + private void submitCase() { + String remarks = viewBinding.caseConditionView.getText().toString(); + if (TextUtils.isEmpty(remarks)) { + EasyToast.show(this, "核实意见不能为空"); + return; + } + if (TextUtils.isEmpty(changeState)) { + EasyToast.show(this, "核实情况还未选择"); + return; + } + int source = data.getSource(); + if (source != 11 && source != 12) { + //修改案卷 + operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList)); + } else { + //补全案卷 + if (TextUtils.isEmpty(gridId)) { + EasyToast.show(this, "网格ID异常，请重新选择"); + return; + } + String fieldIntro = viewBinding.casePlaceView.getText().toString(); + if (TextUtils.isEmpty(fieldIntro)) { + EasyToast.show(this, "案卷地点还未填写"); + } + if (longitude == 0 || latitude == 0) { + EasyToast.show(this, "经纬度异常，请重新选择位置"); + return; + } + operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList), + eorc == null ? data.getEorc() : eorc, + typeCode == null ? data.getCasetypeCode() : typeCode, + typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, + String.valueOf(longitude), String.valueOf(latitude), + "1", gridId.substring(0, 6), + gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); + } + } + @Override protected void onDestroy() { viewBinding.audioPlayerView.release(); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java index 812ceb5..de23222 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java @@ -250,9 +250,9 @@ EasyToast.show(context, "不同意/同意的意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - data.getProcessPersonid()); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// data.getProcessPersonid()); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java index 4c2badb..31fc6a0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java @@ -314,9 +314,9 @@ if (TextUtils.isEmpty(taskUserId)) { taskUserId = data.getProcessPersonid(); } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// taskUserId); } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 8fac12c..b8b9c59 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -311,8 +311,8 @@ EasyToast.show(context, "处理意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java index f758047..919b18f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java @@ -415,7 +415,7 @@ return; } } - caseViewModel.handleOvertimeCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); +// caseViewModel.handleOvertimeCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java index 255cd80..3bb2d08 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java @@ -13,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -39,8 +40,9 @@ //绑定TabLayout viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index db1fd76..05fd9fa 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index fe9bf46..d7f7073 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 6dd8cb7..3a80c94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -34,12 +34,12 @@ @NonNull @Override public DeptTodoOrHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -58,14 +58,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -77,7 +77,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index 12707a2..7ad05ff 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 52cd5ad..1301830 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java new file mode 100644 index 0000000..de27d58 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -0,0 +1,98 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class VerifyCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public VerifyCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull VerifyCaseListAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + //核实图片 + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java index 831d676..9dd7c2d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java @@ -313,10 +313,10 @@ EasyToast.show(context, "核查情况还未选择"); return; } - caseViewModel.checkCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, remarks, - StringHelper.reformatURL(imageList) - ); +// caseViewModel.checkCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, remarks, +// StringHelper.reformatURL(imageList) +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 5d844b3..1328d81 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -300,10 +300,10 @@ return; } } - caseViewModel.handleOvertimeCase( - data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult - ); +// caseViewModel.handleOvertimeCase( +// data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java index ba820a3..cdc9499 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java @@ -188,7 +188,7 @@ EasyToast.show(this, "督办意见不能为空"); return; } - caseViewModel.updateCaseSupervise(id, remarks); +// caseViewModel.updateCaseSupervise(id, remarks); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java index 3351929..df2ca25 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java @@ -26,6 +26,7 @@ import com.casic.dcms.mvvm.model.CaseLargeTypeBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; import com.casic.dcms.mvvm.model.CaseSmallTypeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.CommonDataViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; @@ -65,6 +66,7 @@ private CommonDataViewModel commonDataViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private List largeTypeBeans; private List smallTypeBeans; private String id; @@ -120,6 +122,7 @@ commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); caseViewModel.obtainCaseDetail(id); @@ -154,12 +157,12 @@ viewBinding.caseEndTimeView.setText(data.getNodeLimittime()); viewBinding.caseSituationView.setText(StringHelper.filterString(data.getDescription())); - //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，其他类型不可修改 + //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，案卷类型可修改；否则不可修改 int source = data.getSource(); if (source != 11 && source != 12) { - viewBinding.i.setVisibility(View.GONE); - viewBinding.ii.setVisibility(View.GONE); - viewBinding.iii.setVisibility(View.GONE); + viewBinding.caseTypeRightImage.setVisibility(View.GONE); + viewBinding.largeTypeRightImage.setVisibility(View.GONE); + viewBinding.smallTypeRightImage.setVisibility(View.GONE); viewBinding.caseClassLayout.setClickable(false); viewBinding.caseLargeClassLayout.setClickable(false); @@ -186,7 +189,7 @@ if (urls.get(position).isEmpty()) { EasyToast.show(context, "图片加载失败，无法查看大图"); } else { - OtherUtils.showBigImage(context, position, urls); + ContextUtil.navigatePageTo(context, BigImageActivity.class, position, urls); } } }); @@ -364,7 +367,6 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - viewBinding.caseOpinionView.setText(dataBean.getNextOperation()); viewBinding.caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -379,24 +381,7 @@ verifyImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseVerifyDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseVerifyDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -418,7 +403,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.isSuccess()) { - if (verifyImageAdapter.getItemCount() <= 2) { + if (verifyImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -446,7 +431,7 @@ submitCase(); } }); - caseViewModel.loadState.observe(this, new Observer() { + operateViewModel.loadState.observe(this, new Observer() { @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { @@ -462,44 +447,25 @@ }); } - private void submitCase() { - String remarks = viewBinding.caseOpinionView.getText().toString(); - if (TextUtils.isEmpty(remarks)) { - EasyToast.show(this, "核实意见不能为空"); - return; - } - if (TextUtils.isEmpty(changeState)) { - EasyToast.show(this, "核实情况还未选择"); - return; - } - int source = data.getSource(); - if (source != 11 && source != 12) { - //修改案卷 - caseViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList)); - } else { - //补全案卷 - if (TextUtils.isEmpty(gridId)) { - EasyToast.show(this, "网格ID异常，请重新选择"); - return; - } - String fieldIntro = viewBinding.casePlaceView.getText().toString(); - if (TextUtils.isEmpty(fieldIntro)) { - EasyToast.show(this, "案卷地点还未填写"); - } - if (longitude == 0 || latitude == 0) { - EasyToast.show(this, "经纬度异常，请重新选择位置"); - return; - } - caseViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList), - eorc == null ? data.getEorc() : eorc, - typeCode == null ? data.getCasetypeCode() : typeCode, - typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, - String.valueOf(longitude), String.valueOf(latitude), - "1", gridId.substring(0, 6), - gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); - } + private void selectPicture() { + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseVerifyDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override @@ -528,6 +494,46 @@ } } + private void submitCase() { + String remarks = viewBinding.caseConditionView.getText().toString(); + if (TextUtils.isEmpty(remarks)) { + EasyToast.show(this, "核实意见不能为空"); + return; + } + if (TextUtils.isEmpty(changeState)) { + EasyToast.show(this, "核实情况还未选择"); + return; + } + int source = data.getSource(); + if (source != 11 && source != 12) { + //修改案卷 + operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList)); + } else { + //补全案卷 + if (TextUtils.isEmpty(gridId)) { + EasyToast.show(this, "网格ID异常，请重新选择"); + return; + } + String fieldIntro = viewBinding.casePlaceView.getText().toString(); + if (TextUtils.isEmpty(fieldIntro)) { + EasyToast.show(this, "案卷地点还未填写"); + } + if (longitude == 0 || latitude == 0) { + EasyToast.show(this, "经纬度异常，请重新选择位置"); + return; + } + operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList), + eorc == null ? data.getEorc() : eorc, + typeCode == null ? data.getCasetypeCode() : typeCode, + typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, + String.valueOf(longitude), String.valueOf(latitude), + "1", gridId.substring(0, 6), + gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); + } + } + @Override protected void onDestroy() { viewBinding.audioPlayerView.release(); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java index 812ceb5..de23222 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java @@ -250,9 +250,9 @@ EasyToast.show(context, "不同意/同意的意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - data.getProcessPersonid()); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// data.getProcessPersonid()); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java index 4c2badb..31fc6a0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java @@ -314,9 +314,9 @@ if (TextUtils.isEmpty(taskUserId)) { taskUserId = data.getProcessPersonid(); } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// taskUserId); } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 8fac12c..b8b9c59 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -311,8 +311,8 @@ EasyToast.show(context, "处理意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java index f758047..919b18f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java @@ -415,7 +415,7 @@ return; } } - caseViewModel.handleOvertimeCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); +// caseViewModel.handleOvertimeCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java index 255cd80..3bb2d08 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java @@ -13,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -39,8 +40,9 @@ //绑定TabLayout viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java index be19486..9aaef7e 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseVerifyResultAdapter; +import com.casic.dcms.adapter.VerifyCaseListAdapter; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.view.CaseVerifiedDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseHandledFragment"; private CaseViewModel caseViewModel; - private CaseVerifyResultAdapter adapter; + private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; @@ -120,9 +120,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseVerifyResultAdapter(requireContext(), dataBeans); + adapter = new VerifyCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new VerifyCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index db1fd76..05fd9fa 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index fe9bf46..d7f7073 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 6dd8cb7..3a80c94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -34,12 +34,12 @@ @NonNull @Override public DeptTodoOrHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -58,14 +58,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -77,7 +77,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index 12707a2..7ad05ff 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 52cd5ad..1301830 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java new file mode 100644 index 0000000..de27d58 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -0,0 +1,98 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class VerifyCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public VerifyCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull VerifyCaseListAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + //核实图片 + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java index 831d676..9dd7c2d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java @@ -313,10 +313,10 @@ EasyToast.show(context, "核查情况还未选择"); return; } - caseViewModel.checkCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, remarks, - StringHelper.reformatURL(imageList) - ); +// caseViewModel.checkCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, remarks, +// StringHelper.reformatURL(imageList) +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 5d844b3..1328d81 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -300,10 +300,10 @@ return; } } - caseViewModel.handleOvertimeCase( - data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult - ); +// caseViewModel.handleOvertimeCase( +// data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java index ba820a3..cdc9499 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java @@ -188,7 +188,7 @@ EasyToast.show(this, "督办意见不能为空"); return; } - caseViewModel.updateCaseSupervise(id, remarks); +// caseViewModel.updateCaseSupervise(id, remarks); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java index 3351929..df2ca25 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java @@ -26,6 +26,7 @@ import com.casic.dcms.mvvm.model.CaseLargeTypeBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; import com.casic.dcms.mvvm.model.CaseSmallTypeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.CommonDataViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; @@ -65,6 +66,7 @@ private CommonDataViewModel commonDataViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private List largeTypeBeans; private List smallTypeBeans; private String id; @@ -120,6 +122,7 @@ commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); caseViewModel.obtainCaseDetail(id); @@ -154,12 +157,12 @@ viewBinding.caseEndTimeView.setText(data.getNodeLimittime()); viewBinding.caseSituationView.setText(StringHelper.filterString(data.getDescription())); - //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，其他类型不可修改 + //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，案卷类型可修改；否则不可修改 int source = data.getSource(); if (source != 11 && source != 12) { - viewBinding.i.setVisibility(View.GONE); - viewBinding.ii.setVisibility(View.GONE); - viewBinding.iii.setVisibility(View.GONE); + viewBinding.caseTypeRightImage.setVisibility(View.GONE); + viewBinding.largeTypeRightImage.setVisibility(View.GONE); + viewBinding.smallTypeRightImage.setVisibility(View.GONE); viewBinding.caseClassLayout.setClickable(false); viewBinding.caseLargeClassLayout.setClickable(false); @@ -186,7 +189,7 @@ if (urls.get(position).isEmpty()) { EasyToast.show(context, "图片加载失败，无法查看大图"); } else { - OtherUtils.showBigImage(context, position, urls); + ContextUtil.navigatePageTo(context, BigImageActivity.class, position, urls); } } }); @@ -364,7 +367,6 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - viewBinding.caseOpinionView.setText(dataBean.getNextOperation()); viewBinding.caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -379,24 +381,7 @@ verifyImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseVerifyDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseVerifyDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -418,7 +403,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.isSuccess()) { - if (verifyImageAdapter.getItemCount() <= 2) { + if (verifyImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -446,7 +431,7 @@ submitCase(); } }); - caseViewModel.loadState.observe(this, new Observer() { + operateViewModel.loadState.observe(this, new Observer() { @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { @@ -462,44 +447,25 @@ }); } - private void submitCase() { - String remarks = viewBinding.caseOpinionView.getText().toString(); - if (TextUtils.isEmpty(remarks)) { - EasyToast.show(this, "核实意见不能为空"); - return; - } - if (TextUtils.isEmpty(changeState)) { - EasyToast.show(this, "核实情况还未选择"); - return; - } - int source = data.getSource(); - if (source != 11 && source != 12) { - //修改案卷 - caseViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList)); - } else { - //补全案卷 - if (TextUtils.isEmpty(gridId)) { - EasyToast.show(this, "网格ID异常，请重新选择"); - return; - } - String fieldIntro = viewBinding.casePlaceView.getText().toString(); - if (TextUtils.isEmpty(fieldIntro)) { - EasyToast.show(this, "案卷地点还未填写"); - } - if (longitude == 0 || latitude == 0) { - EasyToast.show(this, "经纬度异常，请重新选择位置"); - return; - } - caseViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList), - eorc == null ? data.getEorc() : eorc, - typeCode == null ? data.getCasetypeCode() : typeCode, - typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, - String.valueOf(longitude), String.valueOf(latitude), - "1", gridId.substring(0, 6), - gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); - } + private void selectPicture() { + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseVerifyDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override @@ -528,6 +494,46 @@ } } + private void submitCase() { + String remarks = viewBinding.caseConditionView.getText().toString(); + if (TextUtils.isEmpty(remarks)) { + EasyToast.show(this, "核实意见不能为空"); + return; + } + if (TextUtils.isEmpty(changeState)) { + EasyToast.show(this, "核实情况还未选择"); + return; + } + int source = data.getSource(); + if (source != 11 && source != 12) { + //修改案卷 + operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList)); + } else { + //补全案卷 + if (TextUtils.isEmpty(gridId)) { + EasyToast.show(this, "网格ID异常，请重新选择"); + return; + } + String fieldIntro = viewBinding.casePlaceView.getText().toString(); + if (TextUtils.isEmpty(fieldIntro)) { + EasyToast.show(this, "案卷地点还未填写"); + } + if (longitude == 0 || latitude == 0) { + EasyToast.show(this, "经纬度异常，请重新选择位置"); + return; + } + operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList), + eorc == null ? data.getEorc() : eorc, + typeCode == null ? data.getCasetypeCode() : typeCode, + typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, + String.valueOf(longitude), String.valueOf(latitude), + "1", gridId.substring(0, 6), + gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); + } + } + @Override protected void onDestroy() { viewBinding.audioPlayerView.release(); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java index 812ceb5..de23222 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java @@ -250,9 +250,9 @@ EasyToast.show(context, "不同意/同意的意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - data.getProcessPersonid()); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// data.getProcessPersonid()); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java index 4c2badb..31fc6a0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java @@ -314,9 +314,9 @@ if (TextUtils.isEmpty(taskUserId)) { taskUserId = data.getProcessPersonid(); } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// taskUserId); } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 8fac12c..b8b9c59 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -311,8 +311,8 @@ EasyToast.show(context, "处理意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java index f758047..919b18f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java @@ -415,7 +415,7 @@ return; } } - caseViewModel.handleOvertimeCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); +// caseViewModel.handleOvertimeCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java index 255cd80..3bb2d08 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java @@ -13,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -39,8 +40,9 @@ //绑定TabLayout viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java index be19486..9aaef7e 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseVerifyResultAdapter; +import com.casic.dcms.adapter.VerifyCaseListAdapter; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.view.CaseVerifiedDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseHandledFragment"; private CaseViewModel caseViewModel; - private CaseVerifyResultAdapter adapter; + private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; @@ -120,9 +120,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseVerifyResultAdapter(requireContext(), dataBeans); + adapter = new VerifyCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new VerifyCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java index f8298cc..6cbbc83 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseVerifyResultAdapter; +import com.casic.dcms.adapter.VerifyCaseListAdapter; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.view.CaseVerifyDetailActivity; @@ -29,13 +29,12 @@ private static final String TAG = "CaseVerifyFragment"; private CaseViewModel caseViewModel; - private CaseVerifyResultAdapter adapter; + private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; - @Override protected void setupTopBarLayout() { @@ -121,9 +120,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseVerifyResultAdapter(requireContext(), dataBeans); + adapter = new VerifyCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new VerifyCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index db1fd76..05fd9fa 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index fe9bf46..d7f7073 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 6dd8cb7..3a80c94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -34,12 +34,12 @@ @NonNull @Override public DeptTodoOrHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -58,14 +58,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -77,7 +77,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index 12707a2..7ad05ff 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 52cd5ad..1301830 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java new file mode 100644 index 0000000..de27d58 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -0,0 +1,98 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class VerifyCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public VerifyCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull VerifyCaseListAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + //核实图片 + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java index 831d676..9dd7c2d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java @@ -313,10 +313,10 @@ EasyToast.show(context, "核查情况还未选择"); return; } - caseViewModel.checkCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, remarks, - StringHelper.reformatURL(imageList) - ); +// caseViewModel.checkCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, remarks, +// StringHelper.reformatURL(imageList) +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 5d844b3..1328d81 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -300,10 +300,10 @@ return; } } - caseViewModel.handleOvertimeCase( - data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult - ); +// caseViewModel.handleOvertimeCase( +// data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java index ba820a3..cdc9499 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java @@ -188,7 +188,7 @@ EasyToast.show(this, "督办意见不能为空"); return; } - caseViewModel.updateCaseSupervise(id, remarks); +// caseViewModel.updateCaseSupervise(id, remarks); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java index 3351929..df2ca25 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java @@ -26,6 +26,7 @@ import com.casic.dcms.mvvm.model.CaseLargeTypeBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; import com.casic.dcms.mvvm.model.CaseSmallTypeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.CommonDataViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; @@ -65,6 +66,7 @@ private CommonDataViewModel commonDataViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private List largeTypeBeans; private List smallTypeBeans; private String id; @@ -120,6 +122,7 @@ commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); caseViewModel.obtainCaseDetail(id); @@ -154,12 +157,12 @@ viewBinding.caseEndTimeView.setText(data.getNodeLimittime()); viewBinding.caseSituationView.setText(StringHelper.filterString(data.getDescription())); - //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，其他类型不可修改 + //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，案卷类型可修改；否则不可修改 int source = data.getSource(); if (source != 11 && source != 12) { - viewBinding.i.setVisibility(View.GONE); - viewBinding.ii.setVisibility(View.GONE); - viewBinding.iii.setVisibility(View.GONE); + viewBinding.caseTypeRightImage.setVisibility(View.GONE); + viewBinding.largeTypeRightImage.setVisibility(View.GONE); + viewBinding.smallTypeRightImage.setVisibility(View.GONE); viewBinding.caseClassLayout.setClickable(false); viewBinding.caseLargeClassLayout.setClickable(false); @@ -186,7 +189,7 @@ if (urls.get(position).isEmpty()) { EasyToast.show(context, "图片加载失败，无法查看大图"); } else { - OtherUtils.showBigImage(context, position, urls); + ContextUtil.navigatePageTo(context, BigImageActivity.class, position, urls); } } }); @@ -364,7 +367,6 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - viewBinding.caseOpinionView.setText(dataBean.getNextOperation()); viewBinding.caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -379,24 +381,7 @@ verifyImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseVerifyDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseVerifyDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -418,7 +403,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.isSuccess()) { - if (verifyImageAdapter.getItemCount() <= 2) { + if (verifyImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -446,7 +431,7 @@ submitCase(); } }); - caseViewModel.loadState.observe(this, new Observer() { + operateViewModel.loadState.observe(this, new Observer() { @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { @@ -462,44 +447,25 @@ }); } - private void submitCase() { - String remarks = viewBinding.caseOpinionView.getText().toString(); - if (TextUtils.isEmpty(remarks)) { - EasyToast.show(this, "核实意见不能为空"); - return; - } - if (TextUtils.isEmpty(changeState)) { - EasyToast.show(this, "核实情况还未选择"); - return; - } - int source = data.getSource(); - if (source != 11 && source != 12) { - //修改案卷 - caseViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList)); - } else { - //补全案卷 - if (TextUtils.isEmpty(gridId)) { - EasyToast.show(this, "网格ID异常，请重新选择"); - return; - } - String fieldIntro = viewBinding.casePlaceView.getText().toString(); - if (TextUtils.isEmpty(fieldIntro)) { - EasyToast.show(this, "案卷地点还未填写"); - } - if (longitude == 0 || latitude == 0) { - EasyToast.show(this, "经纬度异常，请重新选择位置"); - return; - } - caseViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList), - eorc == null ? data.getEorc() : eorc, - typeCode == null ? data.getCasetypeCode() : typeCode, - typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, - String.valueOf(longitude), String.valueOf(latitude), - "1", gridId.substring(0, 6), - gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); - } + private void selectPicture() { + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseVerifyDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override @@ -528,6 +494,46 @@ } } + private void submitCase() { + String remarks = viewBinding.caseConditionView.getText().toString(); + if (TextUtils.isEmpty(remarks)) { + EasyToast.show(this, "核实意见不能为空"); + return; + } + if (TextUtils.isEmpty(changeState)) { + EasyToast.show(this, "核实情况还未选择"); + return; + } + int source = data.getSource(); + if (source != 11 && source != 12) { + //修改案卷 + operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList)); + } else { + //补全案卷 + if (TextUtils.isEmpty(gridId)) { + EasyToast.show(this, "网格ID异常，请重新选择"); + return; + } + String fieldIntro = viewBinding.casePlaceView.getText().toString(); + if (TextUtils.isEmpty(fieldIntro)) { + EasyToast.show(this, "案卷地点还未填写"); + } + if (longitude == 0 || latitude == 0) { + EasyToast.show(this, "经纬度异常，请重新选择位置"); + return; + } + operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList), + eorc == null ? data.getEorc() : eorc, + typeCode == null ? data.getCasetypeCode() : typeCode, + typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, + String.valueOf(longitude), String.valueOf(latitude), + "1", gridId.substring(0, 6), + gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); + } + } + @Override protected void onDestroy() { viewBinding.audioPlayerView.release(); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java index 812ceb5..de23222 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java @@ -250,9 +250,9 @@ EasyToast.show(context, "不同意/同意的意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - data.getProcessPersonid()); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// data.getProcessPersonid()); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java index 4c2badb..31fc6a0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java @@ -314,9 +314,9 @@ if (TextUtils.isEmpty(taskUserId)) { taskUserId = data.getProcessPersonid(); } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// taskUserId); } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 8fac12c..b8b9c59 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -311,8 +311,8 @@ EasyToast.show(context, "处理意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java index f758047..919b18f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java @@ -415,7 +415,7 @@ return; } } - caseViewModel.handleOvertimeCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); +// caseViewModel.handleOvertimeCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java index 255cd80..3bb2d08 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java @@ -13,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -39,8 +40,9 @@ //绑定TabLayout viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java index be19486..9aaef7e 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseVerifyResultAdapter; +import com.casic.dcms.adapter.VerifyCaseListAdapter; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.view.CaseVerifiedDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseHandledFragment"; private CaseViewModel caseViewModel; - private CaseVerifyResultAdapter adapter; + private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; @@ -120,9 +120,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseVerifyResultAdapter(requireContext(), dataBeans); + adapter = new VerifyCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new VerifyCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java index f8298cc..6cbbc83 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseVerifyResultAdapter; +import com.casic.dcms.adapter.VerifyCaseListAdapter; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.view.CaseVerifyDetailActivity; @@ -29,13 +29,12 @@ private static final String TAG = "CaseVerifyFragment"; private CaseViewModel caseViewModel; - private CaseVerifyResultAdapter adapter; + private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; - @Override protected void setupTopBarLayout() { @@ -121,9 +120,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseVerifyResultAdapter(requireContext(), dataBeans); + adapter = new VerifyCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new VerifyCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseOperateViewModel.java new file mode 100644 index 0000000..5a69666 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseOperateViewModel.java @@ -0,0 +1,286 @@ +package com.casic.dcms.mvvm.vm; + +import androidx.lifecycle.MutableLiveData; + +import com.casic.dcms.mvvm.model.ActionResultBean; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.vm.BaseViewModel; +import com.pengxh.androidx.lite.vm.LoadState; +import com.pengxh.androidx.lite.vm.ObserverSubscriber; + +import java.io.IOException; + +import okhttp3.ResponseBody; +import rx.Observable; + +public class CaseOperateViewModel extends BaseViewModel { + private final Gson gson = new Gson(); + public MutableLiveData verifyActionModel = new MutableLiveData<>(); + public MutableLiveData checkActionModel = new MutableLiveData<>(); + public MutableLiveData overtimeActionModel = new MutableLiveData<>(); + public MutableLiveData shopActionModel = new MutableLiveData<>(); + public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); + public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); + + public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + verifyActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + checkActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + overtimeActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + shopActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String eorc, String casetypeCode, + String casetypeDetailCode, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, String audioIdVerify, String videoIdVerify, + int bzhours, int bzminis) { + loadState.setValue(LoadState.Loading); + Observable commonActionObservable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + ObserverSubscriber.addSubscribe(commonActionObservable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode != 200) { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone) { + loadState.setValue(LoadState.Loading); + Observable commonActionObservable = RetrofitServiceManager.submitShopCase(isNeedVerify, isNeedRevisit, longitude, latitude, source, caseLevel, areaCode, streetCode, communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis, shopId, shopkeeperName, shopPhone); + ObserverSubscriber.addSubscribe(commonActionObservable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode != 200) { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void updateCaseSupervise(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + updateSuperviseActionModel.setValue(resultBean); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String operationKey, String taskUserId) { + Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, operationKey, taskUserId); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + dispatcherHandleActionModel.setValue(resultBean); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index db1fd76..05fd9fa 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index fe9bf46..d7f7073 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 6dd8cb7..3a80c94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -34,12 +34,12 @@ @NonNull @Override public DeptTodoOrHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -58,14 +58,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -77,7 +77,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index 12707a2..7ad05ff 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 52cd5ad..1301830 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java new file mode 100644 index 0000000..de27d58 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -0,0 +1,98 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class VerifyCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public VerifyCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull VerifyCaseListAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + //核实图片 + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java index 831d676..9dd7c2d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java @@ -313,10 +313,10 @@ EasyToast.show(context, "核查情况还未选择"); return; } - caseViewModel.checkCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, remarks, - StringHelper.reformatURL(imageList) - ); +// caseViewModel.checkCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, remarks, +// StringHelper.reformatURL(imageList) +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 5d844b3..1328d81 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -300,10 +300,10 @@ return; } } - caseViewModel.handleOvertimeCase( - data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult - ); +// caseViewModel.handleOvertimeCase( +// data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java index ba820a3..cdc9499 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java @@ -188,7 +188,7 @@ EasyToast.show(this, "督办意见不能为空"); return; } - caseViewModel.updateCaseSupervise(id, remarks); +// caseViewModel.updateCaseSupervise(id, remarks); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java index 3351929..df2ca25 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java @@ -26,6 +26,7 @@ import com.casic.dcms.mvvm.model.CaseLargeTypeBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; import com.casic.dcms.mvvm.model.CaseSmallTypeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.CommonDataViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; @@ -65,6 +66,7 @@ private CommonDataViewModel commonDataViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private List largeTypeBeans; private List smallTypeBeans; private String id; @@ -120,6 +122,7 @@ commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); caseViewModel.obtainCaseDetail(id); @@ -154,12 +157,12 @@ viewBinding.caseEndTimeView.setText(data.getNodeLimittime()); viewBinding.caseSituationView.setText(StringHelper.filterString(data.getDescription())); - //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，其他类型不可修改 + //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，案卷类型可修改；否则不可修改 int source = data.getSource(); if (source != 11 && source != 12) { - viewBinding.i.setVisibility(View.GONE); - viewBinding.ii.setVisibility(View.GONE); - viewBinding.iii.setVisibility(View.GONE); + viewBinding.caseTypeRightImage.setVisibility(View.GONE); + viewBinding.largeTypeRightImage.setVisibility(View.GONE); + viewBinding.smallTypeRightImage.setVisibility(View.GONE); viewBinding.caseClassLayout.setClickable(false); viewBinding.caseLargeClassLayout.setClickable(false); @@ -186,7 +189,7 @@ if (urls.get(position).isEmpty()) { EasyToast.show(context, "图片加载失败，无法查看大图"); } else { - OtherUtils.showBigImage(context, position, urls); + ContextUtil.navigatePageTo(context, BigImageActivity.class, position, urls); } } }); @@ -364,7 +367,6 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - viewBinding.caseOpinionView.setText(dataBean.getNextOperation()); viewBinding.caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -379,24 +381,7 @@ verifyImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseVerifyDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseVerifyDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -418,7 +403,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.isSuccess()) { - if (verifyImageAdapter.getItemCount() <= 2) { + if (verifyImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -446,7 +431,7 @@ submitCase(); } }); - caseViewModel.loadState.observe(this, new Observer() { + operateViewModel.loadState.observe(this, new Observer() { @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { @@ -462,44 +447,25 @@ }); } - private void submitCase() { - String remarks = viewBinding.caseOpinionView.getText().toString(); - if (TextUtils.isEmpty(remarks)) { - EasyToast.show(this, "核实意见不能为空"); - return; - } - if (TextUtils.isEmpty(changeState)) { - EasyToast.show(this, "核实情况还未选择"); - return; - } - int source = data.getSource(); - if (source != 11 && source != 12) { - //修改案卷 - caseViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList)); - } else { - //补全案卷 - if (TextUtils.isEmpty(gridId)) { - EasyToast.show(this, "网格ID异常，请重新选择"); - return; - } - String fieldIntro = viewBinding.casePlaceView.getText().toString(); - if (TextUtils.isEmpty(fieldIntro)) { - EasyToast.show(this, "案卷地点还未填写"); - } - if (longitude == 0 || latitude == 0) { - EasyToast.show(this, "经纬度异常，请重新选择位置"); - return; - } - caseViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList), - eorc == null ? data.getEorc() : eorc, - typeCode == null ? data.getCasetypeCode() : typeCode, - typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, - String.valueOf(longitude), String.valueOf(latitude), - "1", gridId.substring(0, 6), - gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); - } + private void selectPicture() { + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseVerifyDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override @@ -528,6 +494,46 @@ } } + private void submitCase() { + String remarks = viewBinding.caseConditionView.getText().toString(); + if (TextUtils.isEmpty(remarks)) { + EasyToast.show(this, "核实意见不能为空"); + return; + } + if (TextUtils.isEmpty(changeState)) { + EasyToast.show(this, "核实情况还未选择"); + return; + } + int source = data.getSource(); + if (source != 11 && source != 12) { + //修改案卷 + operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList)); + } else { + //补全案卷 + if (TextUtils.isEmpty(gridId)) { + EasyToast.show(this, "网格ID异常，请重新选择"); + return; + } + String fieldIntro = viewBinding.casePlaceView.getText().toString(); + if (TextUtils.isEmpty(fieldIntro)) { + EasyToast.show(this, "案卷地点还未填写"); + } + if (longitude == 0 || latitude == 0) { + EasyToast.show(this, "经纬度异常，请重新选择位置"); + return; + } + operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList), + eorc == null ? data.getEorc() : eorc, + typeCode == null ? data.getCasetypeCode() : typeCode, + typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, + String.valueOf(longitude), String.valueOf(latitude), + "1", gridId.substring(0, 6), + gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); + } + } + @Override protected void onDestroy() { viewBinding.audioPlayerView.release(); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java index 812ceb5..de23222 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java @@ -250,9 +250,9 @@ EasyToast.show(context, "不同意/同意的意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - data.getProcessPersonid()); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// data.getProcessPersonid()); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java index 4c2badb..31fc6a0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java @@ -314,9 +314,9 @@ if (TextUtils.isEmpty(taskUserId)) { taskUserId = data.getProcessPersonid(); } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// taskUserId); } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 8fac12c..b8b9c59 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -311,8 +311,8 @@ EasyToast.show(context, "处理意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java index f758047..919b18f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java @@ -415,7 +415,7 @@ return; } } - caseViewModel.handleOvertimeCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); +// caseViewModel.handleOvertimeCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java index 255cd80..3bb2d08 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java @@ -13,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -39,8 +40,9 @@ //绑定TabLayout viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java index be19486..9aaef7e 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseVerifyResultAdapter; +import com.casic.dcms.adapter.VerifyCaseListAdapter; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.view.CaseVerifiedDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseHandledFragment"; private CaseViewModel caseViewModel; - private CaseVerifyResultAdapter adapter; + private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; @@ -120,9 +120,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseVerifyResultAdapter(requireContext(), dataBeans); + adapter = new VerifyCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new VerifyCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java index f8298cc..6cbbc83 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseVerifyResultAdapter; +import com.casic.dcms.adapter.VerifyCaseListAdapter; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.view.CaseVerifyDetailActivity; @@ -29,13 +29,12 @@ private static final String TAG = "CaseVerifyFragment"; private CaseViewModel caseViewModel; - private CaseVerifyResultAdapter adapter; + private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; - @Override protected void setupTopBarLayout() { @@ -121,9 +120,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseVerifyResultAdapter(requireContext(), dataBeans); + adapter = new VerifyCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new VerifyCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseOperateViewModel.java new file mode 100644 index 0000000..5a69666 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseOperateViewModel.java @@ -0,0 +1,286 @@ +package com.casic.dcms.mvvm.vm; + +import androidx.lifecycle.MutableLiveData; + +import com.casic.dcms.mvvm.model.ActionResultBean; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.vm.BaseViewModel; +import com.pengxh.androidx.lite.vm.LoadState; +import com.pengxh.androidx.lite.vm.ObserverSubscriber; + +import java.io.IOException; + +import okhttp3.ResponseBody; +import rx.Observable; + +public class CaseOperateViewModel extends BaseViewModel { + private final Gson gson = new Gson(); + public MutableLiveData verifyActionModel = new MutableLiveData<>(); + public MutableLiveData checkActionModel = new MutableLiveData<>(); + public MutableLiveData overtimeActionModel = new MutableLiveData<>(); + public MutableLiveData shopActionModel = new MutableLiveData<>(); + public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); + public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); + + public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + verifyActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + checkActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + overtimeActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + shopActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String eorc, String casetypeCode, + String casetypeDetailCode, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, String audioIdVerify, String videoIdVerify, + int bzhours, int bzminis) { + loadState.setValue(LoadState.Loading); + Observable commonActionObservable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + ObserverSubscriber.addSubscribe(commonActionObservable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode != 200) { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone) { + loadState.setValue(LoadState.Loading); + Observable commonActionObservable = RetrofitServiceManager.submitShopCase(isNeedVerify, isNeedRevisit, longitude, latitude, source, caseLevel, areaCode, streetCode, communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis, shopId, shopkeeperName, shopPhone); + ObserverSubscriber.addSubscribe(commonActionObservable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode != 200) { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void updateCaseSupervise(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + updateSuperviseActionModel.setValue(resultBean); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String operationKey, String taskUserId) { + Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, operationKey, taskUserId); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + dispatcherHandleActionModel.setValue(resultBean); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java index bfab79d..3d694ce 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java @@ -2,7 +2,6 @@ import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.mvvm.model.ActionResultBean; import com.casic.dcms.mvvm.model.CaseCheckBean; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseHandleBean; @@ -30,21 +29,18 @@ public class CaseViewModel extends BaseViewModel { private final Gson gson = new Gson(); public MutableLiveData caseVerifyModel = new MutableLiveData<>(); - public MutableLiveData verifyActionModel = new MutableLiveData<>(); public MutableLiveData caseCheckModel = new MutableLiveData<>(); - public MutableLiveData checkActionModel = new MutableLiveData<>(); public MutableLiveData caseHandleModel = new MutableLiveData<>(); public MutableLiveData caseHandledModel = new MutableLiveData<>(); public MutableLiveData caseUrgentModel = new MutableLiveData<>(); public MutableLiveData caseOvertimeModel = new MutableLiveData<>(); - public MutableLiveData overtimeActionModel = new MutableLiveData<>(); public MutableLiveData shopCaseModel = new MutableLiveData<>(); - public MutableLiveData shopActionModel = new MutableLiveData<>(); public MutableLiveData searchResultModel = new MutableLiveData<>(); - public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); - public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); public MutableLiveData caseDetailModel = new MutableLiveData<>(); + /** + * 未核实、已核实 + */ public void obtainVerifyCaseList(int limit, int offset, boolean verified) { Observable observable; if (verified) { @@ -80,39 +76,6 @@ }); } - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { - loadState.setValue(LoadState.Loading); - Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - loadState.setValue(LoadState.Success); - } - - @Override - public void onError(Throwable e) { - loadState.setValue(LoadState.Fail); - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - verifyActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainCheckCaseList(int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { @@ -149,39 +112,6 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { - loadState.setValue(LoadState.Loading); - Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - loadState.setValue(LoadState.Success); - } - - @Override - public void onError(Throwable e) { - loadState.setValue(LoadState.Fail); - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - checkActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainHandleCaseList(String isOvertime, String isEmergent, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { @@ -307,39 +237,6 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { - loadState.setValue(LoadState.Loading); - Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - loadState.setValue(LoadState.Success); - } - - @Override - public void onError(Throwable e) { - loadState.setValue(LoadState.Fail); - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - overtimeActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainShopCaseList(String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { @@ -375,38 +272,6 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { - Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - shopActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void searchCase(String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, offset); @@ -507,66 +372,6 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - updateSuperviseActionModel.setValue(resultBean); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String operationKey, String taskUserId) { - Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, operationKey, taskUserId); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - dispatcherHandleActionModel.setValue(resultBean); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainCaseDetail(String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index db1fd76..05fd9fa 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index fe9bf46..d7f7073 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 6dd8cb7..3a80c94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -34,12 +34,12 @@ @NonNull @Override public DeptTodoOrHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -58,14 +58,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -77,7 +77,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index 12707a2..7ad05ff 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 52cd5ad..1301830 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java new file mode 100644 index 0000000..de27d58 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -0,0 +1,98 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class VerifyCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public VerifyCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull VerifyCaseListAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + //核实图片 + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java index 831d676..9dd7c2d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java @@ -313,10 +313,10 @@ EasyToast.show(context, "核查情况还未选择"); return; } - caseViewModel.checkCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, remarks, - StringHelper.reformatURL(imageList) - ); +// caseViewModel.checkCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, remarks, +// StringHelper.reformatURL(imageList) +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 5d844b3..1328d81 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -300,10 +300,10 @@ return; } } - caseViewModel.handleOvertimeCase( - data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult - ); +// caseViewModel.handleOvertimeCase( +// data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java index ba820a3..cdc9499 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java @@ -188,7 +188,7 @@ EasyToast.show(this, "督办意见不能为空"); return; } - caseViewModel.updateCaseSupervise(id, remarks); +// caseViewModel.updateCaseSupervise(id, remarks); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java index 3351929..df2ca25 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java @@ -26,6 +26,7 @@ import com.casic.dcms.mvvm.model.CaseLargeTypeBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; import com.casic.dcms.mvvm.model.CaseSmallTypeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.CommonDataViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; @@ -65,6 +66,7 @@ private CommonDataViewModel commonDataViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private List largeTypeBeans; private List smallTypeBeans; private String id; @@ -120,6 +122,7 @@ commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); caseViewModel.obtainCaseDetail(id); @@ -154,12 +157,12 @@ viewBinding.caseEndTimeView.setText(data.getNodeLimittime()); viewBinding.caseSituationView.setText(StringHelper.filterString(data.getDescription())); - //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，其他类型不可修改 + //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，案卷类型可修改；否则不可修改 int source = data.getSource(); if (source != 11 && source != 12) { - viewBinding.i.setVisibility(View.GONE); - viewBinding.ii.setVisibility(View.GONE); - viewBinding.iii.setVisibility(View.GONE); + viewBinding.caseTypeRightImage.setVisibility(View.GONE); + viewBinding.largeTypeRightImage.setVisibility(View.GONE); + viewBinding.smallTypeRightImage.setVisibility(View.GONE); viewBinding.caseClassLayout.setClickable(false); viewBinding.caseLargeClassLayout.setClickable(false); @@ -186,7 +189,7 @@ if (urls.get(position).isEmpty()) { EasyToast.show(context, "图片加载失败，无法查看大图"); } else { - OtherUtils.showBigImage(context, position, urls); + ContextUtil.navigatePageTo(context, BigImageActivity.class, position, urls); } } }); @@ -364,7 +367,6 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - viewBinding.caseOpinionView.setText(dataBean.getNextOperation()); viewBinding.caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -379,24 +381,7 @@ verifyImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseVerifyDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseVerifyDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -418,7 +403,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.isSuccess()) { - if (verifyImageAdapter.getItemCount() <= 2) { + if (verifyImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -446,7 +431,7 @@ submitCase(); } }); - caseViewModel.loadState.observe(this, new Observer() { + operateViewModel.loadState.observe(this, new Observer() { @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { @@ -462,44 +447,25 @@ }); } - private void submitCase() { - String remarks = viewBinding.caseOpinionView.getText().toString(); - if (TextUtils.isEmpty(remarks)) { - EasyToast.show(this, "核实意见不能为空"); - return; - } - if (TextUtils.isEmpty(changeState)) { - EasyToast.show(this, "核实情况还未选择"); - return; - } - int source = data.getSource(); - if (source != 11 && source != 12) { - //修改案卷 - caseViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList)); - } else { - //补全案卷 - if (TextUtils.isEmpty(gridId)) { - EasyToast.show(this, "网格ID异常，请重新选择"); - return; - } - String fieldIntro = viewBinding.casePlaceView.getText().toString(); - if (TextUtils.isEmpty(fieldIntro)) { - EasyToast.show(this, "案卷地点还未填写"); - } - if (longitude == 0 || latitude == 0) { - EasyToast.show(this, "经纬度异常，请重新选择位置"); - return; - } - caseViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList), - eorc == null ? data.getEorc() : eorc, - typeCode == null ? data.getCasetypeCode() : typeCode, - typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, - String.valueOf(longitude), String.valueOf(latitude), - "1", gridId.substring(0, 6), - gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); - } + private void selectPicture() { + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseVerifyDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override @@ -528,6 +494,46 @@ } } + private void submitCase() { + String remarks = viewBinding.caseConditionView.getText().toString(); + if (TextUtils.isEmpty(remarks)) { + EasyToast.show(this, "核实意见不能为空"); + return; + } + if (TextUtils.isEmpty(changeState)) { + EasyToast.show(this, "核实情况还未选择"); + return; + } + int source = data.getSource(); + if (source != 11 && source != 12) { + //修改案卷 + operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList)); + } else { + //补全案卷 + if (TextUtils.isEmpty(gridId)) { + EasyToast.show(this, "网格ID异常，请重新选择"); + return; + } + String fieldIntro = viewBinding.casePlaceView.getText().toString(); + if (TextUtils.isEmpty(fieldIntro)) { + EasyToast.show(this, "案卷地点还未填写"); + } + if (longitude == 0 || latitude == 0) { + EasyToast.show(this, "经纬度异常，请重新选择位置"); + return; + } + operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList), + eorc == null ? data.getEorc() : eorc, + typeCode == null ? data.getCasetypeCode() : typeCode, + typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, + String.valueOf(longitude), String.valueOf(latitude), + "1", gridId.substring(0, 6), + gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); + } + } + @Override protected void onDestroy() { viewBinding.audioPlayerView.release(); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java index 812ceb5..de23222 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java @@ -250,9 +250,9 @@ EasyToast.show(context, "不同意/同意的意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - data.getProcessPersonid()); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// data.getProcessPersonid()); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java index 4c2badb..31fc6a0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java @@ -314,9 +314,9 @@ if (TextUtils.isEmpty(taskUserId)) { taskUserId = data.getProcessPersonid(); } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// taskUserId); } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 8fac12c..b8b9c59 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -311,8 +311,8 @@ EasyToast.show(context, "处理意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java index f758047..919b18f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java @@ -415,7 +415,7 @@ return; } } - caseViewModel.handleOvertimeCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); +// caseViewModel.handleOvertimeCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java index 255cd80..3bb2d08 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java @@ -13,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -39,8 +40,9 @@ //绑定TabLayout viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java index be19486..9aaef7e 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseVerifyResultAdapter; +import com.casic.dcms.adapter.VerifyCaseListAdapter; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.view.CaseVerifiedDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseHandledFragment"; private CaseViewModel caseViewModel; - private CaseVerifyResultAdapter adapter; + private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; @@ -120,9 +120,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseVerifyResultAdapter(requireContext(), dataBeans); + adapter = new VerifyCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new VerifyCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java index f8298cc..6cbbc83 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseVerifyResultAdapter; +import com.casic.dcms.adapter.VerifyCaseListAdapter; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.view.CaseVerifyDetailActivity; @@ -29,13 +29,12 @@ private static final String TAG = "CaseVerifyFragment"; private CaseViewModel caseViewModel; - private CaseVerifyResultAdapter adapter; + private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; - @Override protected void setupTopBarLayout() { @@ -121,9 +120,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseVerifyResultAdapter(requireContext(), dataBeans); + adapter = new VerifyCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new VerifyCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseOperateViewModel.java new file mode 100644 index 0000000..5a69666 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseOperateViewModel.java @@ -0,0 +1,286 @@ +package com.casic.dcms.mvvm.vm; + +import androidx.lifecycle.MutableLiveData; + +import com.casic.dcms.mvvm.model.ActionResultBean; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.vm.BaseViewModel; +import com.pengxh.androidx.lite.vm.LoadState; +import com.pengxh.androidx.lite.vm.ObserverSubscriber; + +import java.io.IOException; + +import okhttp3.ResponseBody; +import rx.Observable; + +public class CaseOperateViewModel extends BaseViewModel { + private final Gson gson = new Gson(); + public MutableLiveData verifyActionModel = new MutableLiveData<>(); + public MutableLiveData checkActionModel = new MutableLiveData<>(); + public MutableLiveData overtimeActionModel = new MutableLiveData<>(); + public MutableLiveData shopActionModel = new MutableLiveData<>(); + public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); + public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); + + public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + verifyActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + checkActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + overtimeActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + shopActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String eorc, String casetypeCode, + String casetypeDetailCode, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, String audioIdVerify, String videoIdVerify, + int bzhours, int bzminis) { + loadState.setValue(LoadState.Loading); + Observable commonActionObservable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + ObserverSubscriber.addSubscribe(commonActionObservable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode != 200) { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone) { + loadState.setValue(LoadState.Loading); + Observable commonActionObservable = RetrofitServiceManager.submitShopCase(isNeedVerify, isNeedRevisit, longitude, latitude, source, caseLevel, areaCode, streetCode, communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis, shopId, shopkeeperName, shopPhone); + ObserverSubscriber.addSubscribe(commonActionObservable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode != 200) { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void updateCaseSupervise(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + updateSuperviseActionModel.setValue(resultBean); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String operationKey, String taskUserId) { + Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, operationKey, taskUserId); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + dispatcherHandleActionModel.setValue(resultBean); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java index bfab79d..3d694ce 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java @@ -2,7 +2,6 @@ import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.mvvm.model.ActionResultBean; import com.casic.dcms.mvvm.model.CaseCheckBean; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseHandleBean; @@ -30,21 +29,18 @@ public class CaseViewModel extends BaseViewModel { private final Gson gson = new Gson(); public MutableLiveData caseVerifyModel = new MutableLiveData<>(); - public MutableLiveData verifyActionModel = new MutableLiveData<>(); public MutableLiveData caseCheckModel = new MutableLiveData<>(); - public MutableLiveData checkActionModel = new MutableLiveData<>(); public MutableLiveData caseHandleModel = new MutableLiveData<>(); public MutableLiveData caseHandledModel = new MutableLiveData<>(); public MutableLiveData caseUrgentModel = new MutableLiveData<>(); public MutableLiveData caseOvertimeModel = new MutableLiveData<>(); - public MutableLiveData overtimeActionModel = new MutableLiveData<>(); public MutableLiveData shopCaseModel = new MutableLiveData<>(); - public MutableLiveData shopActionModel = new MutableLiveData<>(); public MutableLiveData searchResultModel = new MutableLiveData<>(); - public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); - public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); public MutableLiveData caseDetailModel = new MutableLiveData<>(); + /** + * 未核实、已核实 + */ public void obtainVerifyCaseList(int limit, int offset, boolean verified) { Observable observable; if (verified) { @@ -80,39 +76,6 @@ }); } - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { - loadState.setValue(LoadState.Loading); - Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - loadState.setValue(LoadState.Success); - } - - @Override - public void onError(Throwable e) { - loadState.setValue(LoadState.Fail); - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - verifyActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainCheckCaseList(int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { @@ -149,39 +112,6 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { - loadState.setValue(LoadState.Loading); - Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - loadState.setValue(LoadState.Success); - } - - @Override - public void onError(Throwable e) { - loadState.setValue(LoadState.Fail); - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - checkActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainHandleCaseList(String isOvertime, String isEmergent, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { @@ -307,39 +237,6 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { - loadState.setValue(LoadState.Loading); - Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - loadState.setValue(LoadState.Success); - } - - @Override - public void onError(Throwable e) { - loadState.setValue(LoadState.Fail); - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - overtimeActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainShopCaseList(String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { @@ -375,38 +272,6 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { - Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - shopActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void searchCase(String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, offset); @@ -507,66 +372,6 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - updateSuperviseActionModel.setValue(resultBean); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String operationKey, String taskUserId) { - Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, operationKey, taskUserId); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - dispatcherHandleActionModel.setValue(resultBean); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainCaseDetail(String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); diff --git a/app/src/main/res/drawable/layout_divider_vertical.xml b/app/src/main/res/drawable/layout_divider_vertical.xml index d7f4987..4d1eb5c 100644 --- a/app/src/main/res/drawable/layout_divider_vertical.xml +++ b/app/src/main/res/drawable/layout_divider_vertical.xml @@ -1,7 +1,9 @@ - + - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index db1fd76..05fd9fa 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index fe9bf46..d7f7073 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 6dd8cb7..3a80c94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -34,12 +34,12 @@ @NonNull @Override public DeptTodoOrHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -58,14 +58,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -77,7 +77,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index 12707a2..7ad05ff 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 52cd5ad..1301830 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java new file mode 100644 index 0000000..de27d58 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -0,0 +1,98 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class VerifyCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public VerifyCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull VerifyCaseListAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + //核实图片 + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java index 831d676..9dd7c2d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java @@ -313,10 +313,10 @@ EasyToast.show(context, "核查情况还未选择"); return; } - caseViewModel.checkCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, remarks, - StringHelper.reformatURL(imageList) - ); +// caseViewModel.checkCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, remarks, +// StringHelper.reformatURL(imageList) +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 5d844b3..1328d81 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -300,10 +300,10 @@ return; } } - caseViewModel.handleOvertimeCase( - data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult - ); +// caseViewModel.handleOvertimeCase( +// data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java index ba820a3..cdc9499 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java @@ -188,7 +188,7 @@ EasyToast.show(this, "督办意见不能为空"); return; } - caseViewModel.updateCaseSupervise(id, remarks); +// caseViewModel.updateCaseSupervise(id, remarks); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java index 3351929..df2ca25 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java @@ -26,6 +26,7 @@ import com.casic.dcms.mvvm.model.CaseLargeTypeBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; import com.casic.dcms.mvvm.model.CaseSmallTypeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.CommonDataViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; @@ -65,6 +66,7 @@ private CommonDataViewModel commonDataViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private List largeTypeBeans; private List smallTypeBeans; private String id; @@ -120,6 +122,7 @@ commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); caseViewModel.obtainCaseDetail(id); @@ -154,12 +157,12 @@ viewBinding.caseEndTimeView.setText(data.getNodeLimittime()); viewBinding.caseSituationView.setText(StringHelper.filterString(data.getDescription())); - //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，其他类型不可修改 + //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，案卷类型可修改；否则不可修改 int source = data.getSource(); if (source != 11 && source != 12) { - viewBinding.i.setVisibility(View.GONE); - viewBinding.ii.setVisibility(View.GONE); - viewBinding.iii.setVisibility(View.GONE); + viewBinding.caseTypeRightImage.setVisibility(View.GONE); + viewBinding.largeTypeRightImage.setVisibility(View.GONE); + viewBinding.smallTypeRightImage.setVisibility(View.GONE); viewBinding.caseClassLayout.setClickable(false); viewBinding.caseLargeClassLayout.setClickable(false); @@ -186,7 +189,7 @@ if (urls.get(position).isEmpty()) { EasyToast.show(context, "图片加载失败，无法查看大图"); } else { - OtherUtils.showBigImage(context, position, urls); + ContextUtil.navigatePageTo(context, BigImageActivity.class, position, urls); } } }); @@ -364,7 +367,6 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - viewBinding.caseOpinionView.setText(dataBean.getNextOperation()); viewBinding.caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -379,24 +381,7 @@ verifyImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseVerifyDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseVerifyDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -418,7 +403,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.isSuccess()) { - if (verifyImageAdapter.getItemCount() <= 2) { + if (verifyImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -446,7 +431,7 @@ submitCase(); } }); - caseViewModel.loadState.observe(this, new Observer() { + operateViewModel.loadState.observe(this, new Observer() { @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { @@ -462,44 +447,25 @@ }); } - private void submitCase() { - String remarks = viewBinding.caseOpinionView.getText().toString(); - if (TextUtils.isEmpty(remarks)) { - EasyToast.show(this, "核实意见不能为空"); - return; - } - if (TextUtils.isEmpty(changeState)) { - EasyToast.show(this, "核实情况还未选择"); - return; - } - int source = data.getSource(); - if (source != 11 && source != 12) { - //修改案卷 - caseViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList)); - } else { - //补全案卷 - if (TextUtils.isEmpty(gridId)) { - EasyToast.show(this, "网格ID异常，请重新选择"); - return; - } - String fieldIntro = viewBinding.casePlaceView.getText().toString(); - if (TextUtils.isEmpty(fieldIntro)) { - EasyToast.show(this, "案卷地点还未填写"); - } - if (longitude == 0 || latitude == 0) { - EasyToast.show(this, "经纬度异常，请重新选择位置"); - return; - } - caseViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList), - eorc == null ? data.getEorc() : eorc, - typeCode == null ? data.getCasetypeCode() : typeCode, - typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, - String.valueOf(longitude), String.valueOf(latitude), - "1", gridId.substring(0, 6), - gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); - } + private void selectPicture() { + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseVerifyDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override @@ -528,6 +494,46 @@ } } + private void submitCase() { + String remarks = viewBinding.caseConditionView.getText().toString(); + if (TextUtils.isEmpty(remarks)) { + EasyToast.show(this, "核实意见不能为空"); + return; + } + if (TextUtils.isEmpty(changeState)) { + EasyToast.show(this, "核实情况还未选择"); + return; + } + int source = data.getSource(); + if (source != 11 && source != 12) { + //修改案卷 + operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList)); + } else { + //补全案卷 + if (TextUtils.isEmpty(gridId)) { + EasyToast.show(this, "网格ID异常，请重新选择"); + return; + } + String fieldIntro = viewBinding.casePlaceView.getText().toString(); + if (TextUtils.isEmpty(fieldIntro)) { + EasyToast.show(this, "案卷地点还未填写"); + } + if (longitude == 0 || latitude == 0) { + EasyToast.show(this, "经纬度异常，请重新选择位置"); + return; + } + operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList), + eorc == null ? data.getEorc() : eorc, + typeCode == null ? data.getCasetypeCode() : typeCode, + typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, + String.valueOf(longitude), String.valueOf(latitude), + "1", gridId.substring(0, 6), + gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); + } + } + @Override protected void onDestroy() { viewBinding.audioPlayerView.release(); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java index 812ceb5..de23222 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java @@ -250,9 +250,9 @@ EasyToast.show(context, "不同意/同意的意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - data.getProcessPersonid()); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// data.getProcessPersonid()); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java index 4c2badb..31fc6a0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java @@ -314,9 +314,9 @@ if (TextUtils.isEmpty(taskUserId)) { taskUserId = data.getProcessPersonid(); } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// taskUserId); } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 8fac12c..b8b9c59 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -311,8 +311,8 @@ EasyToast.show(context, "处理意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java index f758047..919b18f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java @@ -415,7 +415,7 @@ return; } } - caseViewModel.handleOvertimeCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); +// caseViewModel.handleOvertimeCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java index 255cd80..3bb2d08 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java @@ -13,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -39,8 +40,9 @@ //绑定TabLayout viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java index be19486..9aaef7e 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseVerifyResultAdapter; +import com.casic.dcms.adapter.VerifyCaseListAdapter; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.view.CaseVerifiedDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseHandledFragment"; private CaseViewModel caseViewModel; - private CaseVerifyResultAdapter adapter; + private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; @@ -120,9 +120,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseVerifyResultAdapter(requireContext(), dataBeans); + adapter = new VerifyCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new VerifyCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java index f8298cc..6cbbc83 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseVerifyResultAdapter; +import com.casic.dcms.adapter.VerifyCaseListAdapter; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.view.CaseVerifyDetailActivity; @@ -29,13 +29,12 @@ private static final String TAG = "CaseVerifyFragment"; private CaseViewModel caseViewModel; - private CaseVerifyResultAdapter adapter; + private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; - @Override protected void setupTopBarLayout() { @@ -121,9 +120,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseVerifyResultAdapter(requireContext(), dataBeans); + adapter = new VerifyCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new VerifyCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseOperateViewModel.java new file mode 100644 index 0000000..5a69666 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseOperateViewModel.java @@ -0,0 +1,286 @@ +package com.casic.dcms.mvvm.vm; + +import androidx.lifecycle.MutableLiveData; + +import com.casic.dcms.mvvm.model.ActionResultBean; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.vm.BaseViewModel; +import com.pengxh.androidx.lite.vm.LoadState; +import com.pengxh.androidx.lite.vm.ObserverSubscriber; + +import java.io.IOException; + +import okhttp3.ResponseBody; +import rx.Observable; + +public class CaseOperateViewModel extends BaseViewModel { + private final Gson gson = new Gson(); + public MutableLiveData verifyActionModel = new MutableLiveData<>(); + public MutableLiveData checkActionModel = new MutableLiveData<>(); + public MutableLiveData overtimeActionModel = new MutableLiveData<>(); + public MutableLiveData shopActionModel = new MutableLiveData<>(); + public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); + public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); + + public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + verifyActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + checkActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + overtimeActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + shopActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String eorc, String casetypeCode, + String casetypeDetailCode, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, String audioIdVerify, String videoIdVerify, + int bzhours, int bzminis) { + loadState.setValue(LoadState.Loading); + Observable commonActionObservable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + ObserverSubscriber.addSubscribe(commonActionObservable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode != 200) { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone) { + loadState.setValue(LoadState.Loading); + Observable commonActionObservable = RetrofitServiceManager.submitShopCase(isNeedVerify, isNeedRevisit, longitude, latitude, source, caseLevel, areaCode, streetCode, communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis, shopId, shopkeeperName, shopPhone); + ObserverSubscriber.addSubscribe(commonActionObservable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode != 200) { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void updateCaseSupervise(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + updateSuperviseActionModel.setValue(resultBean); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String operationKey, String taskUserId) { + Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, operationKey, taskUserId); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + dispatcherHandleActionModel.setValue(resultBean); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java index bfab79d..3d694ce 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java @@ -2,7 +2,6 @@ import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.mvvm.model.ActionResultBean; import com.casic.dcms.mvvm.model.CaseCheckBean; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseHandleBean; @@ -30,21 +29,18 @@ public class CaseViewModel extends BaseViewModel { private final Gson gson = new Gson(); public MutableLiveData caseVerifyModel = new MutableLiveData<>(); - public MutableLiveData verifyActionModel = new MutableLiveData<>(); public MutableLiveData caseCheckModel = new MutableLiveData<>(); - public MutableLiveData checkActionModel = new MutableLiveData<>(); public MutableLiveData caseHandleModel = new MutableLiveData<>(); public MutableLiveData caseHandledModel = new MutableLiveData<>(); public MutableLiveData caseUrgentModel = new MutableLiveData<>(); public MutableLiveData caseOvertimeModel = new MutableLiveData<>(); - public MutableLiveData overtimeActionModel = new MutableLiveData<>(); public MutableLiveData shopCaseModel = new MutableLiveData<>(); - public MutableLiveData shopActionModel = new MutableLiveData<>(); public MutableLiveData searchResultModel = new MutableLiveData<>(); - public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); - public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); public MutableLiveData caseDetailModel = new MutableLiveData<>(); + /** + * 未核实、已核实 + */ public void obtainVerifyCaseList(int limit, int offset, boolean verified) { Observable observable; if (verified) { @@ -80,39 +76,6 @@ }); } - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { - loadState.setValue(LoadState.Loading); - Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - loadState.setValue(LoadState.Success); - } - - @Override - public void onError(Throwable e) { - loadState.setValue(LoadState.Fail); - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - verifyActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainCheckCaseList(int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { @@ -149,39 +112,6 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { - loadState.setValue(LoadState.Loading); - Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - loadState.setValue(LoadState.Success); - } - - @Override - public void onError(Throwable e) { - loadState.setValue(LoadState.Fail); - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - checkActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainHandleCaseList(String isOvertime, String isEmergent, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { @@ -307,39 +237,6 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { - loadState.setValue(LoadState.Loading); - Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - loadState.setValue(LoadState.Success); - } - - @Override - public void onError(Throwable e) { - loadState.setValue(LoadState.Fail); - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - overtimeActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainShopCaseList(String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { @@ -375,38 +272,6 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { - Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - shopActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void searchCase(String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, offset); @@ -507,66 +372,6 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - updateSuperviseActionModel.setValue(resultBean); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String operationKey, String taskUserId) { - Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, operationKey, taskUserId); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - dispatcherHandleActionModel.setValue(resultBean); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainCaseDetail(String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); diff --git a/app/src/main/res/drawable/layout_divider_vertical.xml b/app/src/main/res/drawable/layout_divider_vertical.xml index d7f4987..4d1eb5c 100644 --- a/app/src/main/res/drawable/layout_divider_vertical.xml +++ b/app/src/main/res/drawable/layout_divider_vertical.xml @@ -1,7 +1,9 @@ - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_case_verify_detail.xml b/app/src/main/res/layout/activity_case_verify_detail.xml index c435d47..db8e9eb 100644 --- a/app/src/main/res/layout/activity_case_verify_detail.xml +++ b/app/src/main/res/layout/activity_case_verify_detail.xml @@ -40,20 +40,18 @@ style="@style/itemLayoutStyle"> + android:id="@+id/caseTypeRightImage" + style="@style/rightImageStyle" /> @@ -63,20 +61,18 @@ style="@style/itemLayoutStyle"> + android:id="@+id/largeTypeRightImage" + style="@style/rightImageStyle" /> @@ -86,20 +82,18 @@ style="@style/itemLayoutStyle"> + android:id="@+id/smallTypeRightImage" + style="@style/rightImageStyle" /> @@ -244,26 +238,13 @@ - - - - - - - - - + android:text="核实意见" /> + style="@style/rightImageStyle" /> diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index db1fd76..05fd9fa 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index fe9bf46..d7f7073 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 6dd8cb7..3a80c94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -34,12 +34,12 @@ @NonNull @Override public DeptTodoOrHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -58,14 +58,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -77,7 +77,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index 12707a2..7ad05ff 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 52cd5ad..1301830 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java new file mode 100644 index 0000000..de27d58 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -0,0 +1,98 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class VerifyCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public VerifyCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull VerifyCaseListAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + //核实图片 + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java index 831d676..9dd7c2d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java @@ -313,10 +313,10 @@ EasyToast.show(context, "核查情况还未选择"); return; } - caseViewModel.checkCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, remarks, - StringHelper.reformatURL(imageList) - ); +// caseViewModel.checkCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, remarks, +// StringHelper.reformatURL(imageList) +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 5d844b3..1328d81 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -300,10 +300,10 @@ return; } } - caseViewModel.handleOvertimeCase( - data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult - ); +// caseViewModel.handleOvertimeCase( +// data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java index ba820a3..cdc9499 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java @@ -188,7 +188,7 @@ EasyToast.show(this, "督办意见不能为空"); return; } - caseViewModel.updateCaseSupervise(id, remarks); +// caseViewModel.updateCaseSupervise(id, remarks); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java index 3351929..df2ca25 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java @@ -26,6 +26,7 @@ import com.casic.dcms.mvvm.model.CaseLargeTypeBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; import com.casic.dcms.mvvm.model.CaseSmallTypeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.CommonDataViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; @@ -65,6 +66,7 @@ private CommonDataViewModel commonDataViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private List largeTypeBeans; private List smallTypeBeans; private String id; @@ -120,6 +122,7 @@ commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); caseViewModel.obtainCaseDetail(id); @@ -154,12 +157,12 @@ viewBinding.caseEndTimeView.setText(data.getNodeLimittime()); viewBinding.caseSituationView.setText(StringHelper.filterString(data.getDescription())); - //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，其他类型不可修改 + //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，案卷类型可修改；否则不可修改 int source = data.getSource(); if (source != 11 && source != 12) { - viewBinding.i.setVisibility(View.GONE); - viewBinding.ii.setVisibility(View.GONE); - viewBinding.iii.setVisibility(View.GONE); + viewBinding.caseTypeRightImage.setVisibility(View.GONE); + viewBinding.largeTypeRightImage.setVisibility(View.GONE); + viewBinding.smallTypeRightImage.setVisibility(View.GONE); viewBinding.caseClassLayout.setClickable(false); viewBinding.caseLargeClassLayout.setClickable(false); @@ -186,7 +189,7 @@ if (urls.get(position).isEmpty()) { EasyToast.show(context, "图片加载失败，无法查看大图"); } else { - OtherUtils.showBigImage(context, position, urls); + ContextUtil.navigatePageTo(context, BigImageActivity.class, position, urls); } } }); @@ -364,7 +367,6 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - viewBinding.caseOpinionView.setText(dataBean.getNextOperation()); viewBinding.caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -379,24 +381,7 @@ verifyImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseVerifyDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseVerifyDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -418,7 +403,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.isSuccess()) { - if (verifyImageAdapter.getItemCount() <= 2) { + if (verifyImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -446,7 +431,7 @@ submitCase(); } }); - caseViewModel.loadState.observe(this, new Observer() { + operateViewModel.loadState.observe(this, new Observer() { @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { @@ -462,44 +447,25 @@ }); } - private void submitCase() { - String remarks = viewBinding.caseOpinionView.getText().toString(); - if (TextUtils.isEmpty(remarks)) { - EasyToast.show(this, "核实意见不能为空"); - return; - } - if (TextUtils.isEmpty(changeState)) { - EasyToast.show(this, "核实情况还未选择"); - return; - } - int source = data.getSource(); - if (source != 11 && source != 12) { - //修改案卷 - caseViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList)); - } else { - //补全案卷 - if (TextUtils.isEmpty(gridId)) { - EasyToast.show(this, "网格ID异常，请重新选择"); - return; - } - String fieldIntro = viewBinding.casePlaceView.getText().toString(); - if (TextUtils.isEmpty(fieldIntro)) { - EasyToast.show(this, "案卷地点还未填写"); - } - if (longitude == 0 || latitude == 0) { - EasyToast.show(this, "经纬度异常，请重新选择位置"); - return; - } - caseViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList), - eorc == null ? data.getEorc() : eorc, - typeCode == null ? data.getCasetypeCode() : typeCode, - typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, - String.valueOf(longitude), String.valueOf(latitude), - "1", gridId.substring(0, 6), - gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); - } + private void selectPicture() { + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseVerifyDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override @@ -528,6 +494,46 @@ } } + private void submitCase() { + String remarks = viewBinding.caseConditionView.getText().toString(); + if (TextUtils.isEmpty(remarks)) { + EasyToast.show(this, "核实意见不能为空"); + return; + } + if (TextUtils.isEmpty(changeState)) { + EasyToast.show(this, "核实情况还未选择"); + return; + } + int source = data.getSource(); + if (source != 11 && source != 12) { + //修改案卷 + operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList)); + } else { + //补全案卷 + if (TextUtils.isEmpty(gridId)) { + EasyToast.show(this, "网格ID异常，请重新选择"); + return; + } + String fieldIntro = viewBinding.casePlaceView.getText().toString(); + if (TextUtils.isEmpty(fieldIntro)) { + EasyToast.show(this, "案卷地点还未填写"); + } + if (longitude == 0 || latitude == 0) { + EasyToast.show(this, "经纬度异常，请重新选择位置"); + return; + } + operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList), + eorc == null ? data.getEorc() : eorc, + typeCode == null ? data.getCasetypeCode() : typeCode, + typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, + String.valueOf(longitude), String.valueOf(latitude), + "1", gridId.substring(0, 6), + gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); + } + } + @Override protected void onDestroy() { viewBinding.audioPlayerView.release(); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java index 812ceb5..de23222 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java @@ -250,9 +250,9 @@ EasyToast.show(context, "不同意/同意的意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - data.getProcessPersonid()); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// data.getProcessPersonid()); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java index 4c2badb..31fc6a0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java @@ -314,9 +314,9 @@ if (TextUtils.isEmpty(taskUserId)) { taskUserId = data.getProcessPersonid(); } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// taskUserId); } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 8fac12c..b8b9c59 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -311,8 +311,8 @@ EasyToast.show(context, "处理意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java index f758047..919b18f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java @@ -415,7 +415,7 @@ return; } } - caseViewModel.handleOvertimeCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); +// caseViewModel.handleOvertimeCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java index 255cd80..3bb2d08 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java @@ -13,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -39,8 +40,9 @@ //绑定TabLayout viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java index be19486..9aaef7e 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseVerifyResultAdapter; +import com.casic.dcms.adapter.VerifyCaseListAdapter; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.view.CaseVerifiedDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseHandledFragment"; private CaseViewModel caseViewModel; - private CaseVerifyResultAdapter adapter; + private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; @@ -120,9 +120,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseVerifyResultAdapter(requireContext(), dataBeans); + adapter = new VerifyCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new VerifyCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java index f8298cc..6cbbc83 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseVerifyResultAdapter; +import com.casic.dcms.adapter.VerifyCaseListAdapter; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.view.CaseVerifyDetailActivity; @@ -29,13 +29,12 @@ private static final String TAG = "CaseVerifyFragment"; private CaseViewModel caseViewModel; - private CaseVerifyResultAdapter adapter; + private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; - @Override protected void setupTopBarLayout() { @@ -121,9 +120,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseVerifyResultAdapter(requireContext(), dataBeans); + adapter = new VerifyCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new VerifyCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseOperateViewModel.java new file mode 100644 index 0000000..5a69666 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseOperateViewModel.java @@ -0,0 +1,286 @@ +package com.casic.dcms.mvvm.vm; + +import androidx.lifecycle.MutableLiveData; + +import com.casic.dcms.mvvm.model.ActionResultBean; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.vm.BaseViewModel; +import com.pengxh.androidx.lite.vm.LoadState; +import com.pengxh.androidx.lite.vm.ObserverSubscriber; + +import java.io.IOException; + +import okhttp3.ResponseBody; +import rx.Observable; + +public class CaseOperateViewModel extends BaseViewModel { + private final Gson gson = new Gson(); + public MutableLiveData verifyActionModel = new MutableLiveData<>(); + public MutableLiveData checkActionModel = new MutableLiveData<>(); + public MutableLiveData overtimeActionModel = new MutableLiveData<>(); + public MutableLiveData shopActionModel = new MutableLiveData<>(); + public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); + public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); + + public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + verifyActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + checkActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + overtimeActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + shopActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String eorc, String casetypeCode, + String casetypeDetailCode, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, String audioIdVerify, String videoIdVerify, + int bzhours, int bzminis) { + loadState.setValue(LoadState.Loading); + Observable commonActionObservable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + ObserverSubscriber.addSubscribe(commonActionObservable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode != 200) { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone) { + loadState.setValue(LoadState.Loading); + Observable commonActionObservable = RetrofitServiceManager.submitShopCase(isNeedVerify, isNeedRevisit, longitude, latitude, source, caseLevel, areaCode, streetCode, communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis, shopId, shopkeeperName, shopPhone); + ObserverSubscriber.addSubscribe(commonActionObservable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode != 200) { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void updateCaseSupervise(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + updateSuperviseActionModel.setValue(resultBean); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String operationKey, String taskUserId) { + Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, operationKey, taskUserId); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + dispatcherHandleActionModel.setValue(resultBean); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java index bfab79d..3d694ce 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java @@ -2,7 +2,6 @@ import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.mvvm.model.ActionResultBean; import com.casic.dcms.mvvm.model.CaseCheckBean; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseHandleBean; @@ -30,21 +29,18 @@ public class CaseViewModel extends BaseViewModel { private final Gson gson = new Gson(); public MutableLiveData caseVerifyModel = new MutableLiveData<>(); - public MutableLiveData verifyActionModel = new MutableLiveData<>(); public MutableLiveData caseCheckModel = new MutableLiveData<>(); - public MutableLiveData checkActionModel = new MutableLiveData<>(); public MutableLiveData caseHandleModel = new MutableLiveData<>(); public MutableLiveData caseHandledModel = new MutableLiveData<>(); public MutableLiveData caseUrgentModel = new MutableLiveData<>(); public MutableLiveData caseOvertimeModel = new MutableLiveData<>(); - public MutableLiveData overtimeActionModel = new MutableLiveData<>(); public MutableLiveData shopCaseModel = new MutableLiveData<>(); - public MutableLiveData shopActionModel = new MutableLiveData<>(); public MutableLiveData searchResultModel = new MutableLiveData<>(); - public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); - public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); public MutableLiveData caseDetailModel = new MutableLiveData<>(); + /** + * 未核实、已核实 + */ public void obtainVerifyCaseList(int limit, int offset, boolean verified) { Observable observable; if (verified) { @@ -80,39 +76,6 @@ }); } - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { - loadState.setValue(LoadState.Loading); - Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - loadState.setValue(LoadState.Success); - } - - @Override - public void onError(Throwable e) { - loadState.setValue(LoadState.Fail); - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - verifyActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainCheckCaseList(int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { @@ -149,39 +112,6 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { - loadState.setValue(LoadState.Loading); - Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - loadState.setValue(LoadState.Success); - } - - @Override - public void onError(Throwable e) { - loadState.setValue(LoadState.Fail); - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - checkActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainHandleCaseList(String isOvertime, String isEmergent, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { @@ -307,39 +237,6 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { - loadState.setValue(LoadState.Loading); - Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - loadState.setValue(LoadState.Success); - } - - @Override - public void onError(Throwable e) { - loadState.setValue(LoadState.Fail); - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - overtimeActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainShopCaseList(String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { @@ -375,38 +272,6 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { - Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - shopActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void searchCase(String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, offset); @@ -507,66 +372,6 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - updateSuperviseActionModel.setValue(resultBean); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String operationKey, String taskUserId) { - Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, operationKey, taskUserId); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - dispatcherHandleActionModel.setValue(resultBean); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainCaseDetail(String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); diff --git a/app/src/main/res/drawable/layout_divider_vertical.xml b/app/src/main/res/drawable/layout_divider_vertical.xml index d7f4987..4d1eb5c 100644 --- a/app/src/main/res/drawable/layout_divider_vertical.xml +++ b/app/src/main/res/drawable/layout_divider_vertical.xml @@ -1,7 +1,9 @@ - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_case_verify_detail.xml b/app/src/main/res/layout/activity_case_verify_detail.xml index c435d47..db8e9eb 100644 --- a/app/src/main/res/layout/activity_case_verify_detail.xml +++ b/app/src/main/res/layout/activity_case_verify_detail.xml @@ -40,20 +40,18 @@ style="@style/itemLayoutStyle"> + android:id="@+id/caseTypeRightImage" + style="@style/rightImageStyle" /> @@ -63,20 +61,18 @@ style="@style/itemLayoutStyle"> + android:id="@+id/largeTypeRightImage" + style="@style/rightImageStyle" /> @@ -86,20 +82,18 @@ style="@style/itemLayoutStyle"> + android:id="@+id/smallTypeRightImage" + style="@style/rightImageStyle" /> @@ -244,26 +238,13 @@ - - - - - - - - - + android:text="核实意见" /> + style="@style/rightImageStyle" /> diff --git a/app/src/main/res/layout/activity_verify_case.xml b/app/src/main/res/layout/activity_verify_case.xml index 6d7fd18..ab70742 100644 --- a/app/src/main/res/layout/activity_verify_case.xml +++ b/app/src/main/res/layout/activity_verify_case.xml @@ -12,6 +12,7 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index db1fd76..05fd9fa 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index fe9bf46..d7f7073 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 6dd8cb7..3a80c94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -34,12 +34,12 @@ @NonNull @Override public DeptTodoOrHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -58,14 +58,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -77,7 +77,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index 12707a2..7ad05ff 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 52cd5ad..1301830 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java new file mode 100644 index 0000000..de27d58 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -0,0 +1,98 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class VerifyCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public VerifyCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull VerifyCaseListAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + //核实图片 + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java index 831d676..9dd7c2d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java @@ -313,10 +313,10 @@ EasyToast.show(context, "核查情况还未选择"); return; } - caseViewModel.checkCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, remarks, - StringHelper.reformatURL(imageList) - ); +// caseViewModel.checkCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, remarks, +// StringHelper.reformatURL(imageList) +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 5d844b3..1328d81 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -300,10 +300,10 @@ return; } } - caseViewModel.handleOvertimeCase( - data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult - ); +// caseViewModel.handleOvertimeCase( +// data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java index ba820a3..cdc9499 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java @@ -188,7 +188,7 @@ EasyToast.show(this, "督办意见不能为空"); return; } - caseViewModel.updateCaseSupervise(id, remarks); +// caseViewModel.updateCaseSupervise(id, remarks); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java index 3351929..df2ca25 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java @@ -26,6 +26,7 @@ import com.casic.dcms.mvvm.model.CaseLargeTypeBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; import com.casic.dcms.mvvm.model.CaseSmallTypeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.CommonDataViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; @@ -65,6 +66,7 @@ private CommonDataViewModel commonDataViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private List largeTypeBeans; private List smallTypeBeans; private String id; @@ -120,6 +122,7 @@ commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); caseViewModel.obtainCaseDetail(id); @@ -154,12 +157,12 @@ viewBinding.caseEndTimeView.setText(data.getNodeLimittime()); viewBinding.caseSituationView.setText(StringHelper.filterString(data.getDescription())); - //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，其他类型不可修改 + //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，案卷类型可修改；否则不可修改 int source = data.getSource(); if (source != 11 && source != 12) { - viewBinding.i.setVisibility(View.GONE); - viewBinding.ii.setVisibility(View.GONE); - viewBinding.iii.setVisibility(View.GONE); + viewBinding.caseTypeRightImage.setVisibility(View.GONE); + viewBinding.largeTypeRightImage.setVisibility(View.GONE); + viewBinding.smallTypeRightImage.setVisibility(View.GONE); viewBinding.caseClassLayout.setClickable(false); viewBinding.caseLargeClassLayout.setClickable(false); @@ -186,7 +189,7 @@ if (urls.get(position).isEmpty()) { EasyToast.show(context, "图片加载失败，无法查看大图"); } else { - OtherUtils.showBigImage(context, position, urls); + ContextUtil.navigatePageTo(context, BigImageActivity.class, position, urls); } } }); @@ -364,7 +367,6 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - viewBinding.caseOpinionView.setText(dataBean.getNextOperation()); viewBinding.caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -379,24 +381,7 @@ verifyImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseVerifyDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseVerifyDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -418,7 +403,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.isSuccess()) { - if (verifyImageAdapter.getItemCount() <= 2) { + if (verifyImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -446,7 +431,7 @@ submitCase(); } }); - caseViewModel.loadState.observe(this, new Observer() { + operateViewModel.loadState.observe(this, new Observer() { @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { @@ -462,44 +447,25 @@ }); } - private void submitCase() { - String remarks = viewBinding.caseOpinionView.getText().toString(); - if (TextUtils.isEmpty(remarks)) { - EasyToast.show(this, "核实意见不能为空"); - return; - } - if (TextUtils.isEmpty(changeState)) { - EasyToast.show(this, "核实情况还未选择"); - return; - } - int source = data.getSource(); - if (source != 11 && source != 12) { - //修改案卷 - caseViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList)); - } else { - //补全案卷 - if (TextUtils.isEmpty(gridId)) { - EasyToast.show(this, "网格ID异常，请重新选择"); - return; - } - String fieldIntro = viewBinding.casePlaceView.getText().toString(); - if (TextUtils.isEmpty(fieldIntro)) { - EasyToast.show(this, "案卷地点还未填写"); - } - if (longitude == 0 || latitude == 0) { - EasyToast.show(this, "经纬度异常，请重新选择位置"); - return; - } - caseViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList), - eorc == null ? data.getEorc() : eorc, - typeCode == null ? data.getCasetypeCode() : typeCode, - typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, - String.valueOf(longitude), String.valueOf(latitude), - "1", gridId.substring(0, 6), - gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); - } + private void selectPicture() { + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseVerifyDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override @@ -528,6 +494,46 @@ } } + private void submitCase() { + String remarks = viewBinding.caseConditionView.getText().toString(); + if (TextUtils.isEmpty(remarks)) { + EasyToast.show(this, "核实意见不能为空"); + return; + } + if (TextUtils.isEmpty(changeState)) { + EasyToast.show(this, "核实情况还未选择"); + return; + } + int source = data.getSource(); + if (source != 11 && source != 12) { + //修改案卷 + operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList)); + } else { + //补全案卷 + if (TextUtils.isEmpty(gridId)) { + EasyToast.show(this, "网格ID异常，请重新选择"); + return; + } + String fieldIntro = viewBinding.casePlaceView.getText().toString(); + if (TextUtils.isEmpty(fieldIntro)) { + EasyToast.show(this, "案卷地点还未填写"); + } + if (longitude == 0 || latitude == 0) { + EasyToast.show(this, "经纬度异常，请重新选择位置"); + return; + } + operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList), + eorc == null ? data.getEorc() : eorc, + typeCode == null ? data.getCasetypeCode() : typeCode, + typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, + String.valueOf(longitude), String.valueOf(latitude), + "1", gridId.substring(0, 6), + gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); + } + } + @Override protected void onDestroy() { viewBinding.audioPlayerView.release(); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java index 812ceb5..de23222 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java @@ -250,9 +250,9 @@ EasyToast.show(context, "不同意/同意的意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - data.getProcessPersonid()); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// data.getProcessPersonid()); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java index 4c2badb..31fc6a0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java @@ -314,9 +314,9 @@ if (TextUtils.isEmpty(taskUserId)) { taskUserId = data.getProcessPersonid(); } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// taskUserId); } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 8fac12c..b8b9c59 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -311,8 +311,8 @@ EasyToast.show(context, "处理意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java index f758047..919b18f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java @@ -415,7 +415,7 @@ return; } } - caseViewModel.handleOvertimeCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); +// caseViewModel.handleOvertimeCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java index 255cd80..3bb2d08 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java @@ -13,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -39,8 +40,9 @@ //绑定TabLayout viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java index be19486..9aaef7e 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseVerifyResultAdapter; +import com.casic.dcms.adapter.VerifyCaseListAdapter; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.view.CaseVerifiedDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseHandledFragment"; private CaseViewModel caseViewModel; - private CaseVerifyResultAdapter adapter; + private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; @@ -120,9 +120,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseVerifyResultAdapter(requireContext(), dataBeans); + adapter = new VerifyCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new VerifyCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java index f8298cc..6cbbc83 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseVerifyResultAdapter; +import com.casic.dcms.adapter.VerifyCaseListAdapter; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.view.CaseVerifyDetailActivity; @@ -29,13 +29,12 @@ private static final String TAG = "CaseVerifyFragment"; private CaseViewModel caseViewModel; - private CaseVerifyResultAdapter adapter; + private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; - @Override protected void setupTopBarLayout() { @@ -121,9 +120,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseVerifyResultAdapter(requireContext(), dataBeans); + adapter = new VerifyCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new VerifyCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseOperateViewModel.java new file mode 100644 index 0000000..5a69666 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseOperateViewModel.java @@ -0,0 +1,286 @@ +package com.casic.dcms.mvvm.vm; + +import androidx.lifecycle.MutableLiveData; + +import com.casic.dcms.mvvm.model.ActionResultBean; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.vm.BaseViewModel; +import com.pengxh.androidx.lite.vm.LoadState; +import com.pengxh.androidx.lite.vm.ObserverSubscriber; + +import java.io.IOException; + +import okhttp3.ResponseBody; +import rx.Observable; + +public class CaseOperateViewModel extends BaseViewModel { + private final Gson gson = new Gson(); + public MutableLiveData verifyActionModel = new MutableLiveData<>(); + public MutableLiveData checkActionModel = new MutableLiveData<>(); + public MutableLiveData overtimeActionModel = new MutableLiveData<>(); + public MutableLiveData shopActionModel = new MutableLiveData<>(); + public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); + public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); + + public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + verifyActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + checkActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + overtimeActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + shopActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String eorc, String casetypeCode, + String casetypeDetailCode, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, String audioIdVerify, String videoIdVerify, + int bzhours, int bzminis) { + loadState.setValue(LoadState.Loading); + Observable commonActionObservable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + ObserverSubscriber.addSubscribe(commonActionObservable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode != 200) { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone) { + loadState.setValue(LoadState.Loading); + Observable commonActionObservable = RetrofitServiceManager.submitShopCase(isNeedVerify, isNeedRevisit, longitude, latitude, source, caseLevel, areaCode, streetCode, communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis, shopId, shopkeeperName, shopPhone); + ObserverSubscriber.addSubscribe(commonActionObservable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode != 200) { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void updateCaseSupervise(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + updateSuperviseActionModel.setValue(resultBean); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String operationKey, String taskUserId) { + Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, operationKey, taskUserId); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + dispatcherHandleActionModel.setValue(resultBean); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java index bfab79d..3d694ce 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java @@ -2,7 +2,6 @@ import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.mvvm.model.ActionResultBean; import com.casic.dcms.mvvm.model.CaseCheckBean; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseHandleBean; @@ -30,21 +29,18 @@ public class CaseViewModel extends BaseViewModel { private final Gson gson = new Gson(); public MutableLiveData caseVerifyModel = new MutableLiveData<>(); - public MutableLiveData verifyActionModel = new MutableLiveData<>(); public MutableLiveData caseCheckModel = new MutableLiveData<>(); - public MutableLiveData checkActionModel = new MutableLiveData<>(); public MutableLiveData caseHandleModel = new MutableLiveData<>(); public MutableLiveData caseHandledModel = new MutableLiveData<>(); public MutableLiveData caseUrgentModel = new MutableLiveData<>(); public MutableLiveData caseOvertimeModel = new MutableLiveData<>(); - public MutableLiveData overtimeActionModel = new MutableLiveData<>(); public MutableLiveData shopCaseModel = new MutableLiveData<>(); - public MutableLiveData shopActionModel = new MutableLiveData<>(); public MutableLiveData searchResultModel = new MutableLiveData<>(); - public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); - public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); public MutableLiveData caseDetailModel = new MutableLiveData<>(); + /** + * 未核实、已核实 + */ public void obtainVerifyCaseList(int limit, int offset, boolean verified) { Observable observable; if (verified) { @@ -80,39 +76,6 @@ }); } - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { - loadState.setValue(LoadState.Loading); - Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - loadState.setValue(LoadState.Success); - } - - @Override - public void onError(Throwable e) { - loadState.setValue(LoadState.Fail); - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - verifyActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainCheckCaseList(int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { @@ -149,39 +112,6 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { - loadState.setValue(LoadState.Loading); - Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - loadState.setValue(LoadState.Success); - } - - @Override - public void onError(Throwable e) { - loadState.setValue(LoadState.Fail); - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - checkActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainHandleCaseList(String isOvertime, String isEmergent, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { @@ -307,39 +237,6 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { - loadState.setValue(LoadState.Loading); - Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - loadState.setValue(LoadState.Success); - } - - @Override - public void onError(Throwable e) { - loadState.setValue(LoadState.Fail); - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - overtimeActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainShopCaseList(String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { @@ -375,38 +272,6 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { - Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - shopActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void searchCase(String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, offset); @@ -507,66 +372,6 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - updateSuperviseActionModel.setValue(resultBean); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String operationKey, String taskUserId) { - Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, operationKey, taskUserId); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - dispatcherHandleActionModel.setValue(resultBean); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainCaseDetail(String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); diff --git a/app/src/main/res/drawable/layout_divider_vertical.xml b/app/src/main/res/drawable/layout_divider_vertical.xml index d7f4987..4d1eb5c 100644 --- a/app/src/main/res/drawable/layout_divider_vertical.xml +++ b/app/src/main/res/drawable/layout_divider_vertical.xml @@ -1,7 +1,9 @@ - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_case_verify_detail.xml b/app/src/main/res/layout/activity_case_verify_detail.xml index c435d47..db8e9eb 100644 --- a/app/src/main/res/layout/activity_case_verify_detail.xml +++ b/app/src/main/res/layout/activity_case_verify_detail.xml @@ -40,20 +40,18 @@ style="@style/itemLayoutStyle"> + android:id="@+id/caseTypeRightImage" + style="@style/rightImageStyle" /> @@ -63,20 +61,18 @@ style="@style/itemLayoutStyle"> + android:id="@+id/largeTypeRightImage" + style="@style/rightImageStyle" /> @@ -86,20 +82,18 @@ style="@style/itemLayoutStyle"> + android:id="@+id/smallTypeRightImage" + style="@style/rightImageStyle" /> @@ -244,26 +238,13 @@ - - - - - - - - - + android:text="核实意见" /> + style="@style/rightImageStyle" /> diff --git a/app/src/main/res/layout/activity_verify_case.xml b/app/src/main/res/layout/activity_verify_case.xml index 6d7fd18..ab70742 100644 --- a/app/src/main/res/layout/activity_verify_case.xml +++ b/app/src/main/res/layout/activity_verify_case.xml @@ -12,6 +12,7 @@ + android:layout_height="match_parent" + android:layout_marginTop="@dimen/dp_5"> + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index db1fd76..05fd9fa 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index fe9bf46..d7f7073 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 6dd8cb7..3a80c94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -34,12 +34,12 @@ @NonNull @Override public DeptTodoOrHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -58,14 +58,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -77,7 +77,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index 12707a2..7ad05ff 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 52cd5ad..1301830 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java new file mode 100644 index 0000000..de27d58 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -0,0 +1,98 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class VerifyCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public VerifyCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull VerifyCaseListAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + //核实图片 + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java index 831d676..9dd7c2d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java @@ -313,10 +313,10 @@ EasyToast.show(context, "核查情况还未选择"); return; } - caseViewModel.checkCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, remarks, - StringHelper.reformatURL(imageList) - ); +// caseViewModel.checkCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, remarks, +// StringHelper.reformatURL(imageList) +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 5d844b3..1328d81 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -300,10 +300,10 @@ return; } } - caseViewModel.handleOvertimeCase( - data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult - ); +// caseViewModel.handleOvertimeCase( +// data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java index ba820a3..cdc9499 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java @@ -188,7 +188,7 @@ EasyToast.show(this, "督办意见不能为空"); return; } - caseViewModel.updateCaseSupervise(id, remarks); +// caseViewModel.updateCaseSupervise(id, remarks); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java index 3351929..df2ca25 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java @@ -26,6 +26,7 @@ import com.casic.dcms.mvvm.model.CaseLargeTypeBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; import com.casic.dcms.mvvm.model.CaseSmallTypeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.CommonDataViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; @@ -65,6 +66,7 @@ private CommonDataViewModel commonDataViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private List largeTypeBeans; private List smallTypeBeans; private String id; @@ -120,6 +122,7 @@ commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); caseViewModel.obtainCaseDetail(id); @@ -154,12 +157,12 @@ viewBinding.caseEndTimeView.setText(data.getNodeLimittime()); viewBinding.caseSituationView.setText(StringHelper.filterString(data.getDescription())); - //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，其他类型不可修改 + //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，案卷类型可修改；否则不可修改 int source = data.getSource(); if (source != 11 && source != 12) { - viewBinding.i.setVisibility(View.GONE); - viewBinding.ii.setVisibility(View.GONE); - viewBinding.iii.setVisibility(View.GONE); + viewBinding.caseTypeRightImage.setVisibility(View.GONE); + viewBinding.largeTypeRightImage.setVisibility(View.GONE); + viewBinding.smallTypeRightImage.setVisibility(View.GONE); viewBinding.caseClassLayout.setClickable(false); viewBinding.caseLargeClassLayout.setClickable(false); @@ -186,7 +189,7 @@ if (urls.get(position).isEmpty()) { EasyToast.show(context, "图片加载失败，无法查看大图"); } else { - OtherUtils.showBigImage(context, position, urls); + ContextUtil.navigatePageTo(context, BigImageActivity.class, position, urls); } } }); @@ -364,7 +367,6 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - viewBinding.caseOpinionView.setText(dataBean.getNextOperation()); viewBinding.caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -379,24 +381,7 @@ verifyImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseVerifyDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseVerifyDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -418,7 +403,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.isSuccess()) { - if (verifyImageAdapter.getItemCount() <= 2) { + if (verifyImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -446,7 +431,7 @@ submitCase(); } }); - caseViewModel.loadState.observe(this, new Observer() { + operateViewModel.loadState.observe(this, new Observer() { @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { @@ -462,44 +447,25 @@ }); } - private void submitCase() { - String remarks = viewBinding.caseOpinionView.getText().toString(); - if (TextUtils.isEmpty(remarks)) { - EasyToast.show(this, "核实意见不能为空"); - return; - } - if (TextUtils.isEmpty(changeState)) { - EasyToast.show(this, "核实情况还未选择"); - return; - } - int source = data.getSource(); - if (source != 11 && source != 12) { - //修改案卷 - caseViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList)); - } else { - //补全案卷 - if (TextUtils.isEmpty(gridId)) { - EasyToast.show(this, "网格ID异常，请重新选择"); - return; - } - String fieldIntro = viewBinding.casePlaceView.getText().toString(); - if (TextUtils.isEmpty(fieldIntro)) { - EasyToast.show(this, "案卷地点还未填写"); - } - if (longitude == 0 || latitude == 0) { - EasyToast.show(this, "经纬度异常，请重新选择位置"); - return; - } - caseViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList), - eorc == null ? data.getEorc() : eorc, - typeCode == null ? data.getCasetypeCode() : typeCode, - typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, - String.valueOf(longitude), String.valueOf(latitude), - "1", gridId.substring(0, 6), - gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); - } + private void selectPicture() { + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseVerifyDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override @@ -528,6 +494,46 @@ } } + private void submitCase() { + String remarks = viewBinding.caseConditionView.getText().toString(); + if (TextUtils.isEmpty(remarks)) { + EasyToast.show(this, "核实意见不能为空"); + return; + } + if (TextUtils.isEmpty(changeState)) { + EasyToast.show(this, "核实情况还未选择"); + return; + } + int source = data.getSource(); + if (source != 11 && source != 12) { + //修改案卷 + operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList)); + } else { + //补全案卷 + if (TextUtils.isEmpty(gridId)) { + EasyToast.show(this, "网格ID异常，请重新选择"); + return; + } + String fieldIntro = viewBinding.casePlaceView.getText().toString(); + if (TextUtils.isEmpty(fieldIntro)) { + EasyToast.show(this, "案卷地点还未填写"); + } + if (longitude == 0 || latitude == 0) { + EasyToast.show(this, "经纬度异常，请重新选择位置"); + return; + } + operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList), + eorc == null ? data.getEorc() : eorc, + typeCode == null ? data.getCasetypeCode() : typeCode, + typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, + String.valueOf(longitude), String.valueOf(latitude), + "1", gridId.substring(0, 6), + gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); + } + } + @Override protected void onDestroy() { viewBinding.audioPlayerView.release(); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java index 812ceb5..de23222 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java @@ -250,9 +250,9 @@ EasyToast.show(context, "不同意/同意的意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - data.getProcessPersonid()); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// data.getProcessPersonid()); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java index 4c2badb..31fc6a0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java @@ -314,9 +314,9 @@ if (TextUtils.isEmpty(taskUserId)) { taskUserId = data.getProcessPersonid(); } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// taskUserId); } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 8fac12c..b8b9c59 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -311,8 +311,8 @@ EasyToast.show(context, "处理意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java index f758047..919b18f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java @@ -415,7 +415,7 @@ return; } } - caseViewModel.handleOvertimeCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); +// caseViewModel.handleOvertimeCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java index 255cd80..3bb2d08 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java @@ -13,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -39,8 +40,9 @@ //绑定TabLayout viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java index be19486..9aaef7e 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseVerifyResultAdapter; +import com.casic.dcms.adapter.VerifyCaseListAdapter; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.view.CaseVerifiedDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseHandledFragment"; private CaseViewModel caseViewModel; - private CaseVerifyResultAdapter adapter; + private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; @@ -120,9 +120,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseVerifyResultAdapter(requireContext(), dataBeans); + adapter = new VerifyCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new VerifyCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java index f8298cc..6cbbc83 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseVerifyResultAdapter; +import com.casic.dcms.adapter.VerifyCaseListAdapter; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.view.CaseVerifyDetailActivity; @@ -29,13 +29,12 @@ private static final String TAG = "CaseVerifyFragment"; private CaseViewModel caseViewModel; - private CaseVerifyResultAdapter adapter; + private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; - @Override protected void setupTopBarLayout() { @@ -121,9 +120,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseVerifyResultAdapter(requireContext(), dataBeans); + adapter = new VerifyCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new VerifyCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseOperateViewModel.java new file mode 100644 index 0000000..5a69666 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseOperateViewModel.java @@ -0,0 +1,286 @@ +package com.casic.dcms.mvvm.vm; + +import androidx.lifecycle.MutableLiveData; + +import com.casic.dcms.mvvm.model.ActionResultBean; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.vm.BaseViewModel; +import com.pengxh.androidx.lite.vm.LoadState; +import com.pengxh.androidx.lite.vm.ObserverSubscriber; + +import java.io.IOException; + +import okhttp3.ResponseBody; +import rx.Observable; + +public class CaseOperateViewModel extends BaseViewModel { + private final Gson gson = new Gson(); + public MutableLiveData verifyActionModel = new MutableLiveData<>(); + public MutableLiveData checkActionModel = new MutableLiveData<>(); + public MutableLiveData overtimeActionModel = new MutableLiveData<>(); + public MutableLiveData shopActionModel = new MutableLiveData<>(); + public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); + public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); + + public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + verifyActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + checkActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + overtimeActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + shopActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String eorc, String casetypeCode, + String casetypeDetailCode, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, String audioIdVerify, String videoIdVerify, + int bzhours, int bzminis) { + loadState.setValue(LoadState.Loading); + Observable commonActionObservable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + ObserverSubscriber.addSubscribe(commonActionObservable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode != 200) { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone) { + loadState.setValue(LoadState.Loading); + Observable commonActionObservable = RetrofitServiceManager.submitShopCase(isNeedVerify, isNeedRevisit, longitude, latitude, source, caseLevel, areaCode, streetCode, communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis, shopId, shopkeeperName, shopPhone); + ObserverSubscriber.addSubscribe(commonActionObservable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode != 200) { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void updateCaseSupervise(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + updateSuperviseActionModel.setValue(resultBean); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String operationKey, String taskUserId) { + Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, operationKey, taskUserId); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + dispatcherHandleActionModel.setValue(resultBean); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java index bfab79d..3d694ce 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java @@ -2,7 +2,6 @@ import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.mvvm.model.ActionResultBean; import com.casic.dcms.mvvm.model.CaseCheckBean; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseHandleBean; @@ -30,21 +29,18 @@ public class CaseViewModel extends BaseViewModel { private final Gson gson = new Gson(); public MutableLiveData caseVerifyModel = new MutableLiveData<>(); - public MutableLiveData verifyActionModel = new MutableLiveData<>(); public MutableLiveData caseCheckModel = new MutableLiveData<>(); - public MutableLiveData checkActionModel = new MutableLiveData<>(); public MutableLiveData caseHandleModel = new MutableLiveData<>(); public MutableLiveData caseHandledModel = new MutableLiveData<>(); public MutableLiveData caseUrgentModel = new MutableLiveData<>(); public MutableLiveData caseOvertimeModel = new MutableLiveData<>(); - public MutableLiveData overtimeActionModel = new MutableLiveData<>(); public MutableLiveData shopCaseModel = new MutableLiveData<>(); - public MutableLiveData shopActionModel = new MutableLiveData<>(); public MutableLiveData searchResultModel = new MutableLiveData<>(); - public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); - public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); public MutableLiveData caseDetailModel = new MutableLiveData<>(); + /** + * 未核实、已核实 + */ public void obtainVerifyCaseList(int limit, int offset, boolean verified) { Observable observable; if (verified) { @@ -80,39 +76,6 @@ }); } - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { - loadState.setValue(LoadState.Loading); - Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - loadState.setValue(LoadState.Success); - } - - @Override - public void onError(Throwable e) { - loadState.setValue(LoadState.Fail); - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - verifyActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainCheckCaseList(int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { @@ -149,39 +112,6 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { - loadState.setValue(LoadState.Loading); - Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - loadState.setValue(LoadState.Success); - } - - @Override - public void onError(Throwable e) { - loadState.setValue(LoadState.Fail); - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - checkActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainHandleCaseList(String isOvertime, String isEmergent, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { @@ -307,39 +237,6 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { - loadState.setValue(LoadState.Loading); - Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - loadState.setValue(LoadState.Success); - } - - @Override - public void onError(Throwable e) { - loadState.setValue(LoadState.Fail); - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - overtimeActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainShopCaseList(String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { @@ -375,38 +272,6 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { - Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - shopActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void searchCase(String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, offset); @@ -507,66 +372,6 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - updateSuperviseActionModel.setValue(resultBean); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String operationKey, String taskUserId) { - Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, operationKey, taskUserId); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - dispatcherHandleActionModel.setValue(resultBean); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainCaseDetail(String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); diff --git a/app/src/main/res/drawable/layout_divider_vertical.xml b/app/src/main/res/drawable/layout_divider_vertical.xml index d7f4987..4d1eb5c 100644 --- a/app/src/main/res/drawable/layout_divider_vertical.xml +++ b/app/src/main/res/drawable/layout_divider_vertical.xml @@ -1,7 +1,9 @@ - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_case_verify_detail.xml b/app/src/main/res/layout/activity_case_verify_detail.xml index c435d47..db8e9eb 100644 --- a/app/src/main/res/layout/activity_case_verify_detail.xml +++ b/app/src/main/res/layout/activity_case_verify_detail.xml @@ -40,20 +40,18 @@ style="@style/itemLayoutStyle"> + android:id="@+id/caseTypeRightImage" + style="@style/rightImageStyle" /> @@ -63,20 +61,18 @@ style="@style/itemLayoutStyle"> + android:id="@+id/largeTypeRightImage" + style="@style/rightImageStyle" /> @@ -86,20 +82,18 @@ style="@style/itemLayoutStyle"> + android:id="@+id/smallTypeRightImage" + style="@style/rightImageStyle" /> @@ -244,26 +238,13 @@ - - - - - - - - - + android:text="核实意见" /> + style="@style/rightImageStyle" /> diff --git a/app/src/main/res/layout/activity_verify_case.xml b/app/src/main/res/layout/activity_verify_case.xml index 6d7fd18..ab70742 100644 --- a/app/src/main/res/layout/activity_verify_case.xml +++ b/app/src/main/res/layout/activity_verify_case.xml @@ -12,6 +12,7 @@ + android:layout_height="match_parent" + android:layout_marginTop="@dimen/dp_5"> - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d99668..5ac53be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,21 +11,30 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java index 90de583..5941dfd 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseCheckResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseCheckResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseCheckResultAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseCheckResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java index b9e3054..4c4052f 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandleAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandleAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandleAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandleAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java index ecd9923..6c1cc5b 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseHandledAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public CaseHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new CaseHandledAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java index 5a67516..a051fbf 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseListResultAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -64,14 +64,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -83,7 +83,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java deleted file mode 100644 index 90c8fba..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.mvvm.model.CaseVerifyBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - - private final List dataBeans; - private final LayoutInflater layoutInflater; - - public CaseVerifyResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifyResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifyResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private final TextView leftTextView; - private final TextView caseTitleView; - private final TextView casePlaceView; - private final TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java index db1fd76..05fd9fa 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptAuthorizeOrAdjustAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptAuthorizeOrAdjustAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptAuthorizeOrAdjustAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java index fe9bf46..d7f7073 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptDelayedOrPostAdapter.java @@ -31,12 +31,12 @@ @NonNull @Override public DeptDelayedOrPostAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptDelayedOrPostAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -55,14 +55,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -74,7 +74,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java index 6dd8cb7..3a80c94 100644 --- a/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/DeptTodoOrHandledAdapter.java @@ -34,12 +34,12 @@ @NonNull @Override public DeptTodoOrHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull DeptTodoOrHandledAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -58,14 +58,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -77,7 +77,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java index 12707a2..7ad05ff 100644 --- a/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/OvertimeCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public OvertimeCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new OvertimeCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull OvertimeCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java index 52cd5ad..1301830 100644 --- a/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/UrgentCaseAdapter.java @@ -30,12 +30,12 @@ @NonNull @Override public UrgentCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + View view = layoutInflater.inflate(R.layout.item_case_rv, parent, false); return new UrgentCaseAdapter.ItemViewHolder(view); } @Override - public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull UrgentCaseAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,14 +54,14 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private final TextView leftTextView; +// private final TextView leftTextView; private final TextView caseTitleView; private final TextView casePlaceView; private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); +// leftTextView = itemView.findViewById(R.id.leftTextView); caseTitleView = itemView.findViewById(R.id.caseTitleView); casePlaceView = itemView.findViewById(R.id.casePlaceView); caseTimeView = itemView.findViewById(R.id.caseTimeView); @@ -73,7 +73,7 @@ if (TextUtils.isEmpty(eorcName)) { eorcName = "未知"; } - leftTextView.setText(eorcName.substring(0, 1)); +// leftTextView.setText(eorcName.substring(0, 1)); caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); diff --git a/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java new file mode 100644 index 0000000..de27d58 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/VerifyCaseListAdapter.java @@ -0,0 +1,98 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.mvvm.model.CaseVerifyBean; +import com.casic.dcms.utils.StringHelper; +import com.qmuiteam.qmui.widget.QMUIRadiusImageView; + +import java.util.List; + +public class VerifyCaseListAdapter extends RecyclerView.Adapter { + + private final Context context; + private final List dataBeans; + private final LayoutInflater layoutInflater; + + public VerifyCaseListAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemViewHolder(layoutInflater.inflate(R.layout.item_case_rv, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull VerifyCaseListAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private final QMUIRadiusImageView caseImageView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + caseImageView = itemView.findViewById(R.id.caseImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + void bindView(CaseVerifyBean.DataBean.RowsBean rowsBean) { + //核实图片 + String fileIdVerify = rowsBean.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); + } + } + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java index 831d676..9dd7c2d 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseCheckDetailActivity.java @@ -313,10 +313,10 @@ EasyToast.show(context, "核查情况还未选择"); return; } - caseViewModel.checkCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, remarks, - StringHelper.reformatURL(imageList) - ); +// caseViewModel.checkCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, remarks, +// StringHelper.reformatURL(imageList) +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java index 5d844b3..1328d81 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseHandleDetailActivity.java @@ -300,10 +300,10 @@ return; } } - caseViewModel.handleOvertimeCase( - data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult - ); +// caseViewModel.handleOvertimeCase( +// data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(imageList), approvalResult +// ); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java index ba820a3..cdc9499 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseTodoDetailActivity.java @@ -188,7 +188,7 @@ EasyToast.show(this, "督办意见不能为空"); return; } - caseViewModel.updateCaseSupervise(id, remarks); +// caseViewModel.updateCaseSupervise(id, remarks); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java index 3351929..df2ca25 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/CaseVerifyDetailActivity.java @@ -26,6 +26,7 @@ import com.casic.dcms.mvvm.model.CaseLargeTypeBean; import com.casic.dcms.mvvm.model.CaseNextNodeBean; import com.casic.dcms.mvvm.model.CaseSmallTypeBean; +import com.casic.dcms.mvvm.vm.CaseOperateViewModel; import com.casic.dcms.mvvm.vm.CaseViewModel; import com.casic.dcms.mvvm.vm.CommonDataViewModel; import com.casic.dcms.mvvm.vm.NodeViewModel; @@ -65,6 +66,7 @@ private CommonDataViewModel commonDataViewModel; private UploadViewModel uploadViewModel; private NodeViewModel nodeViewModel; + private CaseOperateViewModel operateViewModel; private List largeTypeBeans; private List smallTypeBeans; private String id; @@ -120,6 +122,7 @@ commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); uploadViewModel = new ViewModelProvider(this).get(UploadViewModel.class); nodeViewModel = new ViewModelProvider(this).get(NodeViewModel.class); + operateViewModel = new ViewModelProvider(this).get(CaseOperateViewModel.class); caseViewModel.obtainCaseDetail(id); @@ -154,12 +157,12 @@ viewBinding.caseEndTimeView.setText(data.getNodeLimittime()); viewBinding.caseSituationView.setText(StringHelper.filterString(data.getDescription())); - //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，其他类型不可修改 + //根据source判断是否能够修改案卷类型，11/12是公众号和热线电话，案卷类型可修改；否则不可修改 int source = data.getSource(); if (source != 11 && source != 12) { - viewBinding.i.setVisibility(View.GONE); - viewBinding.ii.setVisibility(View.GONE); - viewBinding.iii.setVisibility(View.GONE); + viewBinding.caseTypeRightImage.setVisibility(View.GONE); + viewBinding.largeTypeRightImage.setVisibility(View.GONE); + viewBinding.smallTypeRightImage.setVisibility(View.GONE); viewBinding.caseClassLayout.setClickable(false); viewBinding.caseLargeClassLayout.setClickable(false); @@ -186,7 +189,7 @@ if (urls.get(position).isEmpty()) { EasyToast.show(context, "图片加载失败，无法查看大图"); } else { - OtherUtils.showBigImage(context, position, urls); + ContextUtil.navigatePageTo(context, BigImageActivity.class, position, urls); } } }); @@ -364,7 +367,6 @@ dialog.dismiss(); CaseNextNodeBean.DataBean dataBean = dataBeans.get(position); - viewBinding.caseOpinionView.setText(dataBean.getNextOperation()); viewBinding.caseConditionView.setText(dataBean.getNextOperation()); changeState = String.valueOf(dataBean.getNextState()); } @@ -379,24 +381,7 @@ verifyImageAdapter.setOnItemClickListener(new EditableImageAdapter.OnItemClickListener() { @Override public void onAddImageClick() { - new BottomActionSheet.Builder() - .setContext(context) - .setItemTextColor(Color.BLUE) - .setActionItemTitle(Arrays.asList("拍照", "相册")) - .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { - @Override - public void onActionItemClick(int position) { - switch (position) { - case 0: - OtherUtils.takePicture(CaseVerifyDetailActivity.this); - break; - case 1: - OtherUtils.selectPicture(CaseVerifyDetailActivity.this); - break; - } - } - }) - .build().show(); + selectPicture(); } @Override @@ -418,7 +403,7 @@ @Override public void onChanged(ActionResultBean resultBean) { if (resultBean.isSuccess()) { - if (verifyImageAdapter.getItemCount() <= 2) { + if (verifyImageAdapter.getItemCount() <= 3) { String url = resultBean.getData(); imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); @@ -446,7 +431,7 @@ submitCase(); } }); - caseViewModel.loadState.observe(this, new Observer() { + operateViewModel.loadState.observe(this, new Observer() { @Override public void onChanged(LoadState loadState) { if (loadState == LoadState.Loading) { @@ -462,44 +447,25 @@ }); } - private void submitCase() { - String remarks = viewBinding.caseOpinionView.getText().toString(); - if (TextUtils.isEmpty(remarks)) { - EasyToast.show(this, "核实意见不能为空"); - return; - } - if (TextUtils.isEmpty(changeState)) { - EasyToast.show(this, "核实情况还未选择"); - return; - } - int source = data.getSource(); - if (source != 11 && source != 12) { - //修改案卷 - caseViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList)); - } else { - //补全案卷 - if (TextUtils.isEmpty(gridId)) { - EasyToast.show(this, "网格ID异常，请重新选择"); - return; - } - String fieldIntro = viewBinding.casePlaceView.getText().toString(); - if (TextUtils.isEmpty(fieldIntro)) { - EasyToast.show(this, "案卷地点还未填写"); - } - if (longitude == 0 || latitude == 0) { - EasyToast.show(this, "经纬度异常，请重新选择位置"); - return; - } - caseViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, remarks, StringHelper.reformatURL(imageList), - eorc == null ? data.getEorc() : eorc, - typeCode == null ? data.getCasetypeCode() : typeCode, - typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, - String.valueOf(longitude), String.valueOf(latitude), - "1", gridId.substring(0, 6), - gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); - } + private void selectPicture() { + new BottomActionSheet.Builder() + .setContext(context) + .setItemTextColor(Color.BLUE) + .setActionItemTitle(Arrays.asList("拍照", "相册")) + .setOnActionSheetListener(new BottomActionSheet.OnActionSheetListener() { + @Override + public void onActionItemClick(int position) { + switch (position) { + case 0: + OtherUtils.takePicture(CaseVerifyDetailActivity.this); + break; + case 1: + OtherUtils.selectPicture(CaseVerifyDetailActivity.this); + break; + } + } + }) + .build().show(); } @Override @@ -528,6 +494,46 @@ } } + private void submitCase() { + String remarks = viewBinding.caseConditionView.getText().toString(); + if (TextUtils.isEmpty(remarks)) { + EasyToast.show(this, "核实意见不能为空"); + return; + } + if (TextUtils.isEmpty(changeState)) { + EasyToast.show(this, "核实情况还未选择"); + return; + } + int source = data.getSource(); + if (source != 11 && source != 12) { + //修改案卷 + operateViewModel.checkCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList)); + } else { + //补全案卷 + if (TextUtils.isEmpty(gridId)) { + EasyToast.show(this, "网格ID异常，请重新选择"); + return; + } + String fieldIntro = viewBinding.casePlaceView.getText().toString(); + if (TextUtils.isEmpty(fieldIntro)) { + EasyToast.show(this, "案卷地点还未填写"); + } + if (longitude == 0 || latitude == 0) { + EasyToast.show(this, "经纬度异常，请重新选择位置"); + return; + } + operateViewModel.verifyCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), + changeState, remarks, StringHelper.reformatURL(imageList), + eorc == null ? data.getEorc() : eorc, + typeCode == null ? data.getCasetypeCode() : typeCode, + typeDetailCode == null ? data.getCasetypeDetailCode() : typeDetailCode, + String.valueOf(longitude), String.valueOf(latitude), + "1", gridId.substring(0, 6), + gridId.substring(0, 9), data.getCommunityCode(), gridId, fieldIntro); + } + } + @Override protected void onDestroy() { viewBinding.audioPlayerView.release(); diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java index 812ceb5..de23222 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAdjustDetailActivity.java @@ -250,9 +250,9 @@ EasyToast.show(context, "不同意/同意的意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - data.getProcessPersonid()); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// data.getProcessPersonid()); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java index 4c2badb..31fc6a0 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptAuthorizeDetailActivity.java @@ -314,9 +314,9 @@ if (TextUtils.isEmpty(taskUserId)) { taskUserId = data.getProcessPersonid(); } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, - taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, +// taskUserId); } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java index 8fac12c..b8b9c59 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/DeptTodoDetailActivity.java @@ -311,8 +311,8 @@ EasyToast.show(context, "处理意见必须填写"); return; } - caseViewModel.dispatcherHandleCase(data.getProcessId(), id, - String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); +// caseViewModel.dispatcherHandleCase(data.getProcessId(), id, +// String.valueOf(data.getCaseState()), changeState, optionInput, operationKey, taskUserId); } }); } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java index f758047..919b18f 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/PackageTodoDetailActivity.java @@ -415,7 +415,7 @@ return; } } - caseViewModel.handleOvertimeCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), - changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); +// caseViewModel.handleOvertimeCase(data.getProcessId(), id, String.valueOf(data.getCaseState()), +// changeState, caseReason, StringHelper.reformatURL(handleImageList), approvalResult); } } diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java index 255cd80..3bb2d08 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/VerifyCaseActivity.java @@ -13,6 +13,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.utils.DeviceSizeUtil; import com.pengxh.androidx.lite.utils.ImmerseStatusBarUtil; import java.util.ArrayList; @@ -39,8 +40,9 @@ //绑定TabLayout viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerPadding(DeviceSizeUtil.dp2px(this, 12.5f)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java index be19486..9aaef7e 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifiedFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseVerifyResultAdapter; +import com.casic.dcms.adapter.VerifyCaseListAdapter; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.view.CaseVerifiedDetailActivity; @@ -29,7 +29,7 @@ private static final String TAG = "CaseHandledFragment"; private CaseViewModel caseViewModel; - private CaseVerifyResultAdapter adapter; + private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; @@ -120,9 +120,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseVerifyResultAdapter(requireContext(), dataBeans); + adapter = new VerifyCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new VerifyCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java index f8298cc..6cbbc83 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/mvvm/view/fragment/verify/CaseVerifyFragment.java @@ -8,7 +8,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.casic.dcms.adapter.CaseVerifyResultAdapter; +import com.casic.dcms.adapter.VerifyCaseListAdapter; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; import com.casic.dcms.mvvm.model.CaseVerifyBean; import com.casic.dcms.mvvm.view.CaseVerifyDetailActivity; @@ -29,13 +29,12 @@ private static final String TAG = "CaseVerifyFragment"; private CaseViewModel caseViewModel; - private CaseVerifyResultAdapter adapter; + private VerifyCaseListAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); private int pageIndex = 1; private boolean isRefresh, isLoadMore = false; - @Override protected void setupTopBarLayout() { @@ -121,9 +120,9 @@ }); } else { viewBinding.emptyView.hide(); - adapter = new CaseVerifyResultAdapter(requireContext(), dataBeans); + adapter = new VerifyCaseListAdapter(requireContext(), dataBeans); viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { + adapter.setOnItemClickListener(new VerifyCaseListAdapter.OnItemClickListener() { @Override public void onClick(int position) { ContextUtil.navigatePageTo( diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseOperateViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseOperateViewModel.java new file mode 100644 index 0000000..5a69666 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseOperateViewModel.java @@ -0,0 +1,286 @@ +package com.casic.dcms.mvvm.vm; + +import androidx.lifecycle.MutableLiveData; + +import com.casic.dcms.mvvm.model.ActionResultBean; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import com.pengxh.androidx.lite.callback.OnObserverCallback; +import com.pengxh.androidx.lite.vm.BaseViewModel; +import com.pengxh.androidx.lite.vm.LoadState; +import com.pengxh.androidx.lite.vm.ObserverSubscriber; + +import java.io.IOException; + +import okhttp3.ResponseBody; +import rx.Observable; + +public class CaseOperateViewModel extends BaseViewModel { + private final Gson gson = new Gson(); + public MutableLiveData verifyActionModel = new MutableLiveData<>(); + public MutableLiveData checkActionModel = new MutableLiveData<>(); + public MutableLiveData overtimeActionModel = new MutableLiveData<>(); + public MutableLiveData shopActionModel = new MutableLiveData<>(); + public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); + public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); + + public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + verifyActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + checkActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { + loadState.setValue(LoadState.Loading); + Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + overtimeActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { + Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + shopActionModel.setValue(resultBean); + } else { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String eorc, String casetypeCode, + String casetypeDetailCode, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, String audioIdVerify, String videoIdVerify, + int bzhours, int bzminis) { + loadState.setValue(LoadState.Loading); + Observable commonActionObservable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + ObserverSubscriber.addSubscribe(commonActionObservable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode != 200) { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void submitShopCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone) { + loadState.setValue(LoadState.Loading); + Observable commonActionObservable = RetrofitServiceManager.submitShopCase(isNeedVerify, isNeedRevisit, longitude, latitude, source, caseLevel, areaCode, streetCode, communityCode, gridId, description, fieldintro, fileIdVerify, bzhours, bzminis, shopId, shopkeeperName, shopPhone); + ObserverSubscriber.addSubscribe(commonActionObservable, new OnObserverCallback() { + @Override + public void onCompleted() { + loadState.setValue(LoadState.Success); + } + + @Override + public void onError(Throwable e) { + loadState.setValue(LoadState.Fail); + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode != 200) { + loadState.setValue(LoadState.Fail); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void updateCaseSupervise(String id, String superviseRemarks) { + Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + updateSuperviseActionModel.setValue(resultBean); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String operationKey, String taskUserId) { + Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, operationKey, taskUserId); + ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onNext(ResponseBody responseBody) { + try { + String response = responseBody.string(); + int responseCode = StringHelper.separateResponseCode(response); + if (responseCode == 200) { + ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { + }.getType()); + dispatcherHandleActionModel.setValue(resultBean); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java index bfab79d..3d694ce 100644 --- a/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/mvvm/vm/CaseViewModel.java @@ -2,7 +2,6 @@ import androidx.lifecycle.MutableLiveData; -import com.casic.dcms.mvvm.model.ActionResultBean; import com.casic.dcms.mvvm.model.CaseCheckBean; import com.casic.dcms.mvvm.model.CaseDetailBean; import com.casic.dcms.mvvm.model.CaseHandleBean; @@ -30,21 +29,18 @@ public class CaseViewModel extends BaseViewModel { private final Gson gson = new Gson(); public MutableLiveData caseVerifyModel = new MutableLiveData<>(); - public MutableLiveData verifyActionModel = new MutableLiveData<>(); public MutableLiveData caseCheckModel = new MutableLiveData<>(); - public MutableLiveData checkActionModel = new MutableLiveData<>(); public MutableLiveData caseHandleModel = new MutableLiveData<>(); public MutableLiveData caseHandledModel = new MutableLiveData<>(); public MutableLiveData caseUrgentModel = new MutableLiveData<>(); public MutableLiveData caseOvertimeModel = new MutableLiveData<>(); - public MutableLiveData overtimeActionModel = new MutableLiveData<>(); public MutableLiveData shopCaseModel = new MutableLiveData<>(); - public MutableLiveData shopActionModel = new MutableLiveData<>(); public MutableLiveData searchResultModel = new MutableLiveData<>(); - public MutableLiveData updateSuperviseActionModel = new MutableLiveData<>(); - public MutableLiveData dispatcherHandleActionModel = new MutableLiveData<>(); public MutableLiveData caseDetailModel = new MutableLiveData<>(); + /** + * 未核实、已核实 + */ public void obtainVerifyCaseList(int limit, int offset, boolean verified) { Observable observable; if (verified) { @@ -80,39 +76,6 @@ }); } - public void verifyCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String eorc, String casetypeCode, String casetypeDetailCode, String lng, String lat, String caseLevel, String areaCode, String streetCode, String communityCode, String gridId, String fieldintro) { - loadState.setValue(LoadState.Loading); - Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - loadState.setValue(LoadState.Success); - } - - @Override - public void onError(Throwable e) { - loadState.setValue(LoadState.Fail); - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - verifyActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainCheckCaseList(int limit, int offset, boolean isChecked) { Observable observable; if (isChecked) { @@ -149,39 +112,6 @@ }); } - public void checkCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId) { - loadState.setValue(LoadState.Loading); - Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - loadState.setValue(LoadState.Success); - } - - @Override - public void onError(Throwable e) { - loadState.setValue(LoadState.Fail); - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - checkActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainHandleCaseList(String isOvertime, String isEmergent, int offset, boolean isOnMap) { Observable observable; if (isOnMap) { @@ -307,39 +237,6 @@ }); } - public void handleOvertimeCase(String processId, String bizId, String currState, String changeState, String remarks, String fileId, String approvalResult) { - loadState.setValue(LoadState.Loading); - Observable observable = RetrofitServiceManager.getHandleCaseResult(processId, bizId, currState, changeState, remarks, fileId, approvalResult); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - loadState.setValue(LoadState.Success); - } - - @Override - public void onError(Throwable e) { - loadState.setValue(LoadState.Fail); - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - overtimeActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainShopCaseList(String isShop, int offset, boolean isCompleted) { Observable observable; if (isCompleted) { @@ -375,38 +272,6 @@ }); } - public void handleShopCase(String id, String punishType, String punishRemarks, String punishTime, String punishImage) { - Observable observable = RetrofitServiceManager.getHandlePackageResult(id, punishType, punishRemarks, punishTime, punishImage); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - shopActionModel.setValue(resultBean); - } else { - loadState.setValue(LoadState.Fail); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void searchCase(String eorc, String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String isShopCase, int offset) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseListResult(eorc, casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, isShopCase, offset); @@ -507,66 +372,6 @@ }); } - public void updateCaseSupervise(String id, String superviseRemarks) { - Observable observable = RetrofitServiceManager.getUpdateSuperviseResult(id, superviseRemarks); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - updateSuperviseActionModel.setValue(resultBean); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - - public void dispatcherHandleCase(String processId, String bizId, String currState, String changeState, String remarks, String operationKey, String taskUserId) { - Observable observable = RetrofitServiceManager.getDispatcherHandleCaseResult(processId, bizId, currState, changeState, remarks, operationKey, taskUserId); - ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(ResponseBody responseBody) { - try { - String response = responseBody.string(); - int responseCode = StringHelper.separateResponseCode(response); - if (responseCode == 200) { - ActionResultBean resultBean = gson.fromJson(response, new TypeToken() { - }.getType()); - dispatcherHandleActionModel.setValue(resultBean); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - } - public void obtainCaseDetail(String id) { loadState.setValue(LoadState.Loading); Observable observable = RetrofitServiceManager.getCaseDetailResult(id); diff --git a/app/src/main/res/drawable/layout_divider_vertical.xml b/app/src/main/res/drawable/layout_divider_vertical.xml index d7f4987..4d1eb5c 100644 --- a/app/src/main/res/drawable/layout_divider_vertical.xml +++ b/app/src/main/res/drawable/layout_divider_vertical.xml @@ -1,7 +1,9 @@ - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_case_verify_detail.xml b/app/src/main/res/layout/activity_case_verify_detail.xml index c435d47..db8e9eb 100644 --- a/app/src/main/res/layout/activity_case_verify_detail.xml +++ b/app/src/main/res/layout/activity_case_verify_detail.xml @@ -40,20 +40,18 @@ style="@style/itemLayoutStyle"> + android:id="@+id/caseTypeRightImage" + style="@style/rightImageStyle" /> @@ -63,20 +61,18 @@ style="@style/itemLayoutStyle"> + android:id="@+id/largeTypeRightImage" + style="@style/rightImageStyle" /> @@ -86,20 +82,18 @@ style="@style/itemLayoutStyle"> + android:id="@+id/smallTypeRightImage" + style="@style/rightImageStyle" /> @@ -244,26 +238,13 @@ - - - - - - - - - + android:text="核实意见" /> + style="@style/rightImageStyle" /> diff --git a/app/src/main/res/layout/activity_verify_case.xml b/app/src/main/res/layout/activity_verify_case.xml index 6d7fd18..ab70742 100644 --- a/app/src/main/res/layout/activity_verify_case.xml +++ b/app/src/main/res/layout/activity_verify_case.xml @@ -12,6 +12,7 @@ + android:layout_height="match_parent" + android:layout_marginTop="@dimen/dp_5"> - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_case_rv.xml b/app/src/main/res/layout/item_case_rv.xml new file mode 100644 index 0000000..7b6b738 --- /dev/null +++ b/app/src/main/res/layout/item_case_rv.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + \ No newline at end of file